May 2020 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add str_endswith() utility function
by Anatol Pomozov 05 May '20

05 May '20

It provides an easy way to check whether a string ends with a given suffix. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/common/util-common.c | 18 ++++++++++++++++++ src/common/util-common.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/common/util-common.c b/src/common/util-common.c index 7d43ac0d..11ffc705 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -198,6 +198,24 @@ char *strndup(const char *s, size_t n) } #endif +/** Helper function for check whether a string ends with a given suffix + * @param str a string + * @param suffix we want to check + * @return 0 in case if the given string does not end with the suffix, + * a non-zero value otherwise. + */ +int str_endswith(const char *str, const char *suffix) +{ + int str_len = strlen(str); + int suffix_len = strlen(suffix); + + if(suffix_len > str_len) { + return 0; + } + + return !strcmp(str + str_len - suffix_len, suffix); +} + void wordsplit_free(char **ws) { if(ws) { diff --git a/src/common/util-common.h b/src/common/util-common.h index 483d5da4..6b66be3e 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -35,6 +35,8 @@ char **wordsplit(const char *str); size_t strtrim(char *str); +int str_endswith(const char *str, const char *suffix); + #ifndef HAVE_STRNDUP char *strndup(const char *s, size_t n); #endif -- 2.26.2

2 2

[pacman-dev] Planning the move to the Arch Linux Gitlab instance
by Allan McRae 05 May '20

05 May '20

