- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-72-g0f75ab32
by Allan McRae 24 Feb '21

24 Feb '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 0f75ab3224141a5e8a4fe72b48b4639c83c6316b (commit) via 7587153a447bd537c8f138be9ca0a3886a5f1e57 (commit) from 17d3da477770313a16a4f29ecae8476613ad3277 (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 0f75ab3224141a5e8a4fe72b48b4639c83c6316b Author: Morten Linderud <morten(a)linderud.pw> Date: Mon Feb 22 00:09:07 2021 +0100 pacman-key: --refresh-keys queries WKD before keyserver With the recent outages of the keyservers there is a possibility of `--refresh-keys` failing to fetch new keys. A lot of current key distribution is done over WKD these days, and `pacman-key` has the ability to use it for `--recv-key`. There was a hope `gpg` would end up supporting WKD for the refresh functionality, but this seems to be limited to expired keys fetched through WKD. Since this functionality isn't yet available it makes sense to stuff it into `pacman-key`. The current implementation looks over all available keyids in the keyring, attempts to fetch over WKD and then fall backs to keyservers if no email has a valid WKD available. The downside of this approach is that it takes a bit longer to refresh the keys, but it should be more robust as the distribution should be providing their own WKDs. Co-authored-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7587153a447bd537c8f138be9ca0a3886a5f1e57 Author: Morten Linderud <morten(a)linderud.pw> Date: Sun Feb 21 22:36:31 2021 +0100 libmakepkg: Support zstd decompression for sources This enables us to extract files in the source array and ensures that we can decompress files if the uncompressed signature is served. Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .../libmakepkg/integrity/verify_signature.sh.in | 3 +- scripts/libmakepkg/source/file.sh.in | 5 ++++ scripts/pacman-key.sh.in | 33 +++++++++++++++++++--- 3 files changed, 36 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Adds a --nowait option
by Daniel Radetsky 24 Feb '21

24 Feb '21

Apologies if gmail ruins this. I'm used to github prs & don't have time to setup mutt at the moment. If pacman is in use, makepkg -si will wait until it is available. This can be undesirable if you aren't running makepkg -si in the normal interactive way. For example, if you're running it from ansible (so shell output is supressed), and you also have a pacman -Syuw running in another terminal which you forgot to confirm, it will hang forever and you won't know why. More generally, if you're running it in any kind of non-interactive environment, you may want it to fail fast instead of waiting for some other condition to resolve. This is kind of a work-in-progress. I'm not totally sure what to do with the .po files (do I manually fix all the line number comments? God, I hope not). And maybe --nowait is a bad name; I'd have gone with a longer name normally like --no-wait-for-pacman, since I don't expect this to be something a user is typing a lot in a terminal, but writing and copypasta-ing in a script. But I also didn't want to buck the conventions. Whatever, I can change it. Signed-off-by: Daniel Radetsky <dradetsky(a)gmail.com> --- scripts/makepkg.sh.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b39433f3..a1a450dd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -67,6 +67,7 @@ NOARCHIVE=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 +NOWAIT=0 PKGFUNC=0 PKGVERFUNC=0 PREPAREFUNC=0 @@ -236,6 +237,10 @@ run_pacman() { cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi local lockfile="$(pacman-conf DBPath)/db.lck" + if (( NOWAIT )) && [[ -f $lockfile ]]; then + msg "$(gettext "Pacman is currently in use, exiting")" + exit $E_FAIL + fi while [[ -f $lockfile ]]; do local timer=0 msg "$(gettext "Pacman is currently in use, please wait...")" @@ -984,6 +989,7 @@ usage() { printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" + printf -- "$(gettext " --nowait Exit immediately if pacman is in use")\n" printf -- "$(gettext " --packagelist Only list package filepaths that would be produced")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" @@ -1030,10 +1036,11 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' - 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' - 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' - 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' + 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' + 'nosign' 'nowait' 'packagelist' 'printsrcinfo' 'repackage' 'rmdeps' + 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' + 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -1074,6 +1081,7 @@ while true; do --nocheck) RUN_CHECK='n' ;; --noprepare) RUN_PREPARE='n' ;; --nosign) SIGNPKG='n' ;; + --nowait) NOWAIT=1 ;; -o|--nobuild) BUILDPKG=0 NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --packagelist) BUILDPKG=0 PACKAGELIST=1 IGNOREARCH=1;; -- 2.30.0

4 4

[pacman-dev] [PATCH] libmakepkg: Support zstd decompression
by Morten Linderud 21 Feb '21

21 Feb '21

From: Morten Linderud <morten(a)linderud.pw> This enables us to extract files in the source array and ensures that we can decompress files if the uncompressed signature is served. Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/libmakepkg/integrity/verify_signature.sh.in | 3 ++- scripts/libmakepkg/source/file.sh.in | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/integrity/verify_signature.sh.in b/scripts/libmakepkg/integrity/verify_signature.sh.in index 2be5c493..2960ebbe 100644 --- a/scripts/libmakepkg/integrity/verify_signature.sh.in +++ b/scripts/libmakepkg/integrity/verify_signature.sh.in @@ -134,7 +134,7 @@ verify_file_signature() { fi found=0 - for ext in "" gz bz2 xz lrz lzo Z; do + for ext in "" gz bz2 xz lrz lzo Z zst; do if sourcefile="$(get_filepath "${file%.*}${ext:+.$ext}")"; then found=1 break @@ -152,6 +152,7 @@ verify_file_signature() { xz) decompress="xz -c -d" ;; lrz) decompress="lrzip -q -d" ;; lzo) decompress="lzop -c -d -q" ;; + zst) decompress="zstd -d -q -f" ;; Z) decompress="uncompress -c -f" ;; "") decompress="cat" ;; esac diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index b29aeb04..cbaab315 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -118,6 +118,11 @@ extract_file() { xz) cmd="xz" ;; *) return;; esac ;; + *application/zstd*) + case "$ext" in + zst) cmd="zstd" ;; + *) return;; + esac ;; *) # See if bsdtar can recognize the file if bsdtar -tf "$file" -q '*' &>/dev/null; then -- 2.30.1

