June 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libmakepkg/tidy: fix debug sources not being properly detected sometimes
by Eli Schwartz 19 Jun '18

19 Jun '18

DW_AT_comp_dir is meant to contain the directory in which the compiler was run DW_AT_name contains the source file the compiler was told to use. In the event that DW_AT_name is an absolute path, it is (obviously) not meant to be computed relative to DW_AT_comp_dir. However, we did not handle this correctly, and as a result tried to copy source files using doubled-up filepaths. The correct approach should be to use DW_AT_name on its own, in the event that it is an absolute path. This fixes debug package generation for many packages that use absolute paths in their build systems... like CMake. Reported-by: Jagannathan Tiruvallur Eachambadi <jagannathante(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 36d1b89e..5937e13c 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -37,7 +37,7 @@ build_id() { source_files() { LANG=C readelf "$1" --debug-dump | \ - awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{print $8 "/" name}' + awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{{if (name !~ /^\//) {printf "%s/", $8}}{print name}}' } strip_file() { -- 2.17.1

1 1

[pacman-dev] [PATCH 01/10] libmakepkg/util/option: Refactor checking to reduce code duplication
by Jan Alexander Steffens (heftig) 19 Jun '18

19 Jun '18

Pull out the expected=y/n check into a separate function and make use of the fact we can just concatenate the fallback arrays to get the same result. --- scripts/libmakepkg/util/option.sh.in | 85 +++++++++------------------- 1 file changed, 28 insertions(+), 57 deletions(-) diff --git a/scripts/libmakepkg/util/option.sh.in b/scripts/libmakepkg/util/option.sh.in index 46e0568d..28357e27 100644 --- a/scripts/libmakepkg/util/option.sh.in +++ b/scripts/libmakepkg/util/option.sh.in @@ -48,95 +48,66 @@ in_opt_array() { } +## +# usage : check_opt_array( $option, $expected_val, $haystack ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found +## +check_opt_array() { + local option=$1 expected=$2; shift 2 + + in_opt_array "$option" "$@" + case $? in + 0) # assert enabled + [[ $expected = y ]] + return ;; + 1) # assert disabled + [[ $expected = n ]] + return ;; + esac + + # not found + return 127 +} + + ## # Checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence. # # usage : check_option( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_option() { - in_opt_array "$1" ${options[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # fall back to makepkg.conf options - in_opt_array "$1" ${OPTIONS[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # not found - return 127 + check_opt_array "$@" "${options[@]}" "${OPTIONS[@]}" } ## # Check if option is present in BUILDENV # # usage : check_buildenv( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_buildenv() { - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = "y" ]] - return ;; - 1) # assert disabled - [[ $2 = "n" ]] - return ;; - esac - - # not found - return 127 + check_opt_array "$@" "${BUILDENV[@]}" } + ## # Checks to see if options are present in BUILDENV or PKGBUILD; # PKGBUILD options always take precedence. # # usage : check_buildoption( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_buildoption() { - in_opt_array "$1" ${options[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # not found - return 127 + check_opt_array "$@" "${options[@]}" "${BUILDENV[@]}" } -- 2.17.0

4 17

[pacman-dev] [PATCH] libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST
by Michael Straube 19 Jun '18

19 Jun '18

Add a case for curl error 'Could not resolve host'. An attempt to fix FS#48285. Signed-off-by: Michael Straube <straubem(a)gmx.de> --- lib/libalpm/dload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index eeef32f5..7f34c89e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -473,6 +473,13 @@ static int curl_download_internal(struct dload_payload *payload, payload->remote_name, hostname); } goto cleanup; + case CURLE_COULDNT_RESOLVE_HOST: + payload->unlink_on_fail = 1; + handle->pm_errno = ALPM_ERR_SERVER_BAD_URL; + _alpm_log(handle, ALPM_LOG_ERROR, + _("failed retrieving file '%s' from %s : %s\n"), + payload->remote_name, hostname, error_buffer); + goto cleanup; default: /* delete zero length downloads */ if(fstat(fileno(localf), &st) == 0 && st.st_size == 0) { -- 2.17.1

2 1

[pacman-dev] [PATCH] Revert "makepkg: use the `declare` builtin when backing up variables to eval"
by Allan McRae 19 Jun '18

19 Jun '18

This reverts commit 9e52a36794552b77ecf26f7f34b226d096978f1e. The change to use declare for the split package metadata backup/restore resulted in variables being declared at a local scope. When these variables were unset (mostly noticed with debug packaging) this left the variable at global scope defined. The decided fix for this requires the use of bash-4.2 features, which is greater than our current minimum version and so is not suitable for a maint release. Revert the change in the meantime. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 32423262..d35dd62d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1125,22 +1125,34 @@ check_build_status() { backup_package_variables() { local var for var in ${splitpkg_overrides[@]}; do - declare -p $var 2>/dev/null || printf '%s\n' "unset $var" + local indirect="${var}_backup" + eval "${indirect}=(\"\${$var[@]}\")" + done +} + +restore_package_variables() { + local var + for var in ${splitpkg_overrides[@]}; do + local indirect="${var}_backup" + if [[ -n ${!indirect} ]]; then + eval "${var}=(\"\${$indirect[@]}\")" + else + unset ${var} + fi done } run_split_packaging() { local pkgname_backup=("${pkgname[@]}") - local restore_package_variables for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" - restore_package_variables="$(backup_package_variables)" + backup_package_variables run_package $pkgname tidy_install lint_package || exit $E_PACKAGE_FAILED create_package - eval "$restore_package_variables" + restore_package_variables done pkgname=("${pkgname_backup[@]}") create_debug_package -- 2.17.1

1 0

[pacman-dev] [PATCH] PKGBUILD(5): Remove reference to ChangeLog prototype inclusion
by Allan McRae 19 Jun '18

19 Jun '18

We do not distribute a ChangeLog prototype, so should not reference it in the man page. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index c57038c2..f12effde 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -18,9 +18,9 @@ PKGBUILD is written, the actual package is built using makepkg and installed with pacman. NOTE: An example PKGBUILD, useful for reference, is located in '{pkgdatadir}' -along with other example files such as a ChangeLog and an install -script. You can copy the provided PKGBUILD.proto file to a new package build -directory and make customizations to suit your needs. +along with other example files such as an install script. You can copy the +provided PKGBUILD.proto file to a new package build directory and make +customizations to suit your needs. Options and Directives -- 2.17.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.0-19-g0d6e82d3
by Allan McRae 19 Jun '18

19 Jun '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 0d6e82d3748653a2b61ea34b940011ef97350768 (commit) via d750c854bcfa2461742a4d5dff7b4747db5c1f53 (commit) via 72263e22bdf2f33b2038f902612ac6a98954d254 (commit) via a92a36070ad520afe45cb6dacf1de2f0caac612d (commit) via 5cf6f614eb418a9e89c0cbfa5fbfac0d502ff668 (commit) via 793202344b47914d06a2c48bacbb6b232f7c5387 (commit) via e6dbe82c0c52011b4abb46283ba606eb75577ce7 (commit) via 05a3641c76ba1c07dbec6fa1d9e9d3fcf6dec20c (commit) via ab1e92860bdc5388621e8314b8e1652590fa2b05 (commit) via b37a6063d0d37eb16465693439e3dfb92409e44a (commit) via f78914cc6e3d431ec585c29e469a91121d90a5cf (commit) via de8c5e78bbaec3aea16523d1a7c5cc6801154c80 (commit) via 737596f038590878d9ac73e6e8de01ad22b2b340 (commit) via 870d4c8fdd5e53c24c2a13cf1010b2536460fd8f (commit) via c37a06fe1d1fbd2be73adc725323e8a4665eeb09 (commit) via 9eb3695a3ff850b9dff66d667a4b27be1a233f42 (commit) via 3a66b93be00b7a6b01a295bc203f91e663a133db (commit) via 930d50194754e9c75bc0d6d7ccc41ae8f4b4e5c4 (commit) via 716d776936a7c0559ef09a3b456fa52d2339a4aa (commit) from be4c491ceb34f04c3352ddd1d3c4672560e7ea8c (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 0d6e82d3748653a2b61ea34b940011ef97350768 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 14 22:25:25 2018 -0400 makepkg: don't print per-pkgname debug packages In commit 9a4d61622066d5d30c649f1c958b26526a4ceddf debug packages were merged into one exclusive pkgbase-debug, but the print_all_package_names function did not get updated to match this logic. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d750c854bcfa2461742a4d5dff7b4747db5c1f53 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 18 16:50:58 2018 +1000 Fix signing of debug packages Commit 9c8d7a80 broke the signing of debug packages by merging code up but not changing the test condition. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 72263e22bdf2f33b2038f902612ac6a98954d254 Author: Michael Straube <straubem(a)gmx.de> Date: Wed Jun 13 16:49:27 2018 +0200 libalpm/dload.c: fix filename in license header The filename in the license header did not match the actual filename as in the other files. Hopefully this is not too nit-picky. Signed-off-by: Michael Straube <straubem(a)gmx.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a92a36070ad520afe45cb6dacf1de2f0caac612d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jun 9 15:24:42 2018 -0400 makepkg: fix initialization when extracting arrays Assuming that everything is a string leads to code which is effectively: a= a+=('bar') This creates an array with 2 elements instead of one. Using proper array initialization fixes this. https://lists.archlinux.org/pipermail/pacman-dev/2018-June/022591.html Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5cf6f614eb418a9e89c0cbfa5fbfac0d502ff668 Author: morganamilo <morganamilo(a)gmail.com> Date: Fri Jun 8 01:40:01 2018 +0100 Add missing sha224 sums in man page and linting Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 793202344b47914d06a2c48bacbb6b232f7c5387 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Jun 4 09:31:19 2018 -0400 makepkg: fix erroneous $BUILDDIR when $startdir is not an absolute path When comparing the $BUILDDIR to the $startdir, we used string equality instead of testing whether they are the same location, and ended up appending $pkgbase even though there's no reason to use it here. In some cases, this could result in makepkg erroring when trying to create $srcdir/$pkgdir, if a file with the same name as the $pkgbase exists. This is expected behavior if a file "src" or "pkg" exists, but decidedly less so for $pkgbase. This could be fixed either by setting $startdir to an absolute path, or by ensuring the test checks this directly; I've chosen to do both, since the test should really be correctly checking the thing it actually cares about, but since we ensure absolute paths are used everywhere else, this might bite us elsewhere someday. It's also more consistent. Fixes FS#58865 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e6dbe82c0c52011b4abb46283ba606eb75577ce7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 22:44:01 2018 +1000 PKGBUILD.5: document restriction on pkgrel The format of pkgrel was much more retrictive than described in the man page. Update the documentation to reflect this. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05a3641c76ba1c07dbec6fa1d9e9d3fcf6dec20c Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Thu May 31 17:46:51 2018 +0200 makepkg: Don't use parameterless return It's especially dangerous in trap handlers since the return value of the function becomes the return value of the last command before the trap, not the last command in the current function. This applies to any function executed in a trap handler, nested functions included. In one case, install_packages failed (via return 14), which was inside a conditional that then ran exit 14, which triggered the EXIT handler, which called clean_up, which called remove_deps, which had !RMDEPS and thus returned. The return value of remove_deps became the return value of install_packages, triggering the ERR handler, which (due to another problem) was still the user function handler, which then printed a misleading error message and overrode the exit code with 4. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ab1e92860bdc5388621e8314b8e1652590fa2b05 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jun 3 01:31:17 2018 -0400 makepkg: fix the --nocolor option being broken when passed to pacman -U In commit 8ff03868a37b1f9c447784ae2fd639a49e426399 PACMAN_OPTS was turned into an array. Unfortunately, that array was generated by treating the "--color never" option as one string, instead of an array of two strings... Fixes FS#58820 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b37a6063d0d37eb16465693439e3dfb92409e44a Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Sun Jun 3 16:01:32 2018 -0400 pacman.conf: Fixup the XferCommand example for curl 1. Without `-L`, curl doesn't follow redirects. This is different than both the default behavior of pacman, and from the wget example. So add `-L`. 2. It uses `-C -` to supposedly allow resuming partial downloads; but that doesn't work if we use `> %o` to direct the output to the file. Instead, use `-o %o` so that `-C -` actually works. Signed-off-by: Luke Shumaker <lukeshu(a)parabola.nu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f78914cc6e3d431ec585c29e469a91121d90a5cf Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Thu May 31 18:24:54 2018 +0200 makepkg: Clear ERR trap before trying to restore it $restoretrap is empty if the trap was not set. This caused the trap handler to remain and override later exit codes. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de8c5e78bbaec3aea16523d1a7c5cc6801154c80 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu May 31 20:31:23 2018 -0400 libmakepkg/lint_pkgbuild: squelch syntax error when a pkgname is empty We fail with an error, but then we also fail with: ==> ERROR: depends is not allowed to be empty. /usr/share/makepkg/lint_pkgbuild/pkgname.sh: line 39: continue: only meaningful in a `for', `while', or `until' loop During the refactor to provide enhanced pkgname=pkgver linting, this was moved out of the ${pkgname[@]} loop to a distinct function, at which time it should have been modified to return rather than continue. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 737596f038590878d9ac73e6e8de01ad22b2b340 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 30 22:50:25 2018 -0400 makepkg: do not chmod $BUILDDIR itself after checking for its existence In commit d8717a6a9666ec80c8645d190d6f9c7ab73084ac the write permission checks were refactored. Initially we intended to drop this chmod in the process, but due to some confusion about whether it was needed, I ended up submitting patches both to preserve and to remove it... but it's not needed after all. We do it on the individual $srcdir/$pkgdir, later on. Then, we used the wrong version, which causes unnecessary restrictions. See FS#58790 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 870d4c8fdd5e53c24c2a13cf1010b2536460fd8f Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 30 22:50:24 2018 -0400 libmakepkg/lint_pkgbuild: permit versioned optdepends pacman accepts these, and there is no good reason to be more restrictive ourselves; we should follow the example of "depends" here. Update the documentation to actually state that this is supported. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c37a06fe1d1fbd2be73adc725323e8a4665eeb09 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 30 22:50:23 2018 -0400 libmakepkg: when checking for write permissions, handle pre-existing dirs Simplifies the function a bit, but mostly, mkdir -p will never fail if the directory exists, and therefore makepkg never checks to see if it is actually writable. On the other hand, it's unnecessary to check if the directory exists once we know mkdir -p succeeded... Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9eb3695a3ff850b9dff66d667a4b27be1a233f42 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 29 13:07:47 2018 -0400 makepkg: remove unused variable forgotten when moving to parseopts Reported-by: Rafael Ascensão <rafa.almas(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a66b93be00b7a6b01a295bc203f91e663a133db Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 29 13:05:18 2018 -0400 makepkg: update help text to describe --packagelist's new behavior In commit d8591dd3418d55c5736022ef003891fc03b953e0 when teaching --packagelist to print the full filepath for built arches only, I forgot to update the helptext at the same time as I updated the manpage. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 930d50194754e9c75bc0d6d7ccc41ae8f4b4e5c4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 30 08:45:12 2018 +1000 pacman-conf: fix detection of repo usage pacman-conf returned All for any repo Usage query because it was checking if any repo options were enabled rather than if all options were enabled. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 716d776936a7c0559ef09a3b456fa52d2339a4aa Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 28 13:47:36 2018 +1000 Apparently we live in the future! Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.asciidoc | 13 ++++++----- doc/index.asciidoc | 2 +- etc/pacman.conf.in | 2 +- lib/libalpm/dload.c | 2 +- .../libmakepkg/integrity/generate_signature.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 18 ++++++++++----- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 3 +-- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 3 ++- scripts/libmakepkg/util/pkgbuild.sh.in | 13 +++++++---- scripts/libmakepkg/util/util.sh.in | 10 ++++----- scripts/makepkg.sh.in | 26 +++++++++++----------- src/pacman/pacman-conf.c | 4 ++-- 12 files changed, 57 insertions(+), 41 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] makepkg: don't print per-pkgname debug packages
by Allan McRae 18 Jun '18

18 Jun '18

From: Eli Schwartz <eschwartz(a)archlinux.org> In commit 9a4d61622066d5d30c649f1c958b26526a4ceddf debug packages were merged into one exclusive pkgbase-debug, but the print_all_package_names function did not get updated to match this logic. --- This is a reduced patch of what was sent to the list earlier, now suitable for included in 5.1.1. scripts/libmakepkg/util/pkgbuild.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 10d154d1..4b4b38e0 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -184,10 +184,11 @@ print_all_package_names() { for pkg in ${pkgname[@]}; do architecture=$(get_pkg_arch $pkg) printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT" - if check_option "debug" "y" && check_option "strip" "y"; then - printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" - fi done + if check_option "debug" "y" && check_option "strip" "y"; then + architecture=$(get_pkg_arch) + printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkgbase" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" + fi } get_all_sources() {

1 0

[pacman-dev] [PATCH] Fix signing of debug packages
by Allan McRae 18 Jun '18

18 Jun '18

Commit 9c8d7a80 broke the signing of debug packages by merging code up but not changing the test condition. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Using this minimal fix for 5.1.1. Eli's patch refacotring this will be considered later. scripts/libmakepkg/integrity/generate_signature.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in index 442fe031..b53a90d0 100644 --- a/scripts/libmakepkg/integrity/generate_signature.sh.in +++ b/scripts/libmakepkg/integrity/generate_signature.sh.in @@ -63,7 +63,7 @@ create_package_signatures() { done # check if debug package needs a signature - if ! check_option "debug" "y" || ! check_option "strip" "y"; then + if check_option "debug" "y" && check_option "strip" "y"; then pkg=$pkgbase-@DEBUGSUFFIX@ pkgarch=$(get_pkg_arch) pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}" -- 2.17.1

2 1

[pacman-dev] [PATCH] libmakepkg/integrity: use more shared functions to generate signatures
by Eli Schwartz 18 Jun '18

18 Jun '18

The newly changed print_all_package_names function can iterate over the list of all package files that will be created; this avoids the need to independently recreate those filenames here. Additionally, since debug packages may not actually exist, check if the package file exists first. If the main package does not exist then makepkg will have aborted before now, so there is no need to special-case that here. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- .../integrity/generate_signature.sh.in | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in index 442fe031..3350ca50 100644 --- a/scripts/libmakepkg/integrity/generate_signature.sh.in +++ b/scripts/libmakepkg/integrity/generate_signature.sh.in @@ -50,25 +50,12 @@ create_package_signatures() { if [[ $SIGNPKG != 'y' ]]; then return 0 fi - local pkg pkgarch pkg_file - local fullver=$(get_full_version) msg "$(gettext "Signing package(s)...")" - for pkg in "${pkgname[@]}"; do - pkgarch=$(get_pkg_arch $pkg) - pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}" - - create_signature "$pkg_file" - done - - # check if debug package needs a signature - if ! check_option "debug" "y" || ! check_option "strip" "y"; then - pkg=$pkgbase-@DEBUGSUFFIX@ - pkgarch=$(get_pkg_arch) - pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}" + print_all_package_names | while read pkg_file; do if [[ -f $pkg_file ]]; then create_signature "$pkg_file" fi - fi + done } -- 2.17.1

2 3

[pacman-dev] [PATCH] makepkg: don't print per-pkgname debug packages
by Eli Schwartz 18 Jun '18

18 Jun '18

In commit 9a4d61622066d5d30c649f1c958b26526a4ceddf debug packages were merged into one exclusive pkgbase-debug, but the print_all_package_names function did not get updated to match this logic. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/pkgbuild.sh.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index c2e2c536..44ba040a 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -189,11 +189,18 @@ print_all_package_names() { fi for a in "${architecture[@]}"; do printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$a" "$PKGEXT" - if check_option "debug" "y" && check_option "strip" "y"; then - printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" "$PKGEXT" - fi done done + if check_option "debug" "y" && check_option "strip" "y"; then + if (( IGNOREARCH )); then + get_pkgbuild_attribute '' 'arch' 1 architecture + else + architecture=$(get_pkg_arch) + fi + for a in "${architecture[@]}"; do + printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkgbase" "@DEBUGSUFFIX@" "$version" "$a" "$PKGEXT" + done + fi } get_all_sources() { -- 2.17.1

1 0