- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Pass --stream to `hg clone` when creating the working copy
by Luke Shumaker 20 Sep '18

20 Sep '18

From: Luke Shumaker <lukeshu(a)parabola.nu> Without --stream, `hg clone` reencodes+recompresses the entire repository, to the storage settings of the host. But download_hg() already did that on the initial network clone, and it is 100% pointless duplicated work for the local clone. The work that this saves is CPU-bound (not disk-bound), and is restricted to a single core. The --stream flag has only existed since Mercurial 4.4 (2017-11-01). Prior to that, it was named --uncompressed. --uncompressed still exists as a compatibility alias for --stream, and marked deprecated, though there is currently no schedule for its removal. --- scripts/libmakepkg/source/hg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in index ae9aed3b..7346e1e3 100644 --- a/scripts/libmakepkg/source/hg.sh.in +++ b/scripts/libmakepkg/source/hg.sh.in @@ -94,7 +94,7 @@ extract_hg() { plain "$(gettext "Aborting...")" exit 1 fi - elif ! hg clone -u "$ref" "$dir" "${dir##*/}"; then + elif ! hg clone -u "$ref" --stream "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" plain "$(gettext "Aborting...")" exit 1 -- 2.18.0

2 2

[pacman-dev] [PATCH] makepkg: lint_pkgver: Run even if PKGVERFUNC
by Luke Shumaker 20 Sep '18

20 Sep '18

From: Luke Shumaker <lukeshu(a)parabola.nu> lint_pkgver returns 0 if PKGVERFUNC, since it's likely that update_pkgver() will change the value of pkgver anyway, and there's no point in linting the old value. update_pkgver() will call check_pkgver() itself to validate the new value. However, that "optimization" only holds if we're definitely going to call update_pkgver() later; and that's way more complicated than if (( PKGVERFUNC )); then it's more like: if (( !GENINTEG && !PACKAGELIST && !PRINTSRCINFO && !SOURCEONLY && !REPKG && PKGVERFUNC )); then Which is to say: If I have a PKGBUILD with pkgver(): * if I run `makepkg -g` I expect it to lint pkgver, but it won't * if I run `makepkg -R` I expect it to lint pkgver, but it won't * ... So let's fix that. Rather than try to keep a huge list of conditions in sync with the flow of makepkg.sh.in, let's just drop it. As far as I can tell, the only thing that skipping lint_pkgver() really enables is letting the PKGBUILD author write `pkgver=` in the initial version, and letting pkgver() fill it in. They can just start writing `pkgver=0` for that workflow. --- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 65216b64..e9b1566f 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -44,10 +44,5 @@ check_pkgver() { } lint_pkgver() { - if (( PKGVERFUNC )); then - # defer check to after getting version from pkgver function - return 0 - fi - check_pkgver "$pkgver" } -- 2.18.0

3 2

[pacman-dev] [PATCH 0/4][WIP] makepkg test suite
by Andrew Gregory 20 Sep '18

20 Sep '18

The long-awaited makepkg test suite is finally here, or at least the start of it. The tests can be run via `make check` or they can also be run directly. Included so far are a few tests for package generation and a single libmakepkg test for some of the util/pkgbuild functions. I made some small changes to the lib in order to make it easier to use and to allow stricter error checking in the test suite (set -u). Andrew Gregory (4): util/pkgbuild: guard against unset variable util/pkgbuild: manually set extglob util/pkgbuild: fix broken indentation add basic makepkg test Makefile.am | 6 +- configure.ac | 2 + scripts/libmakepkg/util/pkgbuild.sh.in | 23 +++--- test/makepkg/Makefile.am | 9 +++ test/makepkg/README | 15 ++++ test/makepkg/test_functions.sh | 143 +++++++++++++++++++++++++++++++++ test/makepkg/tests/Makefile.am | 7 ++ test/makepkg/tests/TESTS | 4 + test/makepkg/tests/dbfiles.sh | 35 ++++++++ test/makepkg/tests/dotfiles.sh | 33 ++++++++ test/makepkg/tests/pkgbuild.sh | 53 ++++++++++++ test/makepkg/tests/util-pkgbuild.sh | 35 ++++++++ 12 files changed, 355 insertions(+), 10 deletions(-) create mode 100644 test/makepkg/Makefile.am create mode 100644 test/makepkg/README create mode 100644 test/makepkg/test_functions.sh create mode 100644 test/makepkg/tests/Makefile.am create mode 100644 test/makepkg/tests/TESTS create mode 100755 test/makepkg/tests/dbfiles.sh create mode 100755 test/makepkg/tests/dotfiles.sh create mode 100755 test/makepkg/tests/pkgbuild.sh create mode 100755 test/makepkg/tests/util-pkgbuild.sh -- 2.11.1

5 13

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-35-g7afe5117
by Allan McRae 20 Sep '18

20 Sep '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 7afe51171fe063bf3031cc68fc8c7ac914a01de2 (commit) via bae74c8e9e69b4f4e1a235eef21b9b27fb14aff0 (commit) via cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563 (commit) via 192d6166e9cb2a8f26d7256690e0158bd5a5d226 (commit) via b54b33d816cdc3d1aab3b80f4eb94c5bad56c889 (commit) via 3d5a056452fe897e533edfac2ddbe2d1ca702a6e (commit) via 961ef1a4c8cfc0fa7b8da4e6cb77d8327934e32f (commit) via 2bec380e108536f5e5f728ef66223ed3fabf5ab1 (commit) via 3318039e3b1530396b0e3ced49ea6fe5b6ea00c5 (commit) via ba2984db3e83e0627c29897e28982e9f4cf24a5d (commit) via 58c76daf5e9116dd044f73958b67163549d0e795 (commit) via d03409ccde5a995f19e40a12d61b22be9d4c3af7 (commit) via 62eef5bbdb025d9557a1609760b42d7fbac16ad2 (commit) via 5b2ff51c399a906fd70df62ca179e2a696ea3860 (commit) via 16f6aae33087ec04c1dc90aa84f7d3dde4333046 (commit) via 48c8f9f2a24632dabe5b1c74a474e3940ddd8748 (commit) via 0696307a3b2e0cbde7d208eb78bbad6a9c8b336f (commit) via 3370c08a29a60e1cd1227d43652c22738c8e4f6e (commit) via 3e9a62e72139a71cb7c41a5e4bd896d22943cd7b (commit) via 9fde55c0c71f473d32fb638eb4f251041e3b3ffa (commit) via 8b2f3323b84a34d1d104136e455302dc32892b9a (commit) via 2d8d8af915d352b61178a981603360c27a3899f2 (commit) from 7d05ffceaf9161a6572505d25b5017e1eb33bf0e (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 7afe51171fe063bf3031cc68fc8c7ac914a01de2 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Oct 30 14:15:19 2017 -0400 repo-add: add support for the zst format Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bae74c8e9e69b4f4e1a235eef21b9b27fb14aff0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Oct 30 14:15:18 2017 -0400 makepkg: add support for the zst format Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563 Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Thu Aug 9 13:42:37 2018 -0400 makepkg: lint_pkgver: Run even if PKGVERFUNC lint_pkgver returns 0 if PKGVERFUNC, since it's likely that update_pkgver() will change the value of pkgver anyway, and there's no point in linting the old value. update_pkgver() will call check_pkgver() itself to validate the new value. However, that "optimization" only holds if we're definitely going to call update_pkgver() later; and that's way more complicated than if (( PKGVERFUNC )); then it's more like: if (( !GENINTEG && !PACKAGELIST && !PRINTSRCINFO && !SOURCEONLY && !REPKG && PKGVERFUNC )); then Which is to say: If I have a PKGBUILD with pkgver(): * if I run `makepkg -g` I expect it to lint pkgver, but it won't * if I run `makepkg -R` I expect it to lint pkgver, but it won't * ... So let's fix that. Rather than try to keep a huge list of conditions in sync with the flow of makepkg.sh.in, let's just drop it. As far as I can tell, the only thing that skipping lint_pkgver() really enables is letting the PKGBUILD author write `pkgver=` in the initial version, and letting pkgver() fill it in. They can just start writing `pkgver=0` for that workflow. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 192d6166e9cb2a8f26d7256690e0158bd5a5d226 Author: David Phillips <david(a)sighup.nz> Date: Wed Sep 19 14:30:37 2018 +1200 User-visible log when validity check fails due to access Currently, if checking the validity of packages fails due to an access error on one or more packages, the user must sift through debug output in order to find the culprit package(s). This patch adds a call to _alpm_log in such a case to make the culprits more easily visible. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b54b33d816cdc3d1aab3b80f4eb94c5bad56c889 Author: David Phillips <david(a)sighup.nz> Date: Wed Sep 19 14:28:35 2018 +1200 Change if-else chain to switch Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d5a056452fe897e533edfac2ddbe2d1ca702a6e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 21 12:39:21 2018 -0400 makepkg: reject PKGBUILDs with both split and non-split package functions We accept package_foo() in non-split packages, because it's easier to switch to/from a split package just by removing a pkgname element. But it makes no sense to have both in one PKGBUILD. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 961ef1a4c8cfc0fa7b8da4e6cb77d8327934e32f Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Sep 4 14:47:44 2018 +0100 Show group status during file search When doing "pacman -Fs", show the "(groupname)" message just like "pacman -Ss". And refactor group printing to its own function. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2bec380e108536f5e5f728ef66223ed3fabf5ab1 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 4 15:17:54 2018 -0400 libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3318039e3b1530396b0e3ced49ea6fe5b6ea00c5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 18 10:08:37 2018 -0400 pacman: check versioned optdepends in -Qi operation Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ba2984db3e83e0627c29897e28982e9f4cf24a5d Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Sun Jul 29 21:57:15 2018 +0200 doc: Remove double spaces Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 58c76daf5e9116dd044f73958b67163549d0e795 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 18 09:42:42 2018 -0400 scripts: deduplicate localized copyright messages We don't need to translate the "Copyright YEAR AUTHOR" part, no part of it should probably be translated and it definitely shouldn't turn every single license terms notice into a separate translation just because the author/year is different. Fixes FS#58452 Also consistently add a blank line after the copyright and before the license terms. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d03409ccde5a995f19e40a12d61b22be9d4c3af7 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Aug 29 02:49:29 2018 -0400 Revert "makepkg: add whirlpool to the list of hashing algorithms" This reverts commit 9cdfd18739cc4b0e2b2efeb9a92a3ea612c8505f. We've never documented whirlpoolsums support in the manpage and no one really seems to have realized we support it, let alone use it -- except for a few parabola packages, being the contributor's motivation for adding support. The problem is that for two years the code has been broken. In commit 577701250d645d1fc1a505cde34aedbeb3208ea5 we moved to coreutils to provide checksum commands, rather than openssl, but there is no whirlpoolsums binary. Properly fixing this would require re-adding a dependency on openssl, independent of the libalpm crypto backend -- which defeats the purpose of moving to coreutils in the general case. nettle-hash does not provide a whirlpool algorithm any more than it does base64 (the original reason for moving to coreutils). Therefore, we should just drop support for this again. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62eef5bbdb025d9557a1609760b42d7fbac16ad2 Author: morganamilo <morganamilo(a)gmail.com> Date: Mon Sep 10 22:41:07 2018 +0100 pacman-conf: add missing DisableDownloadTimeout Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b2ff51c399a906fd70df62ca179e2a696ea3860 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Aug 29 01:10:21 2018 -0400 makepkg: don't print status for run_function when in a subshell It's most likely a case where output is being captured, so we shouldn't be interleaving status messages with function output regardless. Setting the pkgver() status message (the one time we use it in a subshell) separately also makes it safe to change whether message.sh functions write to stdout or stderr. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 16f6aae33087ec04c1dc90aa84f7d3dde4333046 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 13 21:20:58 2018 -0400 makepkg: fix pkgver() function not aborting on errors `run_function_safe pkgver` is evaluated in a subshell and therefore does not abort when it should. Explicitly check the return outside of the subshell and abort if necessary. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48c8f9f2a24632dabe5b1c74a474e3940ddd8748 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 13 21:20:57 2018 -0400 makepkg: don't save the same shopts twice Both run_function and run_function_safe will save and restore `shopt -p` but the former is only called from the latter. It makes sense to save this as part of a "safe" runner, so let's just do it in one place, there where we save and restore everything else too. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0696307a3b2e0cbde7d208eb78bbad6a9c8b336f Author: morganamilo <morganamilo(a)gmail.com> Date: Fri Aug 17 05:41:00 2018 +0100 Show install status during file search When doing "pacman -Fs", show the "[installed: version]" message just like "pacman -Ss". Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3370c08a29a60e1cd1227d43652c22738c8e4f6e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 5 10:42:41 2018 -0400 pacman/conf: Remove unused include Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3e9a62e72139a71cb7c41a5e4bd896d22943cd7b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 17:43:02 2018 -0400 doc: use more implicit rules to build manpages Use implicit dependency rules to translate asciidoc inputs to HTML and manpage outputs. We should only have to declare explicit dependencies for odd cases, e.g. the PKGBUILD documentation has an additional include file and isn't a 1:1 conversion. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9fde55c0c71f473d32fb638eb4f251041e3b3ffa Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 17:43:01 2018 -0400 Remove unused checks for strcoll and mktime We don't use these. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8b2f3323b84a34d1d104136e455302dc32892b9a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 17:43:00 2018 -0400 common/ini: Depend on util-common, not util Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d8d8af915d352b61178a981603360c27a3899f2 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 07:28:51 2018 -0400 scripts: pass on options such as set -x to child processes When re-running makepkg for fakeroot, if `bash -x makepkg` was used this is lost. Fix by encoding the current set of options explicitly in the invocation, both for makepkg and for the wrapper used to test scripts inside the source tree. Also change to use ${BASH_SOURCE[0]} instead of $0 as the latter can be anything the parent process wants, while the former is explicitly set by bash itself to the filepath of the script. See http://mywiki.wooledge.org/BashFAQ/028 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 -- doc/Makefile.am | 34 +++++++------------- doc/makepkg.conf.5.asciidoc | 3 +- doc/pacman.conf.5.asciidoc | 2 +- doc/submitting-patches.asciidoc | 2 +- etc/makepkg.conf.in | 1 + lib/libalpm/sync.c | 33 ++++++++++++------- scripts/libmakepkg/lint_config/variable.sh.in | 4 +-- .../lint_pkgbuild/package_function.sh.in | 9 +++++- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 --- scripts/libmakepkg/util/compress.sh.in | 1 + scripts/makepkg.sh.in | 22 +++++++------ scripts/pacman-db-upgrade.sh.in | 3 +- scripts/pacman-key.sh.in | 3 +- scripts/pkgdelta.sh.in | 3 +- scripts/repo-add.sh.in | 4 ++- scripts/wrapper.sh.in | 2 +- src/common/ini.c | 2 +- src/pacman/conf.c | 1 - src/pacman/files.c | 7 +++- src/pacman/package.c | 37 ++++++++++++---------- src/pacman/package.h | 1 + src/pacman/pacman-conf.c | 3 ++ 23 files changed, 104 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] during -Qu add [ignored] for repos without Usage = Upgrade
by morganamilo 19 Sep '18

19 Sep '18

Fixes FS#59854 Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..faa06e60 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -325,10 +325,14 @@ static int display(alpm_pkg_t *pkg) colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { + int usage; alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + alpm_db_t *db = alpm_pkg_get_db(newpkg); + alpm_db_get_usage(db, &usage); + printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); - if(alpm_pkg_should_ignore(config->handle, pkg)) { + if(alpm_pkg_should_ignore(config->handle, pkg) || !(usage & ALPM_DB_USAGE_UPGRADE)) { printf(" %s", _("[ignored]")); } } -- 2.18.0

3 5

[pacman-dev] [PATCH 1/3] makepkg: refactor archive compression for reusability
by Eli Schwartz 19 Sep '18

19 Sep '18

This allows for more easily extending the list of allowed compression methods, as it has to be modified in only one place. Also allow the user to specify their own preferred command + options for source packages in addition to compiled packages. Currently, makepkg.conf(5) erroneously claims this is already possible. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I'm not 100% sure how to handle this, perhaps it should encompass bsdtar/$pkg_file as well? scripts/makepkg.sh.in | 57 ++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 20e9dd7e..a5c216dd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -698,6 +698,26 @@ list_package_files() { sed -e 's|^\./||' | tr '\n' '\0' } +# Wrapper around many stream compression formats, for use in the middle of a +# pipeline. A tar archive is passed on stdin and compressed to stdout. +compress_as() { + # $1: final archive filename extension for compression type detection + + local ext="$1" + + case "$ext" in + *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; + *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; + *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; + *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; + *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; + *tar) cat ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$ext"; cat ;; + esac +} + create_package() { (( NOARCHIVE )) && return @@ -748,21 +768,8 @@ create_package() { msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail - # bsdtar's gzip compression always saves the time stamp, making one - # archive created using the same command line distinct from another. - # Disable bsdtar compression and use gzip -n for now. list_package_files | LANG=C bsdtar -cnf - --null --files-from - | - case "$PKGEXT" in - *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; - *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; - *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; - *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; - *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; - *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; - *tar) cat ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$PKGEXT"; cat ;; - esac > "${pkg_file}" || ret=$? + compress_as "$PKGEXT" > "${pkg_file}" || ret=$? shopt -u -o pipefail @@ -843,26 +850,20 @@ create_srcpackage() { done done - local TAR_OPT - case "$SRCEXT" in - *tar.gz) TAR_OPT="-z" ;; - *tar.bz2) TAR_OPT="-j" ;; - *tar.xz) TAR_OPT="-J" ;; - *tar.lrz) TAR_OPT="--lrzip" ;; - *tar.lzo) TAR_OPT="--lzop" ;; - *tar.Z) TAR_OPT="-Z" ;; - *tar) TAR_OPT="" ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$SRCEXT" ;; - esac - local fullver=$(get_full_version) local pkg_file="$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" cd_safe "${srclinks}" - if ! LANG=C bsdtar -cL ${TAR_OPT} -f "$pkg_file" ${pkgbase}; then + + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + LANG=C bsdtar -cLf - ${pkgbase} | compress_as "$SRCEXT" > "${pkg_file}" || ret=$? + + shopt -u -o pipefail + + if (( ret )); then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 2.14.1

2 18

[pacman-dev] [PATCH 1/4] pacman/conf: Remove unused include
by Dave Reisner 19 Sep '18

19 Sep '18

--- src/pacman/conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 9a37dcea..29f69052 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -35,7 +35,6 @@ #include "conf.h" #include "ini.h" #include "util.h" -#include "pacman.h" #include "callback.h" /* global config variable */ -- 2.18.0

4 8

[pacman-dev] [PATCH 1/2] User-visible log when validity check fails due to access
by David Phillips 19 Sep '18

19 Sep '18

Currently, if checking the validity of packages fails due to an access error on one or more packages, the user must sift through debug output in order to find the culprit package(s). This patch adds a call to _alpm_log in such a case to make the culprits more easily visible. --- lib/libalpm/sync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 696a5131..85f70200 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1187,6 +1187,10 @@ static int check_validity(alpm_handle_t *handle, prompt_to_delete(handle, v->path, v->error); } else if(v->error == ALPM_ERR_PKG_INVALID_CHECKSUM) { prompt_to_delete(handle, v->path, v->error); + } else if(v->error == ALPM_ERR_PKG_NOT_FOUND || + v->error == ALPM_ERR_BADPERMS || + v->error == ALPM_ERR_PKG_OPEN) { + _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), v->path, alpm_strerror(v->error)); } alpm_siglist_cleanup(v->siglist); free(v->siglist); -- 2.18.0

