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

[pacman-dev] [PATCH] bash-completion: use POSIX character classes in regular expressions
by Eli Schwartz 25 Jun '19

25 Jun '19

bash uses POSIX extended regular expressions via regex(3), which does not guarantee support for shorthand character classes. Although glibc supports it, msys2-runtime does not. Make sure the completion script works (hopefully) everywhere by being more portable. Fixes: https://github.com/msys2/MSYS2-packages/pull/1549 Original-patch-by: plotasse <platos(a)protonmail.ch> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/completion/bash_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in index a1ab9fec..915004e2 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -24,7 +24,7 @@ _arch_ptr2comp() { } _arch_incomp() { - local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]] + local r="[[:space:]]-(-${1#* }[[:space:]]|[[:alnum:]_]*${1% *})"; [[ $COMP_LINE =~ $r ]] } _pacman_keyids() { @@ -77,7 +77,7 @@ _makepkg() { _init_completion || return if [[ $prev = @(-p|--config) ]]; then compopt -o default - elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vh]) ]]; then + elif [[ ! $prev =~ ^-(-(config|help|key|version)$|[[:alnum:]_]*[Vh]) ]]; then opts=('allsource asdeps check clean cleanbuild config force geninteg help holdver ignorearch install key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare noprogressbar nosign @@ -127,7 +127,7 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core - elif [[ ! $prev =~ ^-\w*[Vbhr] && + elif [[ ! $prev =~ ^-[[:alnum:]_]*[Vbhr] && ! $prev = --@(cachedir|color|config|dbpath|help|hookdir|gpgdir|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || -- 2.22.0

1 0

[pacman-dev] [PATCH 0/3] meson updates
by Eli Schwartz 25 Jun '19

25 Jun '19

Let's take advantage of the latest version of meson to make our meson.build smaller! New in 0.51 is also the dep.get_variable() function which is "a generic replacement for type specific variable getters" but I decided not to bother using it since it doesn't actually make get_pkgconfig_variable() shorter and the only benefit would be allowing us to also detect bash-completion using cmake (!!!) and there really is no need to pander to that. Eli Schwartz (3): meson: bump the minimum supported version of meson to 0.51 meson: use not_found_message when dependencies are not found meson: use dependency('gpgme') exclusively meson.build | 47 ++++++++++------------------------------------- meson_options.txt | 2 -- 2 files changed, 10 insertions(+), 39 deletions(-) -- 2.22.0

1 3

[pacman-dev] [PATCH] makepkg: do not exit immediately on dependency install failures
by Allan McRae 25 Jun '19

25 Jun '19

Fixes FS#63000 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa03e9d9..43484db3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -273,7 +273,7 @@ handle_deps() { if ! run_pacman -S --asdeps "${deplist[@]}"; then error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" - exit $E_INSTALL_DEPS_FAILED + return $R_DEPS_MISSING fi fi @@ -303,7 +303,7 @@ resolve_deps() { if handle_deps "${deplist[@]}"; then # check deps again to make sure they were resolved - deplist=$(check_deps "$@") || exit $E_INSTALL_DEPS_FAILED + deplist=$(check_deps "$@") [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi -- 2.22.0

2 1

[pacman-dev] [PATCH] makepkg: remove installed packages if installation of makedepends fails
by arch＠eckner.net 25 Jun '19

25 Jun '19

From: Erich Eckner <git(a)eckner.net> When makepkg fails to install makedepends=() or checkdepends=(), it should still remove installed depends=() packages iff RMDEPS is set. To correctly do this, it needs to remember the installed packages after successfully installing depends=(). Signed-off-by: Erich Eckner <git(a)eckner.net> --- scripts/makepkg.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa03e9d9..a6c94e97 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1366,6 +1366,10 @@ else msg "$(gettext "Checking runtime dependencies...")" resolve_deps ${depends[@]} || deperr=1 + if (( RMDEPS )); then + current_pkglist=($(run_pacman -Qq)) # required by remove_deps + fi + if (( RMDEPS && INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi -- 2.22.0

1 0

[pacman-dev] [PATCH] use consistent time notation for the log
by Andrew Gregory 20 Jun '19

20 Jun '19

%X is locale-dependent, making it impossible to reliably parse and potentially overflowing the buffer. %T is consistent across locales. Also fixes some adjacent whitespace. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index d8842a55..2ff5544b 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -39,11 +39,11 @@ static int _alpm_log_leader(FILE *f, const char *prefix) { time_t t = time(NULL); struct tm *tm = localtime(&t); - int length = 32; - char timestamp[length]; + int length = 32; + char timestamp[length]; /* Use ISO-8601 date format */ - strftime(timestamp,length,"%FT%X%z", tm); + strftime(timestamp,length,"%FT%T%z", tm); return fprintf(f, "[%s] [%s] ", timestamp, prefix); } -- 2.21.0

2 1