Hi all, Arch Linux is setting up its own Gitlab instance. I have been playing around with it for the day and I think pacman should transition there. Note: the current pacman repo on the Arch Gitlab is a playground I have been using. It will be deleted. There are some features that are of interest: - CI on merge requests, which will catch build issues automatically. - Review where I can easily see what changed on resubmission - integrated bug tracker, patchwork, ... meaning I spend less time updating things on multiple sites. We can also do things like provide regular developers a namespace. e.g. I would own allan/* branches, and could prepare work and request merges from branches there. So how would we proceed? Bugs: Do we pick a date where we disable new bug submissions on the current tracker and point towards gitlab? Are old bug transferred after some ruthless trimming - I don't think this can be automated... Do we leave it open until all bugs get closed? Patchwork: The got "cleared" somewhat recently, when an update occurred. At bit of effort could followup al the changes needed that never were done and clear this out. Mailing list: New patches would no longer appear here. I don't know how much we can get gitlab to report to the mailing list, or if we even want to. The mailing list would still serve as a good place to discuss feature implementation in a more public way. Date: What is a good time for all this to happen? Once Anatol's parallel downloads patches are fully committed, I'd like to make a 6.0.0beta1 release to get some good coverage on these changes. Could we move at the same time? Let me have opinions. Cheers, Allan

4 5

[pacman-dev] [PATCH 1/2] meson: use better check for debug builds
by Eli Schwartz 05 May '20

05 May '20

meson 0.48 added the 'debug' and 'optimization' builtin options, which bidirectionally map to the buildtype, but in some cases where debug is enabled, the builtype may be custom. Checking the 'debug' option lets us detect every case currently detected, plus a few more, and does so in a shorter and more concise manner. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 572526b2..680cf62b 100644 --- a/meson.build +++ b/meson.build @@ -177,7 +177,7 @@ elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') endif -if get_option('buildtype').startswith('debug') +if get_option('debug') extra_cflags = [ '-Wcast-align', '-Wclobbered', -- 2.26.2

2 3

[pacman-dev] [PATCH] Convert gitlab valgrind runner to meson
by Allan McRae 05 May '20

05 May '20

Turns out environmental variables do get passed through fakechroot! Signed-off-by: Allan McRae <allan(a)archlinux.org> --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4961352e..a53d60cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,11 +62,10 @@ arch-clang: arch-valgrind: extends: .arch-test script: - - pacman -Syu --needed --noconfirm autoconf-archive valgrind - - autoreconf -i - - ./configure --enable-warningflags --disable-doc - - make - - fakechroot make PY_LOG_FLAGS=--valgrind check + - pacman -Syu --needed --noconfirm valgrind + - meson build + - ninja -C build + - PACTEST_VALGRIND=1 fakechroot meson test -C build arch-nettle: extends: .arch-test -- 2.25.1

1 0

[pacman-dev] Bug: using --program-prefix configure option breaks makepkg
by Wouter Wijsman 04 May '20

04 May '20

Hi Pacman team, In the last couple of days I've been trying to build pacman for use with a homebrew sdk for the Playstation portable. The idea is for it to allow sharing of libraries for the system. To make sure this version of pacman doesn't collide with the system's, I use the --program-prefix option for the configure script, which adds "psp-" in front of all binary names. Now when using the --program-prefix option, makepkg is no longer able to work. This because it has the name for the pacman executable name hardcoded it seems. I compile with the following commands: ./configure --prefix=${PSPDEV} --with-buildscript=PSPBUILD --with-root-dir=${PSPDEV}/psp --program-prefix="psp-" --disable-doc make make install For this to work, I require the following patch: https://github.com/sharkwouter/psptoolchain/blob/psp-pacman/patches/pacman-… Is there a way to prevent me from needing this patch? Besides this patch, the pacman 5.2.1 tarball build and works fine for my purposes. P.S. I did find another small annoyance. Which is that "make install" fails if the bash completion files are already installed. Kind regards, Wouter Wijsman

4 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-63-gcebda6d0
by Allan McRae 04 May '20

04 May '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via cebda6d0ee4c58521cafd9d0980c8b79cc068602 (commit) via 0b81fb64d3f36710d3988ab49feae8c7cc37c1af (commit) from 969e1ab996e79f3e121d0fb3bfd4e91ac7d6f488 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cebda6d0ee4c58521cafd9d0980c8b79cc068602 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 2 12:12:32 2020 -0400 meson: handle XFAIL tests outside of TAP This change causes expected fail tests to actually fail by eliding the '# TODO' from the test plan. In turn, we can now properly use 'should_fail' in the meson test() rule and see these expected fail tests in the output: Before: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py OK 0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 332 Expected Fail: 0 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 After: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py EXPECTEDFAIL0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 326 Expected Fail: 6 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0b81fb64d3f36710d3988ab49feae8c7cc37c1af Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 2 17:48:48 2020 +1000 Add Gitlab Runner configuration Arch Linux is setting up a Gitlab instance. This adds CI for the pacman project, testing a range of configurations on Arch and basic builds on Fedora and Debian. Note that asciidoc is specifically not installed on the Debian run because it is all sorts of broken... Also, the defaults have been set to meson, with two autotools tests that will soon be removed. Original-file from: Andrew Gregory <andrew.gregory.8(a)gmail.com> Altered-to-run-on-Arch-Gitlab by: Sven-Hendrik Haase <svenstaro(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 128 ++++++++++++++++++++++++++++++++++++++++++++++++ test/pacman/meson.build | 15 +++++- test/pacman/pmenv.py | 7 ++- 3 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci.yml hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix program name transformation options for configure script
by Wouter Wijsman 04 May '20

04 May '20

The configure script which is generated when running autotools has the following options for modifying the name of the executables build: 1. --program-prefix 2. --program-suffix 3. --program-transform-name Using any of these options gives autotools the program_transform_name variable, but it wasn't being used for the makepkg script, which made these options cause issues with starting makepkg. This commit addresses this. Signed-off-by: Wouter Wijsman <wwijsman(a)live.nl> --- scripts/Makefile.am | 8 +++++++- scripts/makepkg.sh.in | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 47455ed2..113ad86c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -164,6 +164,10 @@ else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) endif +# Real executable names using program_transform_name +PACMAN_INSTALL_NAME := $(shell echo pacman|sed '$(program_transform_name)') +PACMAN_CONF_INSTALL_NAME := $(shell echo pacman-conf|sed '$(program_transform_name)') + #### Taken from the autoconf scripts Makefile.am #### edit = sed \ -e 's|@rootdir[@]|$(ROOTDIR)|g' \ @@ -182,7 +186,9 @@ edit = sed \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e "s|@FILECMD[@]|$(FILECMD)|g" \ - -e 's|@SCRIPTNAME[@]|$@|g' + -e 's|@SCRIPTNAME[@]|$@|g' \ + -e 's|@PACMAN_INSTALL_NAME[@]|$(PACMAN_INSTALL_NAME)|g' \ + -e 's|@PACMAN_CONF_INSTALL_NAME[@]|$(PACMAN_CONF_INSTALL_NAME)|g' ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d1416d15..38b6eda9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -43,6 +43,8 @@ unset GREP_OPTIONS declare -r makepkg_version='@PACKAGE_VERSION@' declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' +declare -r PACMAN_INSTALL_NAME='@PACMAN_INSTALL_NAME@' +declare -r PACMAN_CONF_INSTALL_NAME='@PACMAN_CONF_INSTALL_NAME@' declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} @@ -235,7 +237,7 @@ run_pacman() { else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi - local lockfile="$(pacman-conf DBPath)/db.lck" + local lockfile="$(${PACMAN_CONF_INSTALL_NAME} DBPath)/db.lck" while [[ -f $lockfile ]]; do local timer=0 msg "$(gettext "Pacman is currently in use, please wait...")" @@ -1123,7 +1125,7 @@ unset var PACKAGER=${PACKAGER:-"Unknown Packager"} # set pacman command if not already defined -PACMAN=${PACMAN:-pacman} +PACMAN=${PACMAN:-${PACMAN_INSTALL_NAME}} # save full path to command as PATH may change when sourcing /etc/profile PACMAN_PATH=$(type -P $PACMAN) -- 2.20.1

1 0

[pacman-dev] Showing optional dependencies in pactree output
by Frederick Zhang 04 May '20

04 May '20

Hi all, I noticed that there is a patch by Johannes available at [1] which adds a new flag to pactree to show optional dependencies as well. I think this is a nice feature to have however it seems that the patch was never merged. I just tried it out locally and managed to compile with a few minor changes. If it wasn't rejected for some reason guess I could submit a patch if needed? [1] https://lists.archlinux.org/pipermail/pacman-dev/2016-February/020922.html -- Best regards, Frederick Zhang Email: frederick888(a)tsundere.moe PGP: 8BFB EA5B 4C44 BFAC C8EC 5F93 1F92 8BE6 0D8B C11D

2 1

[pacman-dev] [PATCH] Add makedepends to -Si/-Qi output
by Carson Black 04 May '20

04 May '20

Fairly self explanatory patch. pacman didn't show makedepends, now it does. Signed-off-by: Carson Black <uhhadd(a)gmail.com> --- src/pacman/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/package.c b/src/pacman/package.c index 4c93a443..c3c3dbf6 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -70,6 +70,7 @@ enum { T_URL, T_VALIDATED_BY, T_VERSION, + T_BUILD_DEPENDS_ON, /* the following is a sentinel and should remain in last position */ _T_MAX }; @@ -124,6 +125,7 @@ static void make_aligned_titles(void) buf[T_URL] = _("URL"); buf[T_VALIDATED_BY] = _("Validated By"); buf[T_VERSION] = _("Version"); + buf[T_BUILD_DEPENDS_ON] = _("Build Depends On"); for(i = 0; i < ARRAYSIZE(wbuf); i++) { wlen[i] = mbstowcs(wbuf[i], buf[i], strlen(buf[i]) + 1); @@ -271,6 +273,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) list_display(titles[T_GROUPS], alpm_pkg_get_groups(pkg), cols); deplist_display(titles[T_PROVIDES], alpm_pkg_get_provides(pkg), cols); deplist_display(titles[T_DEPENDS_ON], alpm_pkg_get_depends(pkg), cols); + deplist_display(titles[T_BUILD_DEPENDS_ON], alpm_pkg_get_makedepends(pkg), cols); optdeplist_display(pkg, cols); if(extra || from == ALPM_PKG_FROM_LOCALDB) { -- 2.26.2

2 1

[pacman-dev] [PATCH] meson: handle XFAIL tests outside of TAP
by Dave Reisner 02 May '20

02 May '20

This change causes expected fail tests to actually fail by eliding the '# TODO' from the test plan. In turn, we can now properly use 'should_fail' in the meson test() rule and see these expected fail tests in the output: Before: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py OK 0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 332 Expected Fail: 0 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 After: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py EXPECTEDFAIL0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 326 Expected Fail: 6 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 --- test/pacman/meson.build | 15 ++++++++++++++- test/pacman/pmenv.py | 7 ++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 9de4f5a1..fd0dbf90 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -330,6 +330,17 @@ pacman_tests = [ 'tests/xfercommand001.py', ] +xfail_tests = { + 'tests/deprange001.py': true, + # expect failure on 32 bit machines + 'tests/query006.py': cc.sizeof('ssize_t') < 8, + 'tests/replace110.py': true, + 'tests/sync-update-package-removing-required-provides.py': true, + 'tests/sync403.py': true, + 'tests/sync406.py': true, + 'tests/upgrade078.py': true, +} + foreach input : pacman_tests test_name = input.split('/')[1] args = [ @@ -351,7 +362,9 @@ foreach input : pacman_tests test_name, PYTHON, protocol : 'tap', + env : ['RUNNING_UNDER_MESON=1'], args : args, - timeout: 120, + timeout : 120, + should_fail : xfail_tests.get(input, false), depends : [pacman_bin]) endforeach diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index 24437b61..d87193f2 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -70,5 +70,10 @@ def run(self): t.run(self.pacman) tap.diag("==> Checking rules") - tap.todo = t.expectfailure + # When running under meson, we don't emit 'todo' in the plan and instead + # handle expected failures in the test() objects. This really should be + # fixed in meson: + # https://github.com/mesonbuild/meson/issues/2923#issuecomment-614647076 + tap.todo = (t.expectfailure and + not 'RUNNING_UNDER_MESON' in os.environ) tap.subtest(lambda: t.check(), t.description) -- 2.26.2

1 0