- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-122-g4d8f58d3
by Allan McRae 21 Oct '20

21 Oct '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 4d8f58d3b940f778b27c59e53ea9f3fab20a07ba (commit) via c99a3cc867ee5bf725a5d33d57120c3764aeb41e (commit) via f76bd2c6c1b94792112d311ac53662d3d9b6821d (commit) from 406a37206f9afbc3731ac22eda5b45b5a15eddc5 (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 4d8f58d3b940f778b27c59e53ea9f3fab20a07ba Author: Michael Straube <michael.straubej(a)gmail.com> Date: Thu Oct 15 12:56:26 2020 +0200 makepkg: emptydirs: fix typo Fix typo in a comment in tidy_emptydirs(). Signed-off-by: Michael Straube <michael.straubej(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c99a3cc867ee5bf725a5d33d57120c3764aeb41e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 11 22:22:05 2020 -0400 makepkg: properly localize some internal function variables We leaked fullver and pkgarch all over the place, and only conditionally unset the other variables. Marking them local is a more proactive solution. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f76bd2c6c1b94792112d311ac53662d3d9b6821d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 11 22:22:04 2020 -0400 makepkg: fix signing of source packages In commit c6b04c04653ba9933fe978829148312e412a9ea7 the signing stage was moved out of fakeroot, and thus into the main control flow instead of create_{,src}package While the function for signing binary packages has logic to build and gpg-sign multiple filenames, the source package never got this special treatment. This would be fine, except it uses the standard variables to set define the filename... like ${fullver}, which is usually set beforehand, but in this case is not. We don't define fullver globally as it's an internal implementation detail, except by sheer coincidence if PKGVERFUNC is false due to improperly guarded code. Result: source packages didn't end up signed. Instead, we raised a logic error: ==> WARNING: Failed to sign package file somepackage-.src.tar.gz. ==> ERROR: An unknown error has occurred. Exiting... Instead, let's just build the version inline, since we only use it once. Reported-by: GaKu999 <g4ku999(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/makepkg.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: emptydirs: fix typo
by Michael Straube 21 Oct '20

21 Oct '20

Fix typo in a comment in tidy_emptydirs(). Signed-off-by: Michael Straube <michael.straubej(a)gmail.com> --- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/emptydirs.sh.in index 902ea317..ffa0276f 100644 --- a/scripts/libmakepkg/tidy/emptydirs.sh.in +++ b/scripts/libmakepkg/tidy/emptydirs.sh.in @@ -33,7 +33,7 @@ tidy_remove+=('tidy_emptydirs') tidy_emptydirs() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - # we are unable to use '-empty' as it is non-POSIX and not support by all find variants + # we are unable to use '-empty' as it is non-POSIX and not supported by all find variants find . -depth -type d -exec rmdir '{}' \; 2>/dev/null fi } -- 2.28.0

2 1

[pacman-dev] [PATCH 1/2] makepkg: fix signing of source packages
by Eli Schwartz 21 Oct '20

21 Oct '20