[pacman-dev] [PATCH] pacman: correctly free lists
by morganamilo 20 Jun '19

20 Jun '19

diff --git a/src/pacman/database.c b/src/pacman/database.c index f3b890ce..7a792bad 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -105,7 +105,8 @@ static int check_db_missing_deps(alpm_list_t *pkglist) free(depstring); ret++; } - FREELIST(data); + alpm_list_free_inner(data, (alpm_list_fn_free)alpm_depmissing_free); + alpm_list_free(data); return ret; } @@ -159,7 +160,8 @@ static int check_db_local_package_conflicts(alpm_list_t *pkglist) conflict->package1, conflict->package2); ret++; } - FREELIST(data); + alpm_list_free_inner(data, (alpm_list_fn_free)alpm_conflict_free); + alpm_list_free(data); return ret; } -- 2.21.0

2 1

[pacman-dev] [PATCH] Fix compiler warnings with gcc-9.1
by Allan McRae 20 Jun '19

20 Jun '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I think these are all legimite ways of fixing the warings... callback.c: filenamelen >= 50-33, so i is always positive. No need for that check pacman.c: this is the same condition, it just changes the compiler optimisation of the loop to avoid the warning query.c: this gave a dumb warning... it is also the only place in the codebase we used strncpy vs strcpy. src/pacman/callback.c | 2 +- src/pacman/pacman.c | 2 +- src/pacman/query.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 22865614..aa5f521e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -804,7 +804,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) int i = filenamelen - 3; wchar_t *wcp = wcfname; /* grab the max number of char columns we can fill */ - while(i > 0 && wcwidth(*wcp) < i) { + while(wcwidth(*wcp) < i) { i -= wcwidth(*wcp); wcp++; } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 93fb98a4..b7406cea 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1079,7 +1079,7 @@ static void cl_to_log(int argc, char *argv[]) return; } char *p = cl_text; - for(i = 0; i < argc - 1; i++) { + for(i = 0; i + 1 < argc; i++) { strcpy(p, argv[i]); p += strlen(argv[i]); *p++ = ' '; diff --git a/src/pacman/query.c b/src/pacman/query.c index 3e728257..de82553c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -189,7 +189,7 @@ static int query_fileowner(alpm_list_t *targets) if(!lrealpath(filename, rpath)) { /* Can't canonicalize path, try to proceed anyway */ - strncpy(rpath, filename, PATH_MAX); + strcpy(rpath, filename); } if(strncmp(rpath, root, rootlen) != 0) { -- 2.22.0

1 0

[pacman-dev] [PATCH] free makedepends/checkdepends when freeing packages
by Dave Reisner 20 Jun '19

20 Jun '19

Credit to Andrew for identifying source of the leak. --- lib/libalpm/package.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 94716666..dde32175 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -683,6 +683,8 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) alpm_list_free(pkg->backup); free_deplist(pkg->depends); free_deplist(pkg->optdepends); + free_deplist(pkg->checkdepends); + free_deplist(pkg->makedepends); free_deplist(pkg->conflicts); free_deplist(pkg->provides); alpm_list_free(pkg->removes); -- 2.22.0

2 1

[pacman-dev] [PATCH] pacman: fix error during -Fy
by morganamilo 06 Jun '19

06 Jun '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/src/pacman/files.c b/src/pacman/files.c index 74d06815..8e518486 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -300,7 +300,7 @@ int pacman_files(alpm_list_t *targets) return files_list(files_dbs, targets); } - if(targets == NULL) { + if(targets == NULL && !config->op_s_sync) { pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n")); return 1; } -- 2.21.0

2 1

[pacman-dev] [PATCH v2 1/2] libmakepkg: fix reporting of invalid archive extensions in compress.sh
by Eli Schwartz 05 Jun '19

05 Jun '19

In commit 1825bd6716c2a51c92642e8b96beac0101e83805 this was split out from makepkg, but the warning was not properly migrated; $ext did not ever exist. As a result, no matter what you did, the only possible warning was: ==> WARNING: '' is not a valid archive extension. Fix to filter based on the presence of .tar in the argument, and building the $ext variable for all checking and messaging purposes within the function. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/compress.sh.in | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in index 3d4d88fd..9e3150f7 100644 --- a/scripts/libmakepkg/util/compress.sh.in +++ b/scripts/libmakepkg/util/compress.sh.in @@ -29,21 +29,21 @@ source "$LIBRARY/util/message.sh" # 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 + # $1: final archive filename extension for compression type detection - local filename="$1" + local ext=".tar${1##*.tar}" - case "$filename" in - *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; - *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; - *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; - *tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; - *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; - *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; - *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; - *tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; - *tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;; - *tar) cat ;; + case "$ext" in + *.tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; + *.tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; + *.tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *.tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; + *.tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; + *.tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; + *.tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; + *.tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; + *.tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;; + *.tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$ext"; cat ;; esac -- 2.21.0

2 3