- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] libalpm: ignore .hook suffix when sorting hooks
by Jouke Witteveen 04 Aug '18

04 Aug '18

It is desirable to have 'a-post.hook' ordered after 'a.hook'. For this, it is needed to ignore the suffix when sorting. --- Two years ago, I suggested this patch in https://bugs.archlinux.org/task/49653. Today, I do so again :-). Thanks to Jelle van der Waa for pointing me to the correct list. Regards, - Jouke lib/libalpm/hook.c | 16 ++++++++++++---- lib/libalpm/hook.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 0805e661..d90ed2da 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -551,7 +551,16 @@ static int _alpm_hook_triggered(alpm_handle_t *handle, struct _alpm_hook_t *hook static int _alpm_hook_cmp(struct _alpm_hook_t *h1, struct _alpm_hook_t *h2) { - return strcmp(h1->name, h2->name); + size_t suflen = strlen(ALPM_HOOK_SUFFIX), l1, l2; + int ret; + l1 = strlen(h1->name) - suflen; + l2 = strlen(h2->name) - suflen; + /* exclude the suffixes from comparison */ + ret = strncmp(h1->name, h2->name, l1 <= l2 ? l1 : l2); + if(ret == 0 && l1 != l2) { + return l1 < l2 ? -1 : 1; + } + return ret; } static alpm_list_t *find_hook(alpm_list_t *haystack, const void *needle) @@ -634,8 +643,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) alpm_event_hook_t event = { .when = when }; alpm_event_hook_run_t hook_event; alpm_list_t *i, *hooks = NULL, *hooks_triggered = NULL; - const char *suffix = ".hook"; - size_t suflen = strlen(suffix), triggered = 0; + size_t suflen = strlen(ALPM_HOOK_SUFFIX), triggered = 0; int ret = 0; for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { @@ -681,7 +689,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) memcpy(path + dirlen, entry->d_name, name_len + 1); if(name_len < suflen - || strcmp(entry->d_name + name_len - suflen, suffix) != 0) { + || strcmp(entry->d_name + name_len - suflen, ALPM_HOOK_SUFFIX) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); continue; } diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h index 364d22d7..30d565df 100644 --- a/lib/libalpm/hook.h +++ b/lib/libalpm/hook.h @@ -22,6 +22,8 @@ #include "alpm.h" +#define ALPM_HOOK_SUFFIX ".hook" + int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when); #endif /* ALPM_HOOK_H */ -- 2.17.1

3 6