In commit c6b04c04653ba9933fe978829148312e412a9ea7 the signing stage was moved out of fakeroot, and thus into the main control flow instead of create_{,src}package While the function for signing binary packages has logic to build and gpg-sign multiple filenames, the source package never got this special treatment. This would be fine, except it uses the standard variables to set define the filename... like ${fullver}, which is usually set beforehand, but in this case is not. We don't define fullver globally as it's an internal implementation detail, except by sheer coincidence if PKGVERFUNC is false due to improperly guarded code. Result: source packages didn't end up signed. Instead, we raised a logic error: ==> WARNING: Failed to sign package file somepackage-.src.tar.gz. ==> ERROR: An unknown error has occurred. Exiting... Instead, let's just build the version inline, since we only use it once. Reported-by: GaKu999 <g4ku999(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e1e95412..a9e7c691 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1362,7 +1362,7 @@ if (( SOURCEONLY )); then if [[ $SIGNPKG = 'y' ]]; then msg "$(gettext "Signing package...")" - create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" + create_signature "$SRCPKGDEST/${pkgbase}-$(get_full_version)${SRCEXT}" fi msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))" -- 2.28.0

2 4

[pacman-dev] [PATCH] libmakepkg: compress: fix tar extension
by Michael Straube 21 Oct '20

21 Oct '20

With commit 74aacf44958e1343b910b3fbdcf753393857f070 creating uncompressed .tar packages fails. -> Compressing package... /usr/share/makepkg/util/compress.sh: line 70: COMPRESS.TAR[@]: invalid variable name bsdtar: Write error Empty the '$ext' variable for the '.tar' extension in get_compress_command() to fix this. We would fallback to cat for 'tar' anyways. Signed-off-by: Michael Straube <michael.straubej(a)gmail.com> --- scripts/libmakepkg/util/compress.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in index d35a01fa..6595e0d6 100644 --- a/scripts/libmakepkg/util/compress.sh.in +++ b/scripts/libmakepkg/util/compress.sh.in @@ -65,6 +65,8 @@ get_compression_command() { esac ext=${ext#*.tar.} + ext=${ext#*.tar} + if [[ -n $ext ]]; then extarray="COMPRESS${ext^^}[@]" resolvecmd=("${!extarray}") -- 2.28.0

2 1

[pacman-dev] pkglint
by Michael Straube 13 Oct '20

13 Oct '20

Hi there, Allan talked about pkglint in Arch Conf and I started to implement some of the simpler namcap rules. Is there any interest in working on pkglint? And if so, where should I send patches? Just open pull requests in the github repo? Best regards Michael

2 2

[pacman-dev] Fwd: pacman Swedish Translation Done
by Luna Jernberg 09 Oct '20

09 Oct '20

---------- Forwarded message --------- From: Luna Jernberg <droidbittin(a)gmail.com> Date: Fri, Oct 9, 2020 at 10:30 AM Subject: pacman Swedish Translation Done To: <allan(a)archlinux.org> Cc: <pacman-dev(a)archlinux.org>, <archconf(a)archlinux.org>, Martin Jernberg < droidbittin(a)gmail.com> Hello i got the Swedish pacman translation fully done now during the Arch Linux Conference Pre Days

1 0

[pacman-dev] [PATCH] repo-add: add --include-sigs option
by Allan McRae 04 Oct '20

04 Oct '20

Pacman now downloads the signature files for all packages when present in a repository. That makes distributing signatures within repository databases redundant and costly. Do not distribute the package signature files within the repo databases by default and add an --include-sigs to revert to the old behaviour. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/repo-add.8.asciidoc | 2 ++ scripts/repo-add.sh.in | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/repo-add.8.asciidoc b/doc/repo-add.8.asciidoc index 8de4485b..9b903ab1 100644 --- a/doc/repo-add.8.asciidoc +++ b/doc/repo-add.8.asciidoc @@ -70,6 +70,8 @@ repo-add Options Remove old package files from the disk when updating their entry in the database. +*\--include-sigs*:: + Include package PGP signatures in the repository database (if available) Example ------- diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 7182d1b8..c153e7bb 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' PREVENT_DOWNGRADE=0 +INCLUDE_SIGS=0 # Import libmakepkg source "$LIBRARY"/util/compress.sh @@ -260,7 +261,7 @@ db_write_entry() { fi # compute base64'd PGP signature - if [[ -f "$pkgfile.sig" ]]; then + if (( INCLUDE_SIGS )) && [[ -f "$pkgfile.sig" ]]; then if grep -q 'BEGIN PGP SIGNATURE' "$pkgfile.sig"; then error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig" return 1 @@ -622,6 +623,9 @@ while (( $# )); do -p|--prevent-downgrade) PREVENT_DOWNGRADE=1 ;; + --include-sigs) + INCLUDE_SIGS=1 + ;; *) args+=("$1") ;; -- 2.27.0

5 10

[pacman-dev] [BUG] libalpm: symlink to directory causes conflict
by Barnabás Pőcze 29 Sep '20

29 Sep '20

Hi, this may or may not be an actual bug, I'm not sure if it's the intended behaviour. On my particular system '/lib' is a symbolic link to '/usr/lib'. I was creating a PKGBUILD for a program that places a systemd service file into '/lib/systemd/...' during installation. Unfortunately, when I would like to install the created package, libalpm detects a file conflict between '/lib' (the symlink in the filesystem) and '/lib' (the directory in the package). I skimmed through the code, and it seems '_alpm_db_find_fileconflicts()' recognizes this "conflict". Moreover, it appears that 'extract_single_file()' also cannot handle this case. Could someone confirm that this is indeed the intended behaviour? And if yes, why? Thanks, Barnabás Pőcze

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-119-g406a3720
by Allan McRae 23 Sep '20

23 Sep '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 406a37206f9afbc3731ac22eda5b45b5a15eddc5 (commit) via 4533c6a8e0f39c7707e671b7f9687607b46f1417 (commit) via ff7ff3c58dcdb858c253e8e7fea1d758cdff0312 (commit) via d85d9c8c6044bc58963c41df8b6c15de1356ab2f (commit) via 04b69957c8c54b1ad80f3e5c9270657c48fd0b15 (commit) via f235cea7330ec0ceb98c9474e7a8ea7fd27a3df2 (commit) from f53ac85ff6cd2f74f8157f23a5e21650cd17f372 (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 406a37206f9afbc3731ac22eda5b45b5a15eddc5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu May 14 13:05:30 2020 -0400 makepkg: libprovides: don't provide both versioned and unversioned sonames If multiple files match the pattern libfoo.so*, we want to check each of them and see if they are shared libraries, and if so, if they have versions attached. But some packages can have both shared libraries and random files which match the filename pattern. This is true at least for files in /usr/share/gdb/auto-load/, which must match the filename they are paired with, followed by "-gdb.py" (or some other gdb scripting ext), but definitely don't contain a shared library. In this case, we don't want to double-report the library in the generated provides. It's also possible (probably) for a package to provide a versioned as well as an unversioned shared library, but in such cases a single provides entry is sufficient to cover both cases (and the libdepends for the depending package would contain an unversioned dependency). Solve this by keeping track of whether we have added a versioned soname provides already, and then only adding a maximum of one unversioned provides *iff* there isn't a versioned one yet. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4533c6a8e0f39c7707e671b7f9687607b46f1417 Author: Chih-Hsuan Yen <yan12125(a)gmail.com> Date: Sun Sep 13 16:41:40 2020 +0800 util.c: table_print_line: properly align texts involving CJK For printf in C, width is counted as bytes rather than Unicode width. [1] > If the precision is specified, no more than that many bytes are written. [1] Section 7.21.6, N2176, final draft for ISO/IEC 9899:2017 (C18) Thanks Andrew Gregory for suggesting a simpler approach. Fixes FS#59229 Signed-off-by: Chih-Hsuan Yen <yan12125(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ff7ff3c58dcdb858c253e8e7fea1d758cdff0312 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Mon Sep 14 18:52:56 2020 -0700 FS#66472: Remove *.sig file if package corrupted In case if a package corrupted (e.g. signature or hash is invalid) pacman tries to remove the package file to redownload it anew the next time. Remove *.sig file as well to make sure no data is left for the invalid package. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d85d9c8c6044bc58963c41df8b6c15de1356ab2f Author: Ronan Pigott <rpigott(a)berkeley.edu> Date: Fri Aug 21 20:20:02 2020 -0700 Add pacman-conf zsh completions Signed-off-by: Ronan Pigott <rpigott(a)berkeley.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 04b69957c8c54b1ad80f3e5c9270657c48fd0b15 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 10 20:52:29 2020 -0400 remove more autotools files We forgot to remove m4/ in commit 454ea024383eab60295e4c4fdf2c329475887b2c and now it's tragically reminding me of autotools! Also take this opportunity to drop some symlinks in lib/libalpm/ for libcommon source files. In autotools these were built specifically for libalpm and needed to be available in that directory, but the meson setup just has libalpm depend on libcommon. So these pseudo source files aren't needed anymore. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f235cea7330ec0ceb98c9474e7a8ea7fd27a3df2 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 3 12:44:24 2020 +1000 makepkg.conf: Reword "Defaults" FS#61661 notes that we have a comment "Defaults" value for BUILDENV and OPTIONS but that does not necessarily correspond to what the example makepkg.conf sets. Change the comment to "Makepkg defaults" to indicate this is what makepkg will do unless told otherwise. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/makepkg.conf.in | 4 +- lib/libalpm/ini.c | 1 - lib/libalpm/ini.h | 1 - lib/libalpm/sync.c | 6 + lib/libalpm/util-common.c | 1 - lib/libalpm/util-common.h | 1 - m4/.gitignore | 3 - m4/acinclude.m4 | 179 -------------------------- m4/gpgme.m4 | 238 ----------------------------------- scripts/completion/zsh_completion.in | 96 +++++++++++++- scripts/makepkg.sh.in | 16 +-- src/pacman/util.c | 4 +- 12 files changed, 114 insertions(+), 436 deletions(-) delete mode 120000 lib/libalpm/ini.c delete mode 120000 lib/libalpm/ini.h delete mode 120000 lib/libalpm/util-common.c delete mode 120000 lib/libalpm/util-common.h delete mode 100644 m4/.gitignore delete mode 100644 m4/acinclude.m4 delete mode 100644 m4/gpgme.m4 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: libprovides: don't provide both versioned and unversioned sonames
by Eli Schwartz 23 Sep '20

23 Sep '20

If multiple files match the pattern libfoo.so*, we want to check each of them and see if they are shared libraries, and if so, if they have versions attached. But some packages can have both shared libraries and random files which match the filename pattern. This is true at least for files in /usr/share/gdb/auto-load/, which must match the filename they are paired with, followed by "-gdb.py" (or some other gdb scripting ext), but definitely don't contain a shared library. In this case, we don't want to double-report the library in the generated provides. It's also possible (probably) for a package to provide a versioned as well as an unversioned shared library, but in such cases a single provides entry is sufficient to cover both cases (and the libdepends for the depending package would contain an unversioned dependency). Solve this by keeping track of whether we have added a versioned soname provides already, and then only adding a maximum of one unversioned provides *iff* there isn't a versioned one yet. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Notes: Currently we only have gdb/auto-load/ scripts for shared libraries in: - gcc - glib2 - gstreamer - efl In the first 3 cases, libprovides is entirely useless anyway. libstdc++ is perpetually stable (backwards-compatible ABI) just like glibc. glib2 actually does use libprovides, despite that it makes no sense for glib2 to libprovide anything, as the glib2 developers have this thing where they always use a soname of "0" and bump ABI versions by changing libglib-2.0.so to libglib-3.0.so -- as a result if you want to track dependencies you need to change to a different soname manually, and might as well just depend on the package itself (which already has a version in the pkgname). (gstreamer is in the same boat as glib2 because it is part of the same ecosystem.) efl doesn't currently libprovide "libeo.so", but if it did, then the issue would exist and be fixed by this patch. And more generally, any project wishing to implement gdb/auto-load/ scripts could have this issue, so it makes sense to make it work nicely. scripts/makepkg.sh.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d1416d15..3f746b77 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -516,9 +516,10 @@ find_libdepends() { find_libprovides() { - local p libprovides missing + local p newp libprovides missing for p in "${provides[@]}"; do missing=0 + newp=() case "$p" in *.so) mapfile -t filename < <(find "$pkgdir" -type f -name $p\*) @@ -531,7 +532,6 @@ find_libprovides() { local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[$.*$\].*/\1/p') if [[ -z "$sofile" ]]; then warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p" - libprovides+=("$p") continue fi @@ -541,25 +541,25 @@ find_libprovides() { # extract the library major version local soversion="${sofile##*\.so\.}" - libprovides+=("${p}=${soversion}-${soarch}") + newp+=("${p}=${soversion}-${soarch}") else warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p" - libprovides+=("$p") fi done else - libprovides+=("$p") missing=1 fi ;; - *) - libprovides+=("$p") - ;; esac if (( missing )); then warning "$(gettext "Cannot find library listed in %s: %s")" "'provides'" "$p" fi + if (( ${#newp[@]} > 0 )); then + libprovides+=("${newp[@]}") + else + libprovides+=("$p") + fi done (( ${#libprovides[@]} )) && printf '%s\n' "${libprovides[@]}" -- 2.26.2

2 2