1 0

[pacman-dev] Improve locking?
by lilydjwg 20 Feb '21

20 Feb '21

I still have issues with leftover lock file. I have some questions: In pacman.c cleanup function, the signal handler is removed before unlocking because > The soft interrupt handler dereferences config, causing a segfault if > it is called during cleanup. (commit a8e2578febbb71d1b788c7270c2be57ca1e64dec) Why wasn't it to check if config is not NULL instead? Why wasn't flock used? I mean, in addition to current lock mechanism, flock the file. I know flock doesn't work for a couple of places (NFS, non-Linux, etc), but if it works for someone's situation, it would help a lot. Thanks in advance. -- Best regards, lilydjwg

1 0

[pacman-dev] Feature: -T0 flag as default ZSTDCOMPRESSION arg
by Frederik Enste 09 Feb '21

09 Feb '21

Hello pacman devs, today I installed a big package from the AUR on a clean system and forgot to adjust the makepkg.conf beforehand. As makepkg.conf is set up to compresses all packages with zstd before installing them onto the system the compression took a while. Because of that, I would like to add the -T0 flag to the list of default ZSTCOMPRESSION args. This would allow zstd to spawn multiple compression flags (equal to the number of physical processors) and thus speed up package compression. I have created a simple patch for this feature but as this is my first contribution to this project I am not entirely sure that I adjusted all necessary files: From 6a8d811fbced5a799d88ee357d4b0c694d79e0f7 Mon Sep 17 00:00:00 2001 From: Frederik Enste <frederik(a)fenste.de> Date: Tue, 9 Feb 2021 22:43:56 +0100 Subject: [PATCH] added -T0 flag to default zstd compression Signed-off-by: Frederik Enste <frederik(a)fenste.de> --- doc/makepkg.conf.5.asciidoc | 2 +- etc/makepkg.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 04cc5ea9..40129a01 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -259,7 +259,7 @@ Options **COMPRESSGZ=**"(gzip -c -f -n)":: **COMPRESSBZ2=**"(bzip2 -c -f)":: **COMPRESSXZ=**"(xz -c -z -)":: -**COMPRESSZST=**"(zstd -c -z -)":: +**COMPRESSZST=**"(zstd -c -z -T0 -)":: **COMPRESSLZO**"(lzop -q)":: **COMPRESSLRZ=**"(lrzip -q)":: **COMPRESSLZ4=**"(lz4 -q)":: diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index b13b1d5d..8d655bf8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -133,7 +133,7 @@ DBGSRCDIR="/usr/src/debug" COMPRESSGZ=(gzip -c -f -n) COMPRESSBZ2=(bzip2 -c -f) COMPRESSXZ=(xz -c -z -) -COMPRESSZST=(zstd -c -z -q -) +COMPRESSZST=(zstd -c -z -q -T0 -) COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) -- 2.30.0 Of course, I would understand if this "feature" is not important or requested by other users as everybody could change the makepkg.conf in seconds but please let me know what you think about this. Best regards, Frederik Enste

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-70-g17d3da47
by Allan McRae 08 Feb '21