2 5

[pacman-dev] [PATCH v3 0/2] Make -Fs behave like -Ss and output group-membership and installation-state
by morganamilo 19 Sep '18

19 Sep '18

I realized that in my previous patch[1] I totally forgot about groups. Reading through the bugtracker I also realized there's already a task open on it FS#47948. This patchset Includes the install status and the group status patches. PS. I'm not too sure on what to do when adding a patch to an existing one. Should I have resent the first? Should this be v3 or v1? If anyone can clear that up I'd appreciate it. [1] https://lists.archlinux.org/pipermail/pacman-dev/2018-August/022769.html morganamilo (2): Show install status during file search Show group status during file search src/pacman/files.c | 7 ++++++- src/pacman/package.c | 34 +++++++++++++++++++--------------- src/pacman/package.h | 1 + 3 files changed, 26 insertions(+), 16 deletions(-) -- 2.18.0

3 5

[pacman-dev] [PATCH] libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint
by Eli Schwartz 19 Sep '18

19 Sep '18

Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_config/variable.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 14bd0e05..55ed6d6d 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -25,10 +25,10 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" -lint_config_functions+=('lint_variable') +lint_config_functions+=('lint_config_variables') -lint_variable() { +lint_config_variables() { local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ COMPRESSLRZ COMPRESSLZO COMPRESSZ) -- 2.18.0

