- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Don't double-layer distcc on ccache
by Matti Niemenmaa 08 Feb '21

08 Feb '21

From: Matti Niemenmaa <matti.niemenmaa+git(a)iki.fi> buildenv is set once for build() and a second time for package(). When using both distcc and ccache, this lead to CCACHE_PREFIX="distcc distcc" in package(), which breaks PKGBUILDs that execute the compiler in package() because distcc complains: distcc[383041] (main) CRITICAL! distcc seems to have invoked itself recursively! Avoid causing this error by only adding "distcc" to CCACHE_PREFIX if it's not yet there. Signed-off-by: Matti Niemenmaa <matti.niemenmaa+git(a)iki.fi> --- scripts/libmakepkg/buildenv/compiler.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ncurses is an example of a package that runs into this problem. Setting buildenv twice was done on purpose in commit 02a0bf550a22e199f48537b7eee87361b112e8a0, but at a glance I'm not sure whether it provides any benefit. All the meaningful changes are to environment variables that are exported from the parent process anyway, so all the changes are either repeated or even duplicated (like in PATH, or this CCACHE_PREFIX issue). Maybe it would be better to simply remove the prepare_buildenv call from the INFAKEROOT case in makepkg.sh.in? diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in index 69f58a29..c93c77b4 100644 --- a/scripts/libmakepkg/buildenv/compiler.sh.in +++ b/scripts/libmakepkg/buildenv/compiler.sh.in @@ -44,7 +44,9 @@ buildenv_ccache() { buildenv_distcc() { if check_buildoption "distcc" "y"; then if (( using_ccache )); then - export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + if ! [[ "$CCACHE_PREFIX" =~ (^| )distcc($| ) ]]; then + export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + fi export CCACHE_BASEDIR="$srcdir" elif [[ -d /usr/lib/distcc/bin ]]; then export PATH="/usr/lib/distcc/bin:$PATH" -- 2.24.1

3 6

[pacman-dev] [PATCH] doxygen: fix missing parameter name
by Eli Schwartz 08 Feb '21

08 Feb '21

This was raising a warning during the build. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- lib/libalpm/alpm_list.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index a0299a704..f76961d47 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -61,7 +61,7 @@ typedef struct __alpm_list_t { #define FREELIST(p) do { alpm_list_free_inner(p, free); alpm_list_free(p); p = NULL; } while(0) /** item deallocation callback. - * @param the item to free + * @param item the item to free */ typedef void (*alpm_list_fn_free)(void * item); -- 2.30.0

2 1

[pacman-dev] [PATCH 1/2] makepkg: don't let the strip program mess up file attributes
by Eli Schwartz 08 Feb '21

08 Feb '21

It updates the stripped file by creating a temp file, chown/chmodding it, and replacing the original file. But upstream binutils has CVE-worthy issues with this if running strip as root, and some recent versions of strip don't play nicely with fakeroot. Also, this has always destroyed xattrs. :/ Sidestep the issue by telling strip to write to a temporary file, and manually dump the contents of that back into the original binary. Since the original binary is intact, albeit with different contents, it retains its correct attributes in fakeroot. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 4d50f4475..f7238f813 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -93,7 +93,10 @@ strip_file() { fi fi - strip $@ "$binary" + if strip "$@" "$binary" -o "$binary.stripped"; then + cat "$binary.stripped" > "$binary" + fi + rm -f "$binary.stripped" } -- 2.30.0

2 6

[pacman-dev] [PATCH] libmakepkg: maintain file ownership while stripping
by Allan McRae 07 Feb '21

07 Feb '21

fakeroot can be flakey, as demonstrated by strip not maintaining file permissions under fakeroot with binutils-2.36.1 built against glibc-2.33. Instead of relying on fakeroot to be functional, ensure permissions are maintained across file stripping. Also set debug symbols to always have root:root ownership. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- build-aux/edit-script.sh.in | 1 + meson.build | 4 ++++ scripts/libmakepkg/tidy/strip.sh.in | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 661c22d5..fa5ebcf2 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -19,6 +19,7 @@ mode=$3 -e "s|@TEMPLATE_DIR[@]|@TEMPLATE_DIR@|g" \ -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ -e "s|@INODECMD[@]|@INODECMD@|g" \ + -e "s|@STATCMD[@]|@STATCMD@|g" \ -e "s|@FILECMD[@]|@FILECMD@|g" \ "$input" >"$output" diff --git a/meson.build b/meson.build index ea9bd2f7..edf988e9 100644 --- a/meson.build +++ b/meson.build @@ -224,6 +224,7 @@ add_project_arguments('-include', 'config.h', language : 'c') filecmd = 'file' inodecmd = 'stat -c \'%i %n\'' +statcmd = 'stat -c' strip_binaries = '--strip-all' strip_shared = '--strip-unneeded' strip_static = '--strip-debug' @@ -238,11 +239,13 @@ endif os = host_machine.system() if os.startswith('darwin') inodecmd = '/usr/bin/stat -f \'%i %N\'' + statcmd = '/usr/bin/stat -c' strip_binaries = '' strip_shared = '-s' strip_static = '-s' elif os.contains('bsd') or os == 'dragonfly' inodecmd = 'stat -f \'%i %N\'' + statcmd = 'stat -c' endif chost = run_command(cc, '-dumpmachine').stdout().strip() @@ -269,6 +272,7 @@ substs.set('BUILDSCRIPT', BUILDSCRIPT) substs.set('TEMPLATE_DIR', get_option('makepkg-template-dir')) substs.set('DEBUGSUFFIX', get_option('debug-suffix')) substs.set('INODECMD', inodecmd) +substs.set('STATCMD', statcmd) substs.set('FILECMD', filecmd) substs.set('LIBMAKEPKGDIR', LIBMAKEPKGDIR) substs.set('STRIP_BINARIES', strip_binaries) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 868b96f3..6676c012 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -66,10 +66,15 @@ strip_file() { fi done < <(source_files "$binary") + # save original file permissions + file_owner=$(@STATCMD@ '%u' "$binary") + file_group=$(@STATCMD@ '%g' "$binary") + # copy debug symbols to debug directory mkdir -p "$dbgdir/${binary%/*}" objcopy --only-keep-debug "$binary" "$dbgdir/$binary.debug" objcopy --add-gnu-debuglink="$dbgdir/${binary#/}.debug" "$binary" + chown root:root "$dbgdir/$binary.debug" # create any needed hardlinks while IFS= read -rd '' file ; do @@ -94,6 +99,7 @@ strip_file() { fi strip $@ "$binary" + chown $file_owner:$file_group "$binary" } -- 2.30.0

1 0

[pacman-dev] makepkg --packagelist while using --source or --allsource
by ＠RubenKelevra 03 Feb '21

03 Feb '21

Hey guys, I want to package some source files and discovered that --packagelist does not change it's output when using --source or --allsource. Since makepkg isn't generating the normal packages with these flags anyway, it's a bit confusing that the output isn't changing. It would be pretty helpful for my usecase to have makepkg printing the sourcepackage-filepaths instead of the regular filepaths. Example: [ruben@i3 brave-bin]$ makepkg --source --packagelist /home/ruben/tmp/makepkg_test/brave-bin/brave-bin-1:1.19.88-1-x86_64.pkg.tar.lz4 [ruben@i3 brave-bin]$ makepkg --packagelist /home/ruben/tmp/makepkg_test/brave-bin/brave-bin-1:1.19.88-1-x86_64.pkg.tar.lz4 Best regards, Ruben

2 2

[pacman-dev] makepkg default flags
by Christopher W. 03 Feb '21

03 Feb '21

A few months back there was a proposal to edit the default makepkg build flags for improved security: https://lists.archlinux.org/pipermail/arch-dev-public/2020-July/030031.html As far as I can tell, this was never committed. The show-stopper at the time was Clang 11 not being released yet. Now that it's been in the repos for a while, could we revisit this improvement and possibly get a mass rebuild with it applied?

2 1

[pacman-dev] [PATCH 1/2] ci: use official image
by Emil Velikov 29 Jan '21

29 Jan '21

The archlinux/base have been deprecated. Since we depend on base-devel simply use archlinux:base-devel Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e889c498..bfb7e6d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,11 +10,11 @@ cache: - .pkg-cache .arch-test: - image: archlinux/base + image: archlinux:base-devel before_script: - > pacman -Syu $PACMAN_OPTS - base-devel git + git gpgme libarchive curl python fakeroot fakechroot -- 2.30.0

1 2

[pacman-dev] [PATCH 1/2] pacman: fix alignment when download eta > 1h
by morganamilo 28 Jan '21

28 Jan '21

When the download estimate is over an hour the format displayed changes from mm:ss to hh:mm:ss. This causes everything to be out of alignment die to the extra characters. So intead, when the estimate is over an our change to the format 4h33m. Do note that before pacman would display --:-- as the estimate if the download was >= 100 hours. Now this is displayed if the downlaod is => 10 hours. --- src/pacman/callback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 7468ed7e..279338e7 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -865,8 +865,8 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) } if(eta_h == 0) { printf("%02u:%02u", eta_m, eta_s); - } else if(eta_h < 100) { - printf("%02u:%02u:%02u", eta_h, eta_m, eta_s); + } else if(eta_h < 10) { + printf("%01uh%02um", eta_h, eta_m); } else { fputs("--:--", stdout); } -- 2.30.0

4 7

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-64-gab549c84
by Allan McRae 21 Jan '21

21 Jan '21

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 ab549c846707230e44e2b7e08c6a04d44af916cd (commit) via b40c5553b43633f4b9bd01310e0ae8ff56147723 (commit) via b82a975e7640853fe0fde5c164ad4ad5bf64fbf7 (commit) via ad84a572aac455dcd3de111dbf8d66c45b20573a (commit) via 743e041dbc22ed16a6f996b0caff6523ffecf136 (commit) via 1fdf8c00764af9e32f8dec13061f625f48bd4c8c (commit) via f9bc6c2b09c18dd48f839f53d834c6fd1bfd2dd3 (commit) via 84f9cb021e5244118d09752e725c1c2956d4281c (commit) via 05aefb8f82d856626598ef6a3f49ff8d5f623bf5 (commit) from 1c4e07989940a435483563be7c12915b32289fbe (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 ab549c846707230e44e2b7e08c6a04d44af916cd Author: morganamilo <morganamilo(a)archlinux.org> Date: Sat Jan 16 17:12:55 2021 +0000 libalpm: fix total download reporting wrong total When a package does not need to be downloaded but a signature does, total download didn't count that towards the total. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b40c5553b43633f4b9bd01310e0ae8ff56147723 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:10 2021 -0800 add --upgrade download tests Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b82a975e7640853fe0fde5c164ad4ad5bf64fbf7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:09 2021 -0800 pmtest: add ability to spawn simple http servers Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ad84a572aac455dcd3de111dbf8d66c45b20573a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:08 2021 -0800 pmdb: add option to skip populating file:// server Populating a file:// Server prevents any manually registered HTTP servers from ever being used. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 743e041dbc22ed16a6f996b0caff6523ffecf136 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:07 2021 -0800 add CACHE_FEXISTS and CACHE_FCONTENTS test rules The existing CACHE_EXISTS rule takes a package, which is not suitable for -U tests that need to be able to check for specific files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1fdf8c00764af9e32f8dec13061f625f48bd4c8c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:06 2021 -0800 gitlab-ci: print output and logs for failed tests Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9bc6c2b09c18dd48f839f53d834c6fd1bfd2dd3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:05 2021 -0800 pactest.py: read options from PACTEST_OPTS Makes it easier to pass options when not running pactest directly. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 84f9cb021e5244118d09752e725c1c2956d4281c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 19 10:30:04 2021 -0800 pacman: add -w to -U Mostly for testing. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05aefb8f82d856626598ef6a3f49ff8d5f623bf5 Author: Pascal Ernster <pacman-dev(a)hardfalcon.net> Date: Thu Jan 21 03:49:58 2021 +0100 pacman: correct length of ".files.sig" string Running "pacman -Sc" deletes /var/lib/pacman/sync/*.files.sig due to a wrong string length being used when checking filename suffixes in that directory. In turn, these missing signature files cause both the corresponding "*.files" files and their signatures being forcibly re-downloaded again when "pacman -Sy" is executed. Since official Arch Linux repos don't use signed database files yet, this only affects people who use custom repos with signed database files, for which they have set the "SigLevel" directive to "Required" or "DatabaseRequired" in /etc/pacman.conf. Fixes FS#66472 Signed-off-by: Pascal Ernster <pacman-dev(a)hardfalcon.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 5 ++ build-aux/cat-test-file | 11 +++ build-aux/print-failed-test-output | 17 +++++ doc/pacman.8.asciidoc | 6 +- lib/libalpm/sync.c | 16 ++--- src/pacman/pacman.c | 14 ++-- src/pacman/sync.c | 2 +- test/pacman/README | 23 ++++++ test/pacman/meson.build | 3 + test/pacman/pactest.py | 3 +- test/pacman/pmdb.py | 1 + test/pacman/pmrule.py | 10 +++ test/pacman/pmserve.py | 84 ++++++++++++++++++++++ test/pacman/pmtest.py | 35 ++++++++- test/pacman/tests/upgrade-download-404.py | 10 +++ .../upgrade-download-pkg-and-sig-with-filename.py | 61 ++++++++++++++++ ...pgrade-download-pkg-and-sig-without-filename.py | 63 ++++++++++++++++ test/pacman/util.py | 9 ++- 18 files changed, 344 insertions(+), 29 deletions(-) create mode 100755 build-aux/cat-test-file create mode 100755 build-aux/print-failed-test-output create mode 100644 test/pacman/pmserve.py create mode 100644 test/pacman/tests/upgrade-download-404.py create mode 100644 test/pacman/tests/upgrade-download-pkg-and-sig-with-filename.py create mode 100644 test/pacman/tests/upgrade-download-pkg-and-sig-without-filename.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: fix total downlaod reporting wrong total
by morganamilo 21 Jan '21

21 Jan '21

When a package does not need to be downloaded but a signature does, total download didn't count that towards the total. diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3919d266..a0861016 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -755,6 +755,11 @@ static int download_files(alpm_handle_t *handle) cachedir = _alpm_filecache_setup(handle); handle->trans->state = STATE_DOWNLOADING; + ret = find_dl_candidates(handle, &files); + if(ret != 0) { + goto finish; + } + /* Total progress - figure out the total download size if required to * pass to the callback. This function is called once, and it is up to the * frontend to compute incremental progress. */ @@ -762,21 +767,14 @@ static int download_files(alpm_handle_t *handle) off_t total_size = (off_t)0; size_t howmany = 0; /* sum up the download size for each package and store total */ - for(i = handle->trans->add; i; i = i->next) { + for(i = files; i; i = i->next) { alpm_pkg_t *spkg = i->data; total_size += spkg->download_size; - if(spkg->download_size > 0) { - howmany++; - } + howmany++; } handle->totaldlcb(howmany, total_size); } - ret = find_dl_candidates(handle, &files); - if(ret != 0) { - goto finish; - } - if(files) { /* check for necessary disk space for download */ if(handle->checkspace) { -- 2.30.0

2 1