October 2020 - 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