- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/2] makepkg: Allow placing local sources in subdirectories
by Vladimir Panteleev 13 May '18

13 May '18

Currently, makepkg doesn't support (actually, mishandles) sources in a subdirectory of the package directory. Though there aren't many uses for such a feature, it is useful for an otherwise source-less package of Arch- or site-specific scripts, to be installed on one or a few systems, for which it doesn't make sense to have a separate source repository. In this case, it would be nice to either move the source files in a subdirectory, or allow pulling them from somewhere else on the filesystem. Whether or not this is considered a valid usecase, the current behavior is broken (makepkg computes broken paths and attempts to operate on files that aren't there), so this probably ought to be fixed regardless. I couldn't find a test suite for makepkg (only pacman and makepkg-template), so, here is the test case: mkdir dir touch a dir/b /tmp/c cat > PKGBUILD <<'EOF' pkgname=dir-test pkgver=1 pkgrel=1 arch=('any') source=(a dir/b /tmp/c) md5sums=(SKIP SKIP SKIP) package() { cp "$srcdir"/* "$pkgdir/" ; } EOF One thing to note is that this doesn't protect against filename collisions: specifying dir1/file and dir2/file as sources will just make makepkg clobber the first file. Still, that's not new: source=(http://xxx/a http://yyy/a) are going to have the same problem. Vladimir Panteleev (2): libmakepkg: Fix handling of file paths in get_filepath libmakepkg: Use the correct path in extract_sources scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) -- 2.17.0

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-269-g03272ad5
by Allan McRae 12 May '18