2 1

[pacman-dev] [PATCH] pacman: check versioned optdepends in -Qi operation
by Eli Schwartz 19 Sep '18

19 Sep '18

Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/pacman/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index e80c5953..ee43dca7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -170,7 +170,7 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) alpm_depend_t *optdep = i->data; char *depstring = alpm_dep_compute_string(optdep); if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) { - if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), depstring)) { const char *installed = _(" [installed]"); depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1); strcpy(depstring + strlen(depstring), installed); -- 2.19.0

2 1

[pacman-dev] [PATCH] scripts: deduplicate localized copyright messages
by Eli Schwartz 18 Sep '18

18 Sep '18

Fixes FS#58452 Also consistently add a blank line after the copyright and before the license terms. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Do the email address lines need to be translated? Anyway, currently updating the pacman copyright year dirties the translations. It could be interpolated but then the copyright year updating code needs to be as well. scripts/makepkg.sh.in | 5 +++-- scripts/pacman-db-upgrade.sh.in | 3 ++- scripts/pacman-key.sh.in | 3 ++- scripts/pkgdelta.sh.in | 3 ++- scripts/repo-add.sh.in | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 299f9f7f..b4d8fed4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1192,9 +1192,10 @@ usage() { version() { printf "makepkg (pacman) %s\n" "$makepkg_version" + printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf -- "$(gettext "Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ -Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 9f27a2a2..55a3e8f7 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -54,8 +54,9 @@ usage() { version() { printf "pacman-db-upgrade (pacman) %s\n" "$myver" + printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ff460363..dd837c3f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -92,8 +92,9 @@ usage() { version() { printf "pacman-key (pacman) %s\n" "${myver}" + printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 2dc12c28..72e063b0 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -70,8 +70,9 @@ This delta file can then be added to a database using repo-add.\n")" version() { printf "pkgdelta (pacman) %s\n" "$myver" + printf -- "$(gettext "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3f181404..86bf9a88 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -93,8 +93,9 @@ See %s(8) for more details and descriptions of the available options.\n")" $cmd version() { cmd=${0##*/} printf "%s (pacman) %s\n\n" "$cmd" "$myver" + printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } -- 2.17.0