08 Feb '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 17d3da477770313a16a4f29ecae8476613ad3277 (commit) via cc1d23d333992611c4f0bd7e95c4d11fd5c7eaff (commit) via 9e425cd1ea4a5fe7e7d7f1daa225eed37650dafc (commit) via 2b8d00b7993435a8dc6f560b508a33050830ceec (commit) via 3a23abb2ec0c99d74719f97dcc9d097a105fe42b (commit) via 88d054093c1c99a697d95b26bd9aad5bc4d8e170 (commit) from ab549c846707230e44e2b7e08c6a04d44af916cd (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 17d3da477770313a16a4f29ecae8476613ad3277 Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Sat Jan 23 21:40:04 2021 +0000 Revert "ci: cache packages" This reverts commit e348ba38814c9cc7c1c9892d0451096234dc39ab. With the above commit we started caching the downloaded packages. Based on some testing and, it saves ~30s in the "step_script" stage while adding 18s for "Restoring/Saving cache". A net saving of ~10s. With earlier commit, we no longer use an ancient image which also pulls base-devel - thus the packages we have to download is minimal. Now comparing the uncached "step_script", vs the cached one - it is slowed by 2-3 seconds (1:01 -> 1:03), while we eliminate the 18s (and growing) caching. Tl:Dr: With up-to date image, package caching in not worth it - be that time, disk or network wise. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cc1d23d333992611c4f0bd7e95c4d11fd5c7eaff Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Sat Jan 23 21:40:03 2021 +0000 ci: use official image 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9e425cd1ea4a5fe7e7d7f1daa225eed37650dafc Author: Matti Niemenmaa <matti.niemenmaa+git(a)iki.fi> Date: Sat Jan 30 19:46:40 2021 +0200 makepkg: Don't double-layer distcc on ccache 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2b8d00b7993435a8dc6f560b508a33050830ceec Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 3 16:57:33 2021 -0500 doxygen: fix missing parameter name This was raising a warning during the build. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a23abb2ec0c99d74719f97dcc9d097a105fe42b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Feb 7 19:55:17 2021 -0500 support xattr when extracting packages This permits storing the result of setcap during package() and applying the resulting capabilities to the installed program. Formerly, it was necessary to edit the binary after the fact (and thus dirty the file according to -Qkk) by using an install scriptlet. One problem that needs to be solved before this is useful, is preventing the strip routine from destroying xattrs. This is taken care of in the previous patch. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 88d054093c1c99a697d95b26bd9aad5bc4d8e170 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Feb 7 23:09:42 2021 -0500 makepkg: don't let the strip routine mess up file attributes It updates the stripped/objcopied 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/objcopy 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 20 +++++--------------- lib/libalpm/add.c | 1 + lib/libalpm/alpm_list.h | 2 +- scripts/libmakepkg/buildenv/compiler.sh.in | 4 +++- scripts/libmakepkg/tidy/strip.sh.in | 11 +++++++++-- 5 files changed, 19 insertions(+), 19 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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

[pacman-dev] [PATCH] FS#66472: correct length of ".files.sig" string
by Pascal Ernster 21 Jan '21

21 Jan '21