12 May '18

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 03272ad57142a1c7dacf1d9933d52650d3936225 (commit) via 40937b381abd013cf3473af4ea04bf52fecf0854 (commit) from af6125fbcc51b2074321003c3cbd74aeb65d9b7b (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 03272ad57142a1c7dacf1d9933d52650d3936225 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Fri Apr 20 19:46:16 2018 +0200 libmakepkg: Support file 5.33's application/x-pie-executable file 5.33 introduces a new MIME type "application/x-pie-executable", which is used for relocatable binaries. makepkg ignored these binaries and did not attempt to strip them. Handle the new MIME type like the old "application/x-sharedlib". Stripping the binaries with --strip-unneeded to keep relocation information should be the correct thing to do. file 5.33 also misidentifies actual libraries as PIE executables, so we didn't strip any shared libraries, either. We now work around this bug. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 40937b381abd013cf3473af4ea04bf52fecf0854 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 25 12:21:17 2017 -0500 util/pkgbuild: fix broken indentation Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 4 ++-- scripts/libmakepkg/tidy/strip.sh.in | 2 ++ scripts/libmakepkg/util/pkgbuild.sh.in | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: Support file 5.33's application/x-pie-executable
by Jan Alexander Steffens (heftig) 12 May '18

12 May '18

file 5.33 introduces a new MIME type "application/x-pie-executable", which is used for relocatable binaries. makepkg ignored these binaries and did not attempt to strip them. Handle the new MIME type like the old "application/x-sharedlib". Stripping the binaries with --strip-unneeded to keep relocation information should be the correct thing to do. file 5.33 also misidentifies actual libraries as PIE executables, so we didn't strip any shared libraries, either. We now work around this bug. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> --- scripts/libmakepkg/tidy/strip.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index e20114c0..36d1b89e 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -125,6 +125,8 @@ tidy_strip() { esac;; *application/x-executable*) # Binaries strip_flags="$STRIP_BINARIES";; + *application/x-pie-executable*) # Relocatable binaries + strip_flags="$STRIP_SHARED";; *) continue ;; esac -- 2.17.0

5 7

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-267-gaf6125fb
by Allan McRae 12 May '18

12 May '18

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 af6125fbcc51b2074321003c3cbd74aeb65d9b7b (commit) via 0d356c27c17fb62ed31327d634748f64c781dc49 (commit) via 1741bdaf81cc7c0881ee7a26861b3d94c384f13f (commit) via 828f305023604474ea078a90bcf9752efdbc8aa9 (commit) via 5698d7b66daa2a0bc99cab7a989cef1c806c3bf6 (commit) via f173f6d0da3793952691416d80441b46af12fc94 (commit) via 2b4c996b86782ee7280f5c6de1ef873ed9858f7a (commit) via 542c3cf812e32989610cb09f40dbc237f2fba9bb (commit) via 2c94118dc168f16231e38a84c0b569b5b0006fd9 (commit) via fa8b99189e9f2035a81c8ff8275894b61dc0bce7 (commit) from 77986af9b7ae9b2cc701a30bcc1cac51b6f1b5be (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 af6125fbcc51b2074321003c3cbd74aeb65d9b7b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri May 11 13:59:26 2018 -0400 Fix gcc8 warnings. Attempting to compile pacman with gcc8 results in several warnings like: remove.c: In function ‘unlink_file.isra.4’: remove.c:407:34: warning: ‘.pacsave.’ directive output may be truncated writing 9 bytes into a region of size between 1 and 4096 [-Wformat-truncation=] Fix by adding checks to error out if snprintf tries to reserve a truncated filename. Because the return values are checked, gcc delegates the truncation response to our code instead of throwing warnings. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d356c27c17fb62ed31327d634748f64c781dc49 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 9 00:18:39 2018 -0400 Fix regression that broke repo-add aborting on failures In commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a the changes from commit 81d233b79345d05d5bf17a4b2844085e14f9ee36 seem to have been inadvertently backed out. Right now the current check doesn't do anything, since "fail" is always nothing and therefore successful. Fixes FS#58505 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1741bdaf81cc7c0881ee7a26861b3d94c384f13f Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 9 00:17:10 2018 -0400 libmakepkg/integrity: determine what is a signature preferring local filename Checking the file extension to determine if something is a signature is currently done in three places: - verify_file_signature: uses $file to print status, reuses it for comparison - source_has_signatures: uses $netfile, but removes url component if filename component exists - generate_one_checksum: uses $netfile and fails to detect renamed files This leads to inconsistent behavior when trying to use a signature of the form "foo-1.0.tar.gz.asc::https://example.com/foo-1.0.tar.gz.pgp" Fix this by treating the third case like the second case. Reported-by: Giancarlo Razzolini <grazzolini(a)archlinux.org> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 828f305023604474ea078a90bcf9752efdbc8aa9 Author: Simon Linden <xhi2018(a)gmail.com> Date: Sat May 5 16:17:39 2018 +0000 bash_completion.in - consider option "-n --native" in operation "-Q --query" Signed-off-by: Simon Linden <xhi2018(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5698d7b66daa2a0bc99cab7a989cef1c806c3bf6 Author: Robin Broda <robin(a)broda.me> Date: Thu May 3 09:27:03 2018 +0200 Append architecture information to 'installed' elements in .BUILDINFO Adding the architecture to the 'installed' elements of the .BUILDINFO file makes it easier to retrieve the packages needed to reconstruct the build environment. Signed-off-by: Robin Broda <robin(a)broda.me> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f173f6d0da3793952691416d80441b46af12fc94 Author: Robin Broda <robin(a)broda.me> Date: Thu May 3 09:39:16 2018 +0200 Add pkgarch to .BUILDINFO Architecture information is required for repro tooling This is a revised version of https://patchwork.archlinux.org/patch/475/ Signed-off-by: Robin Broda <robin(a)broda.me> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2b4c996b86782ee7280f5c6de1ef873ed9858f7a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 2 15:54:36 2018 -0400 libmakepkg: don't save/set/restore extglob in bash [[ tests Since bash 4.1 extglobs can be used within [[ ... ]] regardless of whether the shopt is set. Our configure.ac requires bash 4.1.0 at a minimum for pacman scripts. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 542c3cf812e32989610cb09f40dbc237f2fba9bb Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 2 14:24:44 2018 -0400 libmakepkg: only save the shellopts we need micro-optimization: We only care about temporarily enforcing extglob, so that is the only one we need to explicitly restore. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2c94118dc168f16231e38a84c0b569b5b0006fd9 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu May 10 23:23:58 2018 -0400 libmakepkg/lint_pkgbuild: fix regression in linting depends=(foo=$epoch:$pkgver-$pkgrel) In commit 91b72cc386ca03241791748da5da2b150c724ace support was added for linting depends/etc. to ensure they contain only valid dependency specifiers. However it did not properly take into account the possibility of dependencies linked to a specific pkgrel or epoch, which promptly failed to build because "-" and ":" is not allowed in a pkgver. pkgrel is something supported by pacman and useful for e.g. split packages which cannot be mismatched even if the pkgver is the same. Fix by removing an optional suffixed "-$decimal" when checking for a valid pkgver. epoch is kind of difficult to do without :D so likewise fix by removing an optional prefixed "$integer:" Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa8b99189e9f2035a81c8ff8275894b61dc0bce7 Author: Rafael Ascensão <rafa.almas(a)gmail.com> Date: Tue May 1 17:54:04 2018 +0100 remove unneeded break argument from option parsing Some scripts are using `break 2` to break out of the option parsing loop. Since a single `break` is sufficient in these cases, remove the extra argument. Signed-off-by: Rafael Ascensão <rafa.almas(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/BUILDINFO.5.txt | 5 ++++- lib/libalpm/remove.c | 16 ++++++++++++---- scripts/completion/bash_completion.in | 4 ++-- scripts/libmakepkg/integrity/generate_checksum.sh.in | 2 +- .../libmakepkg/lint_pkgbuild/3 | 0 scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in | 10 ++++++---- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++++++---- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 10 ++++++---- scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 10 ++++++---- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 14 +++++++++++--- scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 4 ++-- scripts/libmakepkg/util/util.sh.in | 5 ----- scripts/makepkg.sh.in | 17 +++++++++++++---- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 3 ++- 18 files changed, 75 insertions(+), 43 deletions(-) copy test/scripts/makepkg-template-tests/template-without-version/templates/template-without_version.template => scripts/libmakepkg/lint_pkgbuild/3 (100%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Append architecture information to 'installed' elements in .BUILDINFO
by Robin Broda 12 May '18

12 May '18

This is a revised version of https://patchwork.archlinux.org/patch/476/, without the performance penalty. Signed-off-by: Robin Broda <robin(a)broda.me> --- doc/BUILDINFO.5.txt | 2 +- scripts/makepkg.sh.in | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/BUILDINFO.5.txt b/doc/BUILDINFO.5.txt index b7a72831..bac6d49f 100644 --- a/doc/BUILDINFO.5.txt +++ b/doc/BUILDINFO.5.txt @@ -58,7 +58,7 @@ BUILDINFO file format. *installed (array)*:: The installed packages at build time including the version information of - the package. Formatted as "$pkgname-$pkgver-$pkgrel". + the package. Formatted as "$pkgname-$pkgver-$pkgrel-$pkgarch". See Also -------- diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eee8a56c..c9111078 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -697,8 +697,15 @@ write_buildinfo() { write_kv_pair "buildenv" "${BUILDENV[@]}" write_kv_pair "options" "${OPTIONS[@]}" - local pkglist=($(run_pacman -Q | sed "s# #-#")) - write_kv_pair "installed" "${pkglist[@]}" + local pkglist=($(run_pacman -Qq)) + local pkginfos="$(LC_ALL=C run_pacman -Qi ${pkglist[@]})" + local pkginfos_parsed=($(awk -F': ' '\ + /^Name .*/ {printf $2} \ + /^Version .*/ {printf "-"$2} \ + /^Architecture .*/ {print "-"$2} \ + ' <<< "${pkginfos}")) + + write_kv_pair "installed" "${pkginfos_parsed[@]}" } # build a sorted NUL-separated list of the full contents of the current -- 2.17.0

2 1

[pacman-dev] [PATCH] Fix gcc8 warnings.
by Eli Schwartz 11 May '18

11 May '18

Attempting to compile pacman with gcc8 results in several warnings like: remove.c: In function ‘unlink_file.isra.4’: remove.c:407:34: warning: ‘.pacsave.’ directive output may be truncated writing 9 bytes into a region of size between 1 and 4096 [-Wformat-truncation=] Fix by adding checks to error out if snprintf tries to reserve a truncated filename. Because the return values are checked, gcc delegates the truncation response to our code instead of throwing warnings. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- This seems to solve the issue, though as mentioned in IRC it might be nice if we only needed to check the first use of newfile -- everything else is guaranteed to be shorter. Also feel free to nitpick the log message wording. lib/libalpm/remove.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 5b53ac34..78ca5be7 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -404,14 +404,22 @@ static void shift_pacsave(alpm_handle_t *handle, const char *file) /* Shift pacsaves */ unsigned long i; for(i = log_max + 1; i > 1; i--) { - snprintf(oldfile, PATH_MAX, "%s.pacsave.%lu", file, i-1); - snprintf(newfile, PATH_MAX, "%s.pacsave.%lu", file, i); + if(snprintf(oldfile, PATH_MAX, "%s.pacsave.%lu", file, i-1) >= PATH_MAX + || snprintf(newfile, PATH_MAX, "%s.pacsave.%lu", file, i) >= PATH_MAX) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not backup %s due to PATH_MAX overflow\n"), file); + goto cleanup; + } rename(oldfile, newfile); } - snprintf(oldfile, PATH_MAX, "%s.pacsave", file); + if(snprintf(oldfile, PATH_MAX, "%s.pacsave", file) >= PATH_MAX + || snprintf(newfile, PATH_MAX, "%s.1", oldfile) >= PATH_MAX) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not backup %s due to PATH_MAX overflow\n"), file); + goto cleanup; + } if(stat(oldfile, &st) == 0) { - snprintf(newfile, PATH_MAX, "%s.1", oldfile); rename(oldfile, newfile); } -- 2.17.0

1 0

[pacman-dev] [PATCH 1/2] libmakepkg/lint_pkgbuild: fix regression in linting depends=(foo=$pkgver-$pkgrel)
by Eli Schwartz 11 May '18

11 May '18

In commit 91b72cc386ca03241791748da5da2b150c724ace support was added for linting depends/etc. to ensure they contain only valid dependency specifiers. However it did not properly take into account the possibility of dependencies linked to a specific pkgrel, which promptly failed to build because "-" is not allowed in a pkgver. This is something supported by pacman and useful for e.g. split packages which cannot be mismatched even if the pkgver is the same. Fix by removing an optional suffixed "-$decimal" when checking for a valid pkgver. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Ouch! Sorry... scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in | 3 ++- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 3 ++- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 3 ++- scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 3 ++- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 9 ++++++++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in index 5d15bfb2..a4f297d9 100644 --- a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in @@ -46,7 +46,8 @@ lint_checkdepends() { ver=${checkdepend#*@(<|>|=|>=|<=)} lint_one_pkgname checkdepends "$name" || ret=1 if [[ $ver != $checkdepend ]]; then - check_pkgver "$ver" checkdepends || ret=1 + # remove optional pkgrel in version specifier + check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" checkdepends || ret=1 fi done diff --git a/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in index d81e9784..0f81ddb1 100644 --- a/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in @@ -46,7 +46,8 @@ lint_conflicts() { ver=${conflict#*@(<|>|=|>=|<=)} lint_one_pkgname conflicts "$name" || ret=1 if [[ $ver != $conflict ]]; then - check_pkgver "$ver" conflicts || ret=1 + # remove optional pkgrel in version specifier + check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" conflicts || ret=1 fi done diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in index f17bc545..cbd97706 100644 --- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -46,7 +46,8 @@ lint_depends() { ver=${depend#*@(<|>|=|>=|<=)} lint_one_pkgname depends "$name" || ret=1 if [[ $ver != $depend ]]; then - check_pkgver "$ver" depends || ret=1 + # remove optional pkgrel in version specifier + check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 fi done diff --git a/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in index 1d0762fb..fc1549d5 100644 --- a/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in @@ -46,7 +46,8 @@ lint_makedepends() { ver=${makedepend#*@(<|>|=|>=|<=)} lint_one_pkgname makedepends "$name" || ret=1 if [[ $ver != $makedepend ]]; then - check_pkgver "$ver" makedepends || ret=1 + # remove optional pkgrel in version specifier + check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" makedepends || ret=1 fi done diff --git a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in index 7500a88a..a0bef4f5 100644 --- a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in @@ -37,6 +37,10 @@ lint_provides() { get_pkgbuild_all_split_attributes provides provides_list + # this function requires extglob - save current status to restore later + local shellopts=$(shopt -p extglob) + shopt -s extglob + for provide in "${provides_list[@]}"; do if [[ $provide == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" @@ -47,9 +51,12 @@ lint_provides() { ver=${provide#*=} lint_one_pkgname provides "$name" || ret=1 if [[ $ver != $provide ]]; then - check_pkgver "$ver" provides || ret=1 + # remove optional pkgrel in version specifier + check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" provides || ret=1 fi done + eval "$shellopts" + return $ret } -- 2.17.0

1 3

[pacman-dev] [PATCH] Fix regression that broke repo-add aborting on failures
by Eli Schwartz 09 May '18

09 May '18

In commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a the changes from commit 81d233b79345d05d5bf17a4b2844085e14f9ee36 seem to have been inadvertently backed out. Right now the current check doesn't do anything, since "fail" is always nothing and therefore successful. Fixes FS#58505 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/repo-add.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 86bf9a88..4f2f3bb3 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -813,11 +813,12 @@ fi prepare_repo_db +fail=0 for arg in "${args[@]:1}"; do case $cmd in repo-add) add "$arg" ;; repo-remove) remove "$arg" ;; - esac && success=1 + esac || fail=1 done # if the whole operation was a success, re-zip and rotate databases -- 2.17.0

1 0

[pacman-dev] [PATCH] libmakepkg/integrity: determine what is a signature preferring local filename
by Eli Schwartz 09 May '18

09 May '18

Checking the file extension to determine if something is a signature is currently done in three places: - verify_file_signature: uses $file to print status, reuses it for comparison - source_has_signatures: uses $netfile, but removes url component if filename component exists - generate_one_checksum: uses $netfile and fails to detect renamed files This leads to inconsistent behavior when trying to use a signature of the form "foo-1.0.tar.gz.asc::https://example.com/foo-1.0.tar.gz.pgp" Fix this by treating the third case like the second case. Reported-by: Giancarlo Razzolini <grazzolini(a)archlinux.org> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I wasn't sure at first if this was worth refactoring into a utility function, but it does seem to small to bother. scripts/libmakepkg/integrity/generate_checksum.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index fdee0d72..eb9b74fc 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -56,7 +56,7 @@ generate_one_checksum() { sum="SKIP" ;; *) - if [[ $netfile != *.@(sig?(n)|asc) ]]; then + if [[ ${netfile%%::*} != *.@(sig?(n)|asc) ]]; then local file file="$(get_filepath "$netfile")" || missing_source_file "$netfile" sum="$("${integ}sum" "$file")" -- 2.17.0

1 0

[pacman-dev] [PATCH] bash_completion.in - consider option "-n --native" in operation "-Q --query"
by Simon Linden 05 May '18

05 May '18

Signed-off-by: Simon Linden <xhi2018(a)gmail.com> --- scripts/completion/bash_completion.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/completion/bash_completion.in b/scripts/completion/ bash_completion.in index 9ef43238..d750e12f 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -106,8 +106,8 @@ _pacman() { _get_comp_words_by_ref cur prev database=('asdeps asexplicit') files=('list machinereadable owns search refresh regex' 'l o s x y') - query=('changelog check deps explicit file foreign groups info list owns - search unrequired upgrades' 'c e g i k l m o p s t u') + query=('changelog check deps explicit file foreign groups info list native owns + search unrequired upgrades' 'c e g i k l m n o p s t u') remove=('cascade dbonly nodeps assume-installed nosave print recursive unneeded' 'c n p s u') sync=('asdeps asexplicit clean dbonly downloadonly force groups ignore ignoregroup info list needed nodeps assume-installed print refresh recursive search sysupgrade' -- 2.17.0

1 0