2 5

[pacman-dev] [PATCH] pacman-conf: add missing DisableDownloadTimeout
by morganamilo 18 Sep '18

18 Sep '18

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/pacman-conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index baa72d97..56196f79 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -266,6 +266,7 @@ static void dump_config(void) show_bool("TotalDownload", config->totaldownload); show_bool("CheckSpace", config->checkspace); show_bool("VerbosePkgLists", config->verbosepkglists); + show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); show_float("UseDelta", config->deltaratio); @@ -376,6 +377,8 @@ static int list_directives(void) show_bool("CheckSpace", config->checkspace); } else if(strcasecmp(i->data, "VerbosePkgLists") == 0) { show_bool("VerbosePkgLists", config->verbosepkglists); + } else if(strcasecmp(i->data, "DisableDownloadTimeout") == 0) { + show_bool("DisableDownloadTimeout", config->disable_dl_timeout); } else if(strcasecmp(i->data, "UseDelta") == 0) { show_float("UseDelta", config->deltaratio); -- 2.18.0

2 1

[pacman-dev] [PATCH 2/2] Change if-else chain to switch
by David Phillips 10 Sep '18

10 Sep '18

--- lib/libalpm/sync.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 85f70200..faef7b56 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1176,21 +1176,28 @@ static int check_validity(alpm_handle_t *handle, if(errors) { for(i = errors; i; i = i->next) { struct validity *v = i->data; - if(v->error == ALPM_ERR_PKG_MISSING_SIG) { + switch(v->error) { + case ALPM_ERR_PKG_MISSING_SIG: _alpm_log(handle, ALPM_LOG_ERROR, _("%s: missing required signature\n"), v->pkg->name); - } else if(v->error == ALPM_ERR_PKG_INVALID_SIG) { + break; + case ALPM_ERR_PKG_INVALID_SIG: _alpm_process_siglist(handle, v->pkg->name, v->siglist, v->siglevel & ALPM_SIG_PACKAGE_OPTIONAL, v->siglevel & ALPM_SIG_PACKAGE_MARGINAL_OK, v->siglevel & ALPM_SIG_PACKAGE_UNKNOWN_OK); + /* fallthrough */ + case ALPM_ERR_PKG_INVALID_CHECKSUM: prompt_to_delete(handle, v->path, v->error); - } else if(v->error == ALPM_ERR_PKG_INVALID_CHECKSUM) { - prompt_to_delete(handle, v->path, v->error); - } else if(v->error == ALPM_ERR_PKG_NOT_FOUND || - v->error == ALPM_ERR_BADPERMS || - v->error == ALPM_ERR_PKG_OPEN) { + break; + case ALPM_ERR_PKG_NOT_FOUND: + case ALPM_ERR_BADPERMS: + case ALPM_ERR_PKG_OPEN: _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), v->path, alpm_strerror(v->error)); + break; + default: + /* ignore */ + break; } alpm_siglist_cleanup(v->siglist); free(v->siglist); -- 2.18.0

1 0

[pacman-dev] [PATCH] libalpm/sync.c: restrict alpm_sync_newversion by USAGE_UPGRADE
by morganamilo 31 Aug '18

31 Aug '18

Commit 106d0fc54 Added the usage option for databases and alpm_sync_newversion was restricted by USAGE_SEARCH instead of USAGE_UPGRADE. USAGE_UPGRADE should be used instead. This means packages only show up in commands such as `pacman -Qu` if the database Has the Upgrade option. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 696a5131..23b0ccfa 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -61,7 +61,7 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn for(i = dbs_sync; !spkg && i; i = i->next) { alpm_db_t *db = i->data; - if(!(db->usage & ALPM_DB_USAGE_SEARCH)) { + if(!(db->usage & ALPM_DB_USAGE_UPGRADE)) { continue; } -- 2.18.0

7 13

[pacman-dev] [PATCH] makepkg: Fix whirlpoolsums support
by Luke Shumaker 29 Aug '18

29 Aug '18

From: Luke Shumaker <lukeshu(a)parabola.nu> Commit 9cdfd187 introduced support for whirlpool checksums in v5.0.0. However, it was sloppy and missed several places where the list of checksums is used. So fix that. In several places, we can take advantage of the 'known_hash_algos' variable to simplify things a bit. Commit 57770125 switched from using OpenSSL to GNU coreutils for doing the checksums in v5.1.0. This broke the whirlpool support, as coreutils does not implement a 'whirlpoolsum' program. So go back to using openssl for whirlpool sums only. --- I'm not particularly attached to whirlpool support, and if your reaction is "let's formally drop whirlpool", I wouldn't be upset by that. A handful (15) of Parabola's PKGBUILDs use whirlpoolsums, which makes sense, because the author if the original whirlpoolsums commit is a Parabola contributor. But, if you want to drop whirlpool, I have no problem saying that those packages need to migrate to a different checksum algorithm at their next update. doc/PKGBUILD.5.asciidoc | 2 +- etc/makepkg.conf.in | 2 +- .../integrity/generate_checksum.sh.in | 12 +++++++++-- .../integrity/verify_checksum.sh.in | 13 ++++++++++-- .../libmakepkg/lint_pkgbuild/variable.sh.in | 4 ++-- scripts/libmakepkg/srcinfo.sh.in | 4 ++-- scripts/makepkg.sh.in | 20 +++++++++++++------ 7 files changed, 41 insertions(+), 16 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index f12effde..5715c7aa 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -154,7 +154,7 @@ contain whitespace characters. be skipped. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''. If desired, move the md5sums line to an appropriate location. -*sha1sums, sha224sums, sha256sums, sha384sums, sha512sums (arrays)*:: +*sha1sums, sha224sums, sha256sums, sha384sums, sha512sums, whirlpoolsums (arrays)*:: Alternative integrity checks that makepkg supports; these all behave similar to the md5sums option described above. To enable use and generation of these checksums, be sure to set up the `INTEGRITY_CHECK` option in diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index b0fdea9e..22d298f7 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -87,7 +87,7 @@ BUILDENV=(!distcc color !ccache check !sign) # OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) -#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512 +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, whirlpool INTEGRITY_CHECK=(md5) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="@STRIP_BINARIES@" diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index eb9b74fc..7480c0ee 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -59,8 +59,16 @@ generate_one_checksum() { if [[ ${netfile%%::*} != *.@(sig?(n)|asc) ]]; then local file file="$(get_filepath "$netfile")" || missing_source_file "$netfile" - sum="$("${integ}sum" "$file")" - sum=${sum%% *} + case "$integ" in + md5|sha1|sha224|sha256|sha384|sha512) + sum="$("${integ}sum" "$file")" + sum=${sum%% *} + ;; + whirlpool) + sum="$(openssl dgst -${integ} "$file")" + sum=${sum##* } + ;; + esac else sum="SKIP" fi diff --git a/scripts/libmakepkg/integrity/verify_checksum.sh.in b/scripts/libmakepkg/integrity/verify_checksum.sh.in index 532e0693..6cd30ab4 100644 --- a/scripts/libmakepkg/integrity/verify_checksum.sh.in +++ b/scripts/libmakepkg/integrity/verify_checksum.sh.in @@ -82,8 +82,17 @@ verify_integrity_one() { return 1 fi - local realsum="$("${integ}sum" "$file")" - realsum="${realsum%% *}" + local realsum + case "$integ" in + md5|sha1|sha224|sha256|sha384|sha512) + realsum="$("${integ}sum" "$file")" + realsum="${realsum%% *}" + ;; + whirlpool) + realsum="$(openssl dgst -${integ} "$file")" + realsum=${realsum##* } + ;; + esac if [[ ${expectedsum,,} = "$realsum" ]]; then printf '%s\n' "$(gettext "Passed")" >&2 else diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 5f783e83..63c4955b 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -33,8 +33,8 @@ lint_variable() { # TODO: refactor - similar arrays are used elsewhere local array=(arch backup checkdepends groups license noextract options validpgpkeys) - local arch_array=(conflicts depends makedepends md5sums optdepends provides - replaces sha1sums sha224sums sha256sums sha384sums sha512sums + local arch_array=(conflicts depends makedepends optdepends provides + replaces "${known_hash_algos[@]/%/sums}" source) local string=(changelog epoch install pkgbase pkgdesc pkgrel pkgver url) diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in index 509c4860..a97cdde5 100644 --- a/scripts/libmakepkg/srcinfo.sh.in +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -63,7 +63,7 @@ srcinfo_write_section_details() { local attr package_arch a local multivalued_arch_attrs=(source provides conflicts depends replaces optdepends makedepends checkdepends - {md5,sha{1,224,256,384,512}}sums) + "${known_hash_algos[@]/%/sums}") for attr in "${singlevalued[@]}"; do pkgbuild_extract_to_srcinfo "$1" "$attr" 0 @@ -89,7 +89,7 @@ srcinfo_write_global() { local multivalued=(arch groups license checkdepends makedepends depends optdepends provides conflicts replaces noextract options backup - source validpgpkeys {md5,sha{1,224,256,384,512}}sums) + source validpgpkeys "${known_hash_algos[@]/%/sums}") srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" srcinfo_write_section_details '' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2ac1bbca..92a0b692 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1017,10 +1017,18 @@ check_software() { local integlist IFS=$'\n' read -rd '' -a integlist < <(get_integlist) - local integ + local integ binary for integ in "${integlist[@]}"; do - if ! type -p "${integ}sum" >/dev/null; then - error "$(gettext "Cannot find the %s binary required for source file checksums operations.")" "${integ}sum" + case "$integ" in + md5|sha1|sha224|sha256|sha384|sha512) + binary="${integ}sum" + ;; + whirlpool) + binary=openssl + ;; + esac + if ! type -p "$binary" >/dev/null; then + error "$(gettext "Cannot find the %s binary required for source file checksums operations.")" "$binary" ret=1 fi done @@ -1416,12 +1424,12 @@ else fi unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides -unset md5sums replaces depends conflicts backup source install changelog build -unset sha{1,224,256,384,512}sums makedepends optdepends options noextract validpgpkeys +unset replaces depends conflicts backup source install changelog build +unset "${known_hash_algos[@]/%/sums}" makedepends optdepends options noextract validpgpkeys unset "${!makedepends_@}" "${!depends_@}" "${!source_@}" "${!checkdepends_@}" unset "${!optdepends_@}" "${!conflicts_@}" "${!provides_@}" "${!replaces_@}" unset "${!md5sums_@}" "${!sha1sums_@}" "${!sha224sums_@}" "${!sha256sums_@}" -unset "${!sha384sums_@}" "${!sha512sums_@}" +unset "${!sha384sums_@}" "${!sha512sums_@}" "${!whirlpoolsums_@}" BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} if [[ ! -f $BUILDFILE ]]; then -- 2.18.0

3 4

[pacman-dev] [PATCH 1/3] makepkg: use bash 4.4 to localize `set` without explicitly saving/restoring
by Eli Schwartz 29 Aug '18

29 Aug '18

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4024f477..bb8332c6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -418,13 +418,14 @@ prepare_buildenv() { } run_function_safe() { - local restoretrap restoreset restoreshopt + local restoretrap restoreshopt # we don't set any special shopts of our own, but we don't want the user to # muck with our environment. restoreshopt=$(shopt -p) - restoreset=$(shopt -o -p) + # localize sets, sadly this does not work for shopt + local - shopt -o -s errexit errtrace restoretrap=$(trap -p ERR) @@ -434,7 +435,6 @@ run_function_safe() { trap - ERR eval "$restoretrap" - eval "$restoreset" eval "$restoreshopt" } -- 2.18.0

3 10

[pacman-dev] [PATCH 1/3] makepkg: send messages to stdout rather than stderr
by Eli Schwartz 29 Aug '18

29 Aug '18

This behavior is confusing, since it means absolutely everything goes to stderr and makepkg itself is a quiet program that produces no expected output??? The only situation where messages should go to stderr rather than stdout, is with --geninteg which is meant to return the checksums on stdout (but we don't want to totally get rid of status messages when redirecting the results elsewhere, or, worse, redirect status messages to a PKGBUILD). For this specific case, redirect message output to stderr in the --geninteg callers directly. Implements FS#17173 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- It took us 9 years, but we got there... scripts/libmakepkg/integrity/generate_checksum.sh.in | 2 +- scripts/libmakepkg/util/message.sh.in | 6 +++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index eb9b74fc..8edc48d3 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -78,7 +78,7 @@ generate_one_checksum() { } generate_checksums() { - msg "$(gettext "Generating checksums for source files...")" + msg "$(gettext "Generating checksums for source files...")" >&2 local integlist if (( $# == 0 )); then diff --git a/scripts/libmakepkg/util/message.sh.in b/scripts/libmakepkg/util/message.sh.in index 0746b677..36790c26 100644 --- a/scripts/libmakepkg/util/message.sh.in +++ b/scripts/libmakepkg/util/message.sh.in @@ -45,17 +45,17 @@ colorize() { plain() { local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" } msg() { local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" } msg2() { local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" } warning() { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 32423262..650b8494 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1469,7 +1469,7 @@ if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" - download_sources novcs allarch + download_sources novcs allarch >&2 generate_checksums exit $E_OK fi -- 2.18.0

2 6

[pacman-dev] [PATCH] makepkg: don't print status for run_function when in a subshell
by Eli Schwartz 29 Aug '18

29 Aug '18

It's most likely a case where output is being captured, so we shouldn't be interleaving status messages with function output regardless. Setting the pkgver() status message (the one time we use it in a subshell) separately also makes it safe to change whether message.sh functions write to stdout or stderr. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2545487a..da68d2a7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -187,6 +187,7 @@ enter_fakeroot() { # Automatically update pkgver variable if a pkgver() function is provided # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver update_pkgver() { + msg "$(gettext "Starting %s()...")" "pkgver" newpkgver=$(run_function_safe pkgver) if (( $? )); then error_function pkgver @@ -447,7 +448,9 @@ run_function() { fi local pkgfunc="$1" - msg "$(gettext "Starting %s()...")" "$pkgfunc" + if (( ! BASH_SUBSHELL )); then + msg "$(gettext "Starting %s()...")" "$pkgfunc" + fi cd_safe "$srcdir" if (( LOGGING )); then -- 2.18.0

1 0

[pacman-dev] [PATCH] Show install status during file search
by morganamilo 29 Aug '18

29 Aug '18

When doing "pacman -Fs", show the "[installed: version]" message just like "pacman -Ss". Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/files.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index d7fc5446..65e6ad26 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -101,6 +101,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; + alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *t; const colstr_t *colstr = &config->colstr; @@ -157,13 +158,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); } else { alpm_list_t *ml; - printf("%s%s/%s%s %s%s%s\n", colstr->repo, alpm_db_get_name(repo), + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo), colstr->title, alpm_pkg_get_name(pkg), colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + print_installed(db_local, pkg); + for(ml = match; ml; ml = alpm_list_next(ml)) { c = ml->data; - printf(" %s\n", c); + printf("\n %s\n", c); } } alpm_list_free(match); -- 2.17.1

2 3

[pacman-dev] [PATCH 1/3] common/ini: Depend on util-common, not util
by Dave Reisner 29 Aug '18

29 Aug '18

--- src/common/ini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/ini.c b/src/common/ini.c index 9d656781..8e646528 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -24,7 +24,7 @@ #include <alpm.h> #include "ini.h" -#include "util.h" +#include "util-common.h" /** * @brief Parse a pacman-style INI config file. -- 2.18.0

2 4

[pacman-dev] [PATCH] makepkg: use builtin globbing to print files in package
by Eli Schwartz 21 Aug '18

21 Aug '18

- it comes with free collation when moving the LC_ALL declaration up a bit; this fixes a bug where the .FILES were not being properly sorted and their order depended on directory creation order, which broke reproducible builds in the wild. - it handles sorting null-delimited output everywhere, without sort -z; this lets us get rid of sed hacks - it is faster than invoking multiple find subprocesses - dotfiles can be automatically printed *and the C locale sorts them first* with a single ** glob Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ae1ef01b..1325b019 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -711,10 +711,14 @@ write_buildinfo() { # database files are placed at the beginning of the package regardless of # sorting list_package_files() { - (find . -path './.*' \! -name '.'; find . \! -path './.*' \! -name '.' | LC_ALL=C sort) | - sed -e 's|^\./||' | tr '\n' '\0' + ( + export LC_COLLATE=C + shopt -s dotglob globstar + printf '%s\0' ** + ) } + create_package() { (( NOARCHIVE )) && return 0 -- 2.18.0

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-13-g7d05ffce
by Allan McRae 10 Aug '18

10 Aug '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 7d05ffceaf9161a6572505d25b5017e1eb33bf0e (commit) via e4be26b7327d8378735205ebedfc9718fb6fbba1 (commit) via 4e83abaae51c82ce6571450fb3ed9e2e71175b68 (commit) via 92bc0a474081c56d71605787d57ea2f6715a639c (commit) via b0a8f44f105e0ac0f18279e3c25d570090ac9e70 (commit) via 885bbb504afbf014194c8c20a51fc862980da45b (commit) via 9e960d9d5a735bbc7d418f2ad81d3f3e92d99968 (commit) via 7f1f1355bbb3941a30798a295721e7f35077e116 (commit) via 0937d322ba67400cb2c5fd1a548ef6e843801ec6 (commit) via 7edbbd9a638ec864b42f14cb2dea631c383aebbb (commit) via f2788244d322ca5ac45482d25747fe56176b72af (commit) via 0cbb128818726e4d41964ea8df8c42ee37697ef7 (commit) via fd16da2ed68aa7f89ad37701bcf7674b7bb14b2d (commit) from 7e081d2adf8321f25165255fd21fab61d4055a53 (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 7d05ffceaf9161a6572505d25b5017e1eb33bf0e Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 29 13:57:13 2018 +1000 Remove the last traces of the pacman --force option Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e4be26b7327d8378735205ebedfc9718fb6fbba1 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Jun 19 22:33:57 2018 +0200 scripts: Remove trailing semicolons Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4e83abaae51c82ce6571450fb3ed9e2e71175b68 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Jun 19 22:33:56 2018 +0200 libmakepkg/util/option: Refactor checking to reduce code duplication Pull out the expected=y/n check into a separate function and make use of the fact we can just prepend the fallback arrays to get the same result. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 92bc0a474081c56d71605787d57ea2f6715a639c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 19 16:26:35 2018 -0400 libmakepkg/util: use parameter transformation when checking variable type Now that we require bash 4.4 this is "more correct" than analyzing the output of declare -p to see if it compares favorably with -a. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b0a8f44f105e0ac0f18279e3c25d570090ac9e70 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 19 16:26:33 2018 -0400 configure: bump the minimum version of bash to 4.4 This is required in order to use declare -g and ${var@a} Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 885bbb504afbf014194c8c20a51fc862980da45b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 10:00:29 2018 -0400 makepkg: when signing packages, report package filename on failure In commit c6b04c04653ba9933fe978829148312e412a9ea7 the signing function was moved out of fakeroot, and thus out of the create_package loop. This meant that if package signing failed, it was no longer possible to tell which package it failed on by checking which package creation is currently running. Successful signing attempts do not have this problem as we already printed the name of the signature file. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9e960d9d5a735bbc7d418f2ad81d3f3e92d99968 Author: Michael Straube <straubem(a)gmx.de> Date: Sun Jun 10 18:58:34 2018 +0200 libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7f1f1355bbb3941a30798a295721e7f35077e116 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jun 9 19:45:59 2018 +0200 libalpm: ignore .hook suffix when sorting hooks It is desirable to have 'a-post.hook' ordered after 'a.hook'. For this, it is needed to ignore the suffix when sorting. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0937d322ba67400cb2c5fd1a548ef6e843801ec6 Author: morganamilo <morganamilo(a)gmail.com> Date: Fri Jun 8 19:18:58 2018 +0100 libmakepkg: add pkgbase to linted variables Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7edbbd9a638ec864b42f14cb2dea631c383aebbb Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue May 8 15:31:58 2018 +0200 makepkg: Simplify run_package Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f2788244d322ca5ac45482d25747fe56176b72af Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Thu May 31 18:24:47 2018 +0200 makepkg: Simplify SPLITPKG check This causes package_$pkgname() to be preferred over package() in the non-split case, but the behavior if both functions exist was undocumented anyway. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0cbb128818726e4d41964ea8df8c42ee37697ef7 Author: Alex Butler <alexheretic(a)gmail.com> Date: Thu May 31 14:31:18 2018 +0100 Add lz4 compression support to makepkg Adds opt-in lz4 compression of *pkg.tar files with makepkg. This is nice to have as an option for very fast compression and is already installed with libarchive. Signed-off-by: Alex Butler<alexheretic(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fd16da2ed68aa7f89ad37701bcf7674b7bb14b2d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 29 00:08:38 2018 -0400 scripts/completion: derive the bash completion directory from pkg-config Default to the standard completionsdir, which is lazy-loaded, rather than hardcoding the compatdir which is not. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 ++- doc/makepkg.conf.5.asciidoc | 3 +- etc/makepkg.conf.in | 1 + lib/libalpm/alpm.h | 3 +- lib/libalpm/conflict.c | 3 +- lib/libalpm/dload.c | 7 ++ lib/libalpm/hook.c | 16 +++-- lib/libalpm/hook.h | 2 + scripts/Makefile.am | 11 +++- scripts/completion/bash_completion.in | 2 +- scripts/completion/zsh_completion.in | 8 +-- .../libmakepkg/integrity/generate_signature.sh.in | 2 +- .../libmakepkg/integrity/verify_signature.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- scripts/libmakepkg/util/compress.sh.in | 1 + scripts/libmakepkg/util/option.sh.in | 77 +++++++--------------- scripts/libmakepkg/util/util.sh.in | 4 +- scripts/makepkg.sh.in | 27 +++----- scripts/pacman-key.sh.in | 6 +- scripts/repo-add.sh.in | 2 +- src/pacman/pacman.c | 5 -- src/pacman/sync.c | 3 - test/pacman/tests/TESTS | 5 -- test/pacman/tests/upgrade012.py | 14 ---- test/pacman/tests/upgrade014.py | 23 ------- test/pacman/tests/upgrade015.py | 14 ---- test/pacman/tests/upgrade016.py | 15 ----- test/pacman/tests/upgrade046.py | 31 --------- 28 files changed, 88 insertions(+), 210 deletions(-) delete mode 100644 test/pacman/tests/upgrade012.py delete mode 100644 test/pacman/tests/upgrade014.py delete mode 100644 test/pacman/tests/upgrade015.py delete mode 100644 test/pacman/tests/upgrade016.py delete mode 100644 test/pacman/tests/upgrade046.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: Handle errors when canonicalizing paths
by Luke Shumaker 09 Aug '18

09 Aug '18

From: Luke Shumaker <lukeshu(a)parabola.nu> If you don't have adequate permission to `cd` to one of the DEST directories, it's clear that that something's not doing error handling right: $ install -d -m0000 srcdest $ SRCDEST=$PWD/srcdest makepkg /usr/share/makepkg/util/util.sh: line 75: cd: /.../srcdest: Permission denied ==> ERROR: Failed to change to directory /.../srcdest Aborting... ==> ERROR: Failed to create the directory $SRCDEST (). Aborting... The first error comes from cd_safe() inside of canonicalize_path(). Because that bit runs in a subshell, it doesn't actually abort right there. Then, makepkg.sh doesn't check for failures from canonicalize_path. So then the variable gets set to an empty string (which makes the next error message from ensure_writable_dir() look funny), and keeps going. As an additional "fun" quirk, canonicalize_path doesn't canonicalize it if ensure_writable_dir has any work to do. That's probably not intended, but I'm not sure it is wrong either (see below). 1. Combine canonicalize_path() and ensure_writable_dir() in to canonicalize_and_ensure_writable_dir(). Both are only ever called on exactly the same variables (except that ensure_writable_dir() might skip PKGDEST, SRCPKGDEST, or LOGDEST; depending on the flags). 2. Use plain `cd` and check the status ourselves, rather than `cd_safe`. We can come up with a better (context-aware) error message than `cd_safe`, and we avoid duplicating the "Aborting..." message. This has a few consequences: a. We no longer canonicalize dirpaths that we don't ensure are writable. That's probably safe. This means that makepkg might now error in fewer cases; for example: $ install -d -m0000 pkgdest $ PKGDEST=$PWD/pkgdest makepkg -g There's no reason for it to care that it can't `cd` to PKGDEST; it won't be using it. b. We now canonicalize paths that we create that didn't exist before. That said, I'm not sure why we ever need to canonicalize the paths; I'm not sure why c0f58ea was necessary even after 960c2cd was already applied. --- scripts/libmakepkg/util/util.sh.in | 31 +++++++++++------------------- scripts/makepkg.sh.in | 14 +++++++------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index e1ca5cb7..1dfe6da9 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -49,20 +49,6 @@ is_array() { return $ret } -# Canonicalize a directory path if it exists -canonicalize_path() { - local path="$1"; - - if [[ -d $path ]]; then - ( - cd_safe "$path" - pwd -P - ) - else - printf "%s\n" "$path" - fi -} - dir_is_empty() { ( shopt -s dotglob nullglob @@ -79,10 +65,10 @@ cd_safe() { fi } -# Try to create directory if one does not yet exist. Fails if the directory -# exists but has no write permissions, or if there is an existing file with -# the same name. -ensure_writable_dir() { +# Try to create directory if one does not yet exist, and prints the +# canonical path to the directory. Fails if the directory exists but has no +# write permissions, or if there is an existing file with the same name. +canonicalize_and_ensure_writable_dir() { local dirtype="$1" dirpath="$2" if ! mkdir -p "$dirpath" 2>/dev/null; then @@ -92,6 +78,11 @@ ensure_writable_dir() { error "$(gettext "You do not have write permission for the directory \$%s (%s).")" "$dirtype" "$dirpath" return 1 fi - - return 0 + ( + if ! cd "$dirpath"; then + error "$(gettext "Could not canonicalize the directory \$%s (%s).")" "$dirtype" "$dirpath" + return 1 + fi + pwd -P + ) } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8ee0f5c5..62c2db80 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1353,9 +1353,9 @@ if (( ${#extra_environment[*]} )); then export "${extra_environment[@]}" fi -# canonicalize paths and provide defaults if anything is still undefined +# provide defaults if anything is still undefined for var in PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR; do - printf -v "$var" "$(canonicalize_path "${!var:-$startdir}")" + printf -v "$var" "${!var:-$startdir}" done unset var PACKAGER=${PACKAGER:-"Unknown Packager"} @@ -1378,23 +1378,23 @@ lint_config || exit $E_CONFIG_ERROR # check that all settings directories are user-writable -if ! ensure_writable_dir "BUILDDIR" "$BUILDDIR"; then +if ! BUILDDIR=$(canonicalize_and_ensure_writable_dir "BUILDDIR" "$BUILDDIR"); then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi -if (( ! (NOBUILD || GENINTEG) )) && ! ensure_writable_dir "PKGDEST" "$PKGDEST"; then +if (( ! (NOBUILD || GENINTEG) )) && ! PKGDEST=$(canonicalize_and_ensure_writable_dir "PKGDEST" "$PKGDEST"); then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi -if ! ensure_writable_dir "SRCDEST" "$SRCDEST" ; then +if ! SRCDEST=$(canonicalize_and_ensure_writable_dir "SRCDEST" "$SRCDEST"); then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi if (( SOURCEONLY )); then - if ! ensure_writable_dir "SRCPKGDEST" "$SRCPKGDEST"; then + if ! SRCPKGDEST=$(canonicalize_and_ensure_writable_dir "SRCPKGDEST" "$SRCPKGDEST"); then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi @@ -1404,7 +1404,7 @@ if (( SOURCEONLY )); then IGNOREARCH=1 fi -if (( LOGGING )) && ! ensure_writable_dir "LOGDEST" "$LOGDEST"; then +if (( LOGGING )) && ! LOGDEST=$(canonicalize_and_ensure_writable_dir "LOGDEST" "$LOGDEST"); then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi -- 2.18.0

1 0

[pacman-dev] [PATCH 0/3] makepkg: Improve lint_pkgbuild error messages for epoch/ver/rel
by Luke Shumaker 08 Aug '18

08 Aug '18

From: Luke Shumaker <lukeshu(a)parabola.nu> The error messages that makepkg prints when encountering a bad epoch/pkgver/pkgrel are often somewhat misleading. These patchset tries to improve that. The behavior is intended to be unchanged, other than what the messages say. Luke Shumaker (3): makepkg: Better error messages for versions in (check,make,opt)depends/provides/conflicts makepkg: check_pkgrel: Don't say "decimal" in the error message makepkg: check_pkgver: Report what the bad pkgver is scripts/Makefile.am | 1 + .../lint_pkgbuild/checkdepends.sh.in | 10 ++-- .../lint_pkgbuild/conflicts.sh.in | 10 ++-- .../lint_pkgbuild/depends.sh.in | 14 ++--- .../lint_pkgbuild/epoch.sh.in | 10 +++- .../lint_pkgbuild/fullpkgver.sh.in | 54 +++++++++++++++++++ .../lint_pkgbuild/makedepends.sh.in | 10 ++-- .../lint_pkgbuild/optdepends.sh.in | 10 ++-- .../lint_pkgbuild/pkgrel.sh.in | 20 +++++-- .../lint_pkgbuild/pkgver.sh.in | 2 +- .../lint_pkgbuild/provides.sh.in | 10 ++-- 11 files changed, 107 insertions(+), 44 deletions(-) create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in -- Happy hacking, ~ Luke Shumaker 2.18.0

2 7