Signed-off-by: Pascal Ernster <pacman-dev(a)hardfalcon.net> --- src/pacman/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a05af5da..9ec4c92e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -105,7 +105,7 @@ static int sync_cleandb(const char *dbpath) dbname = strndup(dname, len - 7); } else if(len > 6 && strcmp(dname + len - 6, ".files") == 0) { dbname = strndup(dname, len - 6); - } else if(len > 6 && strcmp(dname + len - 6, ".files.sig") == 0) { + } else if(len > 10 && strcmp(dname + len - 10, ".files.sig") == 0) { dbname = strndup(dname, len - 10); } else { ret += unlink_verbose(path, 0); -- 2.30.0

4 5

[pacman-dev] [PATCH 1/7] pacman: add -w to -U
by Andrew Gregory 19 Jan '21

19 Jan '21

Mostly for testing. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/pacman.8.asciidoc | 6 +++--- src/pacman/pacman.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 476c16f3..bb205627 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -241,6 +241,9 @@ Transaction Options (apply to '-S', '-R' and '-U') Upgrade Options (apply to '-S' and '-U')[[UO]] ---------------------------------------------- +*-w, \--downloadonly*:: + Retrieve all packages from the server, but do not install/upgrade anything. + *\--asdeps*:: Install packages non-explicitly; in other words, fake their install reason to be installed as a dependency. This is useful for makepkg and other @@ -445,9 +448,6 @@ can be useful when the user switches from a testing repository to a stable one. Additional targets can also be specified manually, so that '-Su foo' will do a system upgrade and install/upgrade the "foo" package in the same operation. -*-w, \--downloadonly*:: - Retrieve all packages from the server, but do not install/upgrade anything. - *-y, \--refresh*:: Download a fresh copy of the master package database from the server(s) defined in linkman:pacman.conf[5]. This should typically be used each time diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3045a58e..cc280d41 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -161,7 +161,6 @@ static void usage(int op, const char * const myname) addlist(_(" -q, --quiet show less information for query and search\n")); addlist(_(" -s, --search <regex> search remote repositories for matching strings\n")); addlist(_(" -u, --sysupgrade upgrade installed packages (-uu enables downgrades)\n")); - addlist(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); addlist(_(" -y, --refresh download fresh package databases from the server\n" " (-yy to force a refresh even if up to date)\n")); addlist(_(" --needed do not reinstall up to date packages\n")); @@ -189,6 +188,7 @@ static void usage(int op, const char * const myname) switch(op) { case PM_OP_SYNC: case PM_OP_UPGRADE: + addlist(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); addlist(_(" --overwrite <glob>\n" " overwrite conflicting files (can be used more than once)\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); @@ -735,6 +735,12 @@ static int parsearg_upgrade(int opt) case OP_IGNOREGROUP: parsearg_util_addlist(&(config->ignoregrp)); break; + case OP_DOWNLOADONLY: + case 'w': + config->op_s_downloadonly = 1; + config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; + config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS; + break; default: return 1; } return 0; @@ -820,12 +826,6 @@ static int parsearg_sync(int opt) case 'u': (config->op_s_upgrade)++; break; - case OP_DOWNLOADONLY: - case 'w': - config->op_s_downloadonly = 1; - config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; - config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS; - break; case OP_REFRESH: case 'y': (config->op_s_sync)++; -- 2.30.0

1 6

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

19 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 1c4e07989940a435483563be7c12915b32289fbe (commit) via 79227dabe07c43b5a208696312a42b00a328398d (commit) via 8ed98023b45d1cdea4217f7152dcdc77944a0ea7 (commit) via a4931704205718869fdf62d0e20a2a4b27216436 (commit) via 5151de301119ef73de12edc98e6c6ff4e2412873 (commit) via 5d21b2d44c1727e33bd7c71e657501eb013c44d0 (commit) via 4311cc3648df4d695b4c69b048137f87cb5dd89a (commit) via 8566cd9be905c96b56ec550ed30058bcc9aed06e (commit) via 57a75dedb115df9e6ed516bbb2cea5ef8582ce51 (commit) via e9cc95f3721967b3cb9f766d400606a8ef4491d0 (commit) via 8f7415c41b079ede67581a7685a779e427dab440 (commit) via 3f5125e47cbc87470890bfc76aa406732a10167d (commit) via 4cdbbcfc34c7edb72ad962bcd07bd78dcffa1ea1 (commit) via c1d23c0ff22f0edd34f266e9e95c30049f6b4639 (commit) from 8fda300e069315ea8ddb8fbc822addf4431da436 (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 1c4e07989940a435483563be7c12915b32289fbe Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:21:01 2021 -0800 do not try to download an empty db list Starting the download process, even if there is nothing to actually download, causes an error when pacman is built without curl and has no XferCommand defined (like our test suite). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 79227dabe07c43b5a208696312a42b00a328398d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:21:00 2021 -0800 make alpm download config accessible without curl Download-related config options are currently limited to builds with curl. This causes compilation errors when those options are used without an appropriate guard which often goes unnoticed because we all use curl. Front-ends providing their own download callback may also want to use these settings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ed98023b45d1cdea4217f7152dcdc77944a0ea7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:59 2021 -0800 sighandler: initialize sigaction fields Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a4931704205718869fdf62d0e20a2a4b27216436 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:58 2021 -0800 fully free error list in check_keyring Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5151de301119ef73de12edc98e6c6ff4e2412873 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:57 2021 -0800 plug memory leaks in _alpm_key_import Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d21b2d44c1727e33bd7c71e657501eb013c44d0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:56 2021 -0800 pacman-conf: free rootdir before replacing Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4311cc3648df4d695b4c69b048137f87cb5dd89a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:55 2021 -0800 pacman: indicate --overwrite takes a glob Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8566cd9be905c96b56ec550ed30058bcc9aed06e Author: Morten Linderud <morten(a)linderud.pw> Date: Sun Jan 10 17:13:47 2021 +0100 pacman-key: Close msg string in generate_master_key In 19980a61e9ed9b9a57520aaa919c40a4b5311f87 there was a msg added which didn't get the string closed. Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 57a75dedb115df9e6ed516bbb2cea5ef8582ce51 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 11:54:05 2021 +1000 mailmap addition Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9cc95f3721967b3cb9f766d400606a8ef4491d0 Author: morganamilo <morganamilo(a)archlinux.org> Date: Thu Dec 31 18:13:55 2020 +0000 Read targets from stdin before chrooting Operations involving --sysroot and reading targets from stdin were failing due to attempting to read targets after chrooting. Move the chroot to happen after targets are read. Fixes FS#68630 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8f7415c41b079ede67581a7685a779e427dab440 Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:56:22 2021 +0000 pacman: add file checksum validation against mtree With libarchive v3.5.0 we have API to fetch the digest from the mtree. Use that to validate if the installed files are modified or not. As always, a modified backup file will trigger a warning but will not result in an actual failure. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f5125e47cbc87470890bfc76aa406732a10167d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 09:26:53 2021 +1000 doc: move missed sections from alpm_ to libalpm_ Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4cdbbcfc34c7edb72ad962bcd07bd78dcffa1ea1 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 09:19:50 2021 +1000 doc: reference all libalpm sections within libalpm man page Also, fix minor typo. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1d23c0ff22f0edd34f266e9e95c30049f6b4639 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 09:19:03 2021 +1000 doc: rename libalpm-list man page for consistency All other libalpm man pages are in the form libalpm_<name>. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .mailmap | 1 + lib/libalpm/alpm.h | 57 +++++++++++++++++++++---------------- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/be_sync.c | 4 +++ lib/libalpm/handle.c | 12 -------- lib/libalpm/handle.h | 3 +- lib/libalpm/signing.c | 5 +++- lib/libalpm/sync.c | 3 +- lib/libalpm/util.c | 2 ++ scripts/pacman-key.sh.in | 2 +- src/pacman/check.c | 74 +++++++++++++++++++++++++++++++++++++++++++----- src/pacman/pacman-conf.c | 1 + src/pacman/pacman.c | 14 ++++----- src/pacman/sighandler.c | 1 + 14 files changed, 126 insertions(+), 55 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/7] pacman: indicate --overwrite takes a glob
by Andrew Gregory 19 Jan '21

19 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7b19162c..b39f5031 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -189,7 +189,7 @@ static void usage(int op, const char * const myname) switch(op) { case PM_OP_SYNC: case PM_OP_UPGRADE: - addlist(_(" --overwrite <path>\n" + addlist(_(" --overwrite <glob>\n" " overwrite conflicting files (can be used more than once)\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); -- 2.30.0

2 1

[pacman-dev] [PATCH] libalpm: fix payloads not being reset between servers
by morganamilo 17 Jan '21

17 Jan '21

This was originally fixed in e83e868a77865d42a33076605f9a90a165f7c93a but removed when implementing parallel downloads. --- Some what untested. Just need to wait for my internet to act up again. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index df5e8be7..3a65da7f 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -367,6 +367,12 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload fseek(payload->localf, 0, SEEK_SET); } + + /* reset progress for next server */ + payload->initial_size += payload->prevprogress; + payload->prevprogress = 0; + payload->unlink_on_fail = 0; + /* Set curl with the new URL */ curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); -- 2.30.0

3 2

[pacman-dev] [RFC] command-line provided paths under --sysroot
by Andrew Gregory 17 Jan '21

17 Jan '21

Implementing --sysroot the lazy way with a simple chroot turned out to have a number of complications that significantly reduce its utility. I've been sitting on a patch to reimplement it by prefixing all configuration paths with the sysroot, but this raises the question of how we should handle paths provided on the command line. Using chroot meant that all paths, regardless of what they were or where they came from, would be interpreted relative to the sysroot. Switching to manually adjusting paths means that we have the option to change that. I'm inclined to change pacman to use command line arguments/options as-is and have --sysroot just modify values from the config file. I think that's the friendlier option for users. Thoughts?

4 3

[pacman-dev] [PATCH 6/7] make alpm download config accessible without curl
by Andrew Gregory 16 Jan '21

16 Jan '21

Download-related config options are currently limited to builds with curl. This causes compilation errors when those options are used without an appropriate guard which often goes unnoticed because we all use curl. Front-ends providing their own download callback may also want to use these settings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- I saw the patch to hide the offending use of parallel_downloads after I wrote this. I think it makes more sense to just make these available to the front-end; we've already had one attempt to parallelize xfercommand. lib/libalpm/handle.c | 12 ------------ lib/libalpm/handle.h | 3 ++- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 3994f314..0444ee5d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -303,11 +303,7 @@ const char SYMEXPORT *alpm_option_get_dbext(alpm_handle_t *handle) int SYMEXPORT alpm_option_get_parallel_downloads(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBCURL return handle->parallel_downloads; -#else - return 1; -#endif } int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) @@ -854,11 +850,7 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBCURL handle->disable_dl_timeout = disable_dl_timeout; -#else - (void)disable_dl_timeout; /* silence unused variable warnings */ -#endif return 0; } @@ -866,11 +858,7 @@ int SYMEXPORT alpm_option_set_parallel_downloads(alpm_handle_t *handle, unsigned int num_streams) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBCURL ASSERT(num_streams >= 1, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); handle->parallel_downloads = num_streams; -#else - (void)num_streams; /* silence unused variable warnings */ -#endif return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 9fef0fbf..3e7d323e 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,9 +60,10 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURLM *curlm; +#endif + unsigned short disable_dl_timeout; unsigned int parallel_downloads; /* number of download streams */ -#endif #ifdef HAVE_LIBGPGME alpm_list_t *known_keys; /* keys verified to be in our keychain */ -- 2.30.0

2 1

[pacman-dev] [PATCH 7/7] do not try to download an empty db list
by Andrew Gregory 16 Jan '21

16 Jan '21

Starting the download process, even if there is nothing to actually download, causes an error when pacman is built without curl and has no XferCommand defined (like our test suite). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_sync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 0a5cb7c2..91e5f5cf 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -198,6 +198,10 @@ int SYMEXPORT alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force) payload->max_size = 128 * 1024 * 1024; payloads = alpm_list_add(payloads, payload); } + if(payloads == NULL) { + ret = 0; + goto cleanup; + } event.type = ALPM_EVENT_DB_RETRIEVE_START; EVENT(handle, &event); -- 2.30.0

1 0

[pacman-dev] [PATCH 5/7] sighandler: initialize sigaction fields
by Andrew Gregory 16 Jan '21

16 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 2 ++ src/pacman/sighandler.c | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9ae08745..3fbd757a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -562,7 +562,9 @@ static void _alpm_reset_signals(void) 0 }; struct sigaction def; + def.sa_flags = 0; def.sa_handler = SIG_DFL; + sigemptyset(&def.sa_mask); for(i = signals; *i; i++) { sigaction(*i, &def, NULL); } diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index ff9c6ac4..9794b30b 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -106,6 +106,7 @@ static void segv_handler(int signum) /* restore the default handler */ _reset_handler(signum); /* unblock SIGSEGV */ + sigemptyset(&segvset); sigaddset(&segvset, signum); sigprocmask(SIG_UNBLOCK, &segvset, NULL); /* re-raise to trigger a core dump */ -- 2.30.0

1 0