- 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