- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] makepkg: move config loading into libmakepkg
by Eli Schwartz 28 May '19

28 May '19

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- For some reason, parsing this does not seem to be intuitive to most thirdparty consumers. For example, devtools uses grep and eval! And for the longest time, it also did not support user makepkg.conf. Other issues seen in the wild by makepkg.conf parsers include ignoring ~/.makepkg.conf, *only* using ~/.makepkg.conf, etc. This is also sort of an uncomfortable amount of code to reimplement, so I figured it could benefit from being split out into a utility library. scripts/Makefile.am | 1 + scripts/libmakepkg/util/config.sh.in | 55 ++++++++++++++++++++++++++++ scripts/libmakepkg/util/meson.build | 1 + scripts/libmakepkg/util/util.sh.in | 16 ++++++++ scripts/makepkg.sh.in | 29 +-------------- 5 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 scripts/libmakepkg/util/config.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2c743e82..4e5876af 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -119,6 +119,7 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ libmakepkg/util/compress.sh \ + libmakepkg/util/config.sh \ libmakepkg/util/error.sh \ libmakepkg/util/message.sh \ libmakepkg/util/option.sh \ diff --git a/scripts/libmakepkg/util/config.sh.in b/scripts/libmakepkg/util/config.sh.in new file mode 100644 index 00000000..fdfeef89 --- /dev/null +++ b/scripts/libmakepkg/util/config.sh.in @@ -0,0 +1,55 @@ +#!/bin/bash +# +# config.sh - functions for handling makepkg config files +# +# Copyright (c) 2006-2019 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_UTIL_CONFIG_SH" ]] && return +LIBMAKEPKG_UTIL_CONFIG_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/error.sh" +source "$LIBRARY/util/util.sh" + +# correctly source makepkg.conf, respecting user precedence and the system conf +source_makepkg_config() { + # $1: override system config file + + local MAKEPKG_CONF=${1:-@sysconfdir@/makepkg.conf} + + # Source the config file; fail if it is not found + if [[ -r $MAKEPKG_CONF ]]; then + source_safe "$MAKEPKG_CONF" + else + error "$(gettext "%s not found.")" "$MAKEPKG_CONF" + plain "$(gettext "Aborting...")" + exit $E_CONFIG_ERROR + fi + + # Source user-specific makepkg.conf overrides, but only if no override config + # file was specified + XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman" + if [[ "$MAKEPKG_CONF" = "@sysconfdir@/makepkg.conf" ]]; then + if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then + source_safe "$XDG_PACMAN_DIR/makepkg.conf" + elif [[ -r "$HOME/.makepkg.conf" ]]; then + source_safe "$HOME/.makepkg.conf" + fi + fi +} diff --git a/scripts/libmakepkg/util/meson.build b/scripts/libmakepkg/util/meson.build index 229b004d..c29503b7 100644 --- a/scripts/libmakepkg/util/meson.build +++ b/scripts/libmakepkg/util/meson.build @@ -2,6 +2,7 @@ libmakepkg_module = 'util' sources = [ 'compress.sh.in', + 'config.sh.in', 'error.sh.in', 'message.sh.in', 'option.sh.in', diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index c2f5897e..8feb9178 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -22,6 +22,9 @@ [[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ]] && return LIBMAKEPKG_UTIL_UTIL_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/error.sh" ## # usage : in_array( $needle, $haystack ) @@ -95,3 +98,16 @@ ensure_writable_dir() { return 0 } + +# source a file and fail if it does not succeed +source_safe() { + local shellopts=$(shopt -p extglob) + shopt -u extglob + + if ! source "$@"; then + error "$(gettext "Failed to source %s")" "$1" + exit $E_MISSING_FILE + fi + + eval "$shellopts" +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28f3e3ef..08ec2a15 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -354,15 +354,6 @@ error_function() { exit $E_USER_FUNCTION_FAILED } -source_safe() { - shopt -u extglob - if ! source "$@"; then - error "$(gettext "Failed to source %s")" "$1" - exit $E_MISSING_FILE - fi - shopt -s extglob -} - merge_arch_attrs() { local attr supported_attrs=( provides conflicts depends replaces optdepends @@ -1113,25 +1104,7 @@ restore_envvars=$(declare -p PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR PKGEXT # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -# Source the config file; fail if it is not found -if [[ -r $MAKEPKG_CONF ]]; then - source_safe "$MAKEPKG_CONF" -else - error "$(gettext "%s not found.")" "$MAKEPKG_CONF" - plain "$(gettext "Aborting...")" - exit $E_CONFIG_ERROR -fi - -# Source user-specific makepkg.conf overrides, but only if no override config -# file was specified -XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman" -if [[ "$MAKEPKG_CONF" = "$confdir/makepkg.conf" ]]; then - if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then - source_safe "$XDG_PACMAN_DIR/makepkg.conf" - elif [[ -r "$HOME/.makepkg.conf" ]]; then - source_safe "$HOME/.makepkg.conf" - fi -fi +source_makepkg_config "$MAKEPKG_CONF" eval "$restore_envvars" -- 2.21.0

3 14

[pacman-dev] [PATCH] libmakepkg: add lint_config to validate SRCEXT/PKGEXT
by Eli Schwartz 28 May '19

28 May '19

These variables must begin with .src.tar / .pkg.tar respectively, so fail early if those expectations are not matched. This prevents makepkg from creating e.g. package files literally named "./pacman-5.1.3-1-x86_64" which are actually uncompressed tarballs. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_config/ext.sh.in | 45 ++++++++++++++++++++++ scripts/libmakepkg/lint_config/meson.build | 1 + 3 files changed, 47 insertions(+) create mode 100644 scripts/libmakepkg/lint_config/ext.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 00e0c038..0597a0e5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -72,6 +72,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_checksum.sh \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_config.sh \ + libmakepkg/lint_config/ext.sh \ libmakepkg/lint_config/paths.sh \ libmakepkg/lint_config/source_date_epoch.sh \ libmakepkg/lint_config/variable.sh \ diff --git a/scripts/libmakepkg/lint_config/ext.sh.in b/scripts/libmakepkg/lint_config/ext.sh.in new file mode 100644 index 00000000..20aaf6ab --- /dev/null +++ b/scripts/libmakepkg/lint_config/ext.sh.in @@ -0,0 +1,45 @@ +#!/bin/bash +# +# ext.sh - Check that source/package extensions have valid prefixes +# +# Copyright (c) 2019 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_LINT_CONFIG_EXT_SH" ]] && return +LIBMAKEPKG_LINT_CONFIG_EXT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_config_functions+=('lint_ext') + + +lint_ext() { + local i var val ret=0 + + for i in 'SRCEXT/.src.tar' 'PKGEXT/.pkg.tar'; do + IFS='/' read -r var val < <(printf '%s\n' "$i") + + if [[ ${!var} != ${val}* ]]; then + error "$(gettext "%s does not contain a valid prefix (needs '%s', got '%s')")" \ + "\$${var}" "${val}*" "${!var}" + ret=1 + fi + done + + return $ret +} diff --git a/scripts/libmakepkg/lint_config/meson.build b/scripts/libmakepkg/lint_config/meson.build index 144705f9..2262ad45 100644 --- a/scripts/libmakepkg/lint_config/meson.build +++ b/scripts/libmakepkg/lint_config/meson.build @@ -1,6 +1,7 @@ libmakepkg_module = 'lint_config' sources = [ + 'ext.sh.in', 'paths.sh.in', 'source_date_epoch.sh.in', 'variable.sh.in', -- 2.21.0

2 5

[pacman-dev] [PATCH] Support application/gzip MIME type in extraction
by Eli Schwartz 28 May '19

28 May '19

From: Kevin Mihelich <kevin(a)archlinuxarm.org> file 5.37 changed the gzip MIME type from application/x-gzip to application/gzip, so support this when checking to extract source files. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Sending on behalf of @leming who noticed this with gzipped patch files, and pinged me via IRC. scripts/libmakepkg/source/file.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 08b8bef8..8492ba11 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -102,7 +102,7 @@ extract_file() { case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) cmd="bsdtar" ;; - *application/x-gzip*) + *application/x-gzip*|*application/gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; *) return;; -- 2.21.0

2 2

[pacman-dev] [PATCH] Added flag --prevent-downgrade to repo-add to prevent adding packages to a database if a newer one is already present.
by ekarndam＠autistici.org 22 May '19

22 May '19

From: ekardnam <lucabertozzi.pub(a)gmail.com> Reference bug in the bug tracker is at #FS17752 Signed-off-by: Luca Bertozzi <ekarndam(a)autistici.org> --- scripts/repo-add.sh.in | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..e2eb06e3 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ REPO_DB_SUFFIX= LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' +PREVENT_DOWNGRADE=0 # Import libmakepkg source "$LIBRARY"/util/message.sh @@ -63,6 +64,8 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -R, --remove remove old package file from disk after updating database\n")" + printf -- "$(gettext " -p, --prevent-downgrade do not add package to database if a newer version is already present\n")" + printf -- "$(gettext " --no-timestamp do not add a timestamp to the repository")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename> ...\n")" printf -- "\n" @@ -248,9 +251,17 @@ db_write_entry() { return 0 fi else - if (( RMEXISTING )); then - pkgentry=$(find_pkgentry "$pkgname") - if [[ -n $pkgentry ]]; then + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + + local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc") + if (( $(vercmp "$version" "$pkgver") > 0 )); then + warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname" + if (( PREVENT_DOWNGRADE )); then + return 0 + fi + fi + if (( RMEXISTING )); then local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")" local oldfile="$(dirname "$1")/$oldfilename" fi @@ -464,7 +475,7 @@ remove() { error "$(gettext "Package matching '%s' not found.")" "$pkgname" return 1 fi - + return 0 } @@ -618,6 +629,9 @@ while (( $# )); do -v|--verify) VERIFY=1 ;; + -p|--prevent-downgrade) + PREVENT_DOWNGRADE=1 + ;; *) args+=("$1") ;; -- 2.21.0

4 3

[pacman-dev] [PATCH] makepkg: Add '--nocompress' syntactic sugar
by Jouke Witteveen 22 May '19

22 May '19

Compression is a waste of time when building a package for local installation. It could already be suppressed easily, but not yet via an argument to makepkg. Signed-off-by: Jouke Witteveen <j.witteveen(a)gmail.com> --- The OPT_LONG array should probably be reformatted, but that could as well happen separately. At any rate it is not clear to me what the guiding principles would be. doc/makepkg.8.asciidoc | 4 ++++ scripts/completion/bash_completion.in | 4 ++-- scripts/makepkg.sh.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc index 544659fc..86e1960a 100644 --- a/doc/makepkg.8.asciidoc +++ b/doc/makepkg.8.asciidoc @@ -165,6 +165,10 @@ Options *\--nocheck*:: Do not run the check() function in the PKGBUILD or handle the checkdepends. +*\--nocompress*:: + Do not compress the package. Equivalent to setting PKGEXT=".pkg.tar" and + SRCEXT=".src.tar". + *\--noprepare*:: Do not run the prepare() function in the PKGBUILD. diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in index a1ab9fec..30d5c683 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -80,8 +80,8 @@ _makepkg() { elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[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 - packagelist printsrcinfo repackage rmdeps sign skipchecksums + nocolor nocompress noconfirm nodeps noextract noprepare noprogressbar + nosign packagelist printsrcinfo repackage rmdeps sign skipchecksums skipinteg skippgpcheck source syncdeps verifysource version' 'A C L R S c d e f g h i m o p r s') _arch_ptr2comp opts diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4d9948ec..953b5e36 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -977,6 +977,7 @@ usage() { printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" printf -- "$(gettext " --noarchive Do not create package archive")\n" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" + printf -- "$(gettext " --nocompress Do not compress the package archive")\n" printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list package filepaths that would be produced")\n" @@ -1026,7 +1027,7 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' - 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' + 'nocolor' 'nocheck' 'nocompress' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') @@ -1067,6 +1068,7 @@ while true; do -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=("--color" "never") ;; --noarchive) NOARCHIVE=1 ;; --nocheck) RUN_CHECK='n' ;; + --nocompress) PKGEXT=".pkg.tar"; SRCEXT=".src.tar";; --noprepare) RUN_PREPARE='n' ;; --nosign) SIGNPKG='n' ;; -o|--nobuild) BUILDPKG=0 NOBUILD=1 ;; -- 2.21.0

3 12

[pacman-dev] [PATCH] Added flag --prevent-downgrade to repo-add to prevent adding packages to a database if a newer one is already present.
by ekarndam＠autistici.org 22 May '19

22 May '19

From: ekardnam <lucabertozzi.pub(a)gmail.com> Reference bug in the bug tracker is at #FS17752 Signed-off-by: Luca Bertozzi <ekarndam(a)autistici.org> --- scripts/repo-add.sh.in | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..e2eb06e3 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ REPO_DB_SUFFIX= LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' +PREVENT_DOWNGRADE=0 # Import libmakepkg source "$LIBRARY"/util/message.sh @@ -63,6 +64,8 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -R, --remove remove old package file from disk after updating database\n")" + printf -- "$(gettext " -p, --prevent-downgrade do not add package to database if a newer version is already present\n")" + printf -- "$(gettext " --no-timestamp do not add a timestamp to the repository")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename> ...\n")" printf -- "\n" @@ -248,9 +251,17 @@ db_write_entry() { return 0 fi else - if (( RMEXISTING )); then - pkgentry=$(find_pkgentry "$pkgname") - if [[ -n $pkgentry ]]; then + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + + local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc") + if (( $(vercmp "$version" "$pkgver") > 0 )); then + warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname" + if (( PREVENT_DOWNGRADE )); then + return 0 + fi + fi + if (( RMEXISTING )); then local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")" local oldfile="$(dirname "$1")/$oldfilename" fi @@ -464,7 +475,7 @@ remove() { error "$(gettext "Package matching '%s' not found.")" "$pkgname" return 1 fi - + return 0 } @@ -618,6 +629,9 @@ while (( $# )); do -v|--verify) VERIFY=1 ;; + -p|--prevent-downgrade) + PREVENT_DOWNGRADE=1 + ;; *) args+=("$1") ;; -- 2.21.0

3 2

[pacman-dev] [PATCH] Added --dont-downgrade flag to repo-add
by ekarndam＠autistici.org 08 May '19

08 May '19

From: ekardnam <lucabertozzi.pub(a)gmail.com> Signed-off-by: Luca Bertozzi <ekarndam(a)autistici.org> --- scripts/repo-add.sh.in | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..f8748f08 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ REPO_DB_SUFFIX= LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' +DONT_DOWNGRADE=0 # Import libmakepkg source "$LIBRARY"/util/message.sh @@ -63,6 +64,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -R, --remove remove old package file from disk after updating database\n")" + printf -- "$(gettext " --dont-downgrade do not add package to database if a newer version is already present\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename> ...\n")" printf -- "\n" @@ -248,9 +250,17 @@ db_write_entry() { return 0 fi else - if (( RMEXISTING )); then - pkgentry=$(find_pkgentry "$pkgname") - if [[ -n $pkgentry ]]; then + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + + local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc") + if (( "$(vercmp $version $pkgver)" > "0" )); then + warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname" + if (( DONT_DOWNGRADE )); then + return 0 + fi + fi + if (( RMEXISTING )); then local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")" local oldfile="$(dirname "$1")/$oldfilename" fi @@ -618,6 +628,9 @@ while (( $# )); do -v|--verify) VERIFY=1 ;; + --dont-downgrade) + DONT_DOWNGRADE=1 + ;; *) args+=("$1") ;; -- 2.21.0

4 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-170-g0bc687e2
by Allan McRae 08 May '19

08 May '19

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 0bc687e2e01f4e6e3f2a2f7ac10c7e1fdbaf5ba2 (commit) via 9375f49865296f04bd51e5e39ddca863b67cbd6c (commit) via 614ef781ebf8ef7ae116c26d419bc9002c162599 (commit) via b93dfa935f900d884f14d5be8949dc0ae85f1692 (commit) via a0f4429e95240b8a275ab6c43c4b8d0b11cfcd5d (commit) via 583f3122ce3b98c384165d47c126aaa5c98ea392 (commit) via 6911904a033c1494f32f438f2d5cac2dc5b1ee19 (commit) via f2a7fb2b96dd76f48b7750d1edeb6a85b7006856 (commit) via a8b3d1a62afaeee4f1586f6c463f6bf51f7a2d70 (commit) via 915ac9ff9b112997bcdb14d7136f4862c9537a35 (commit) from d37e6d40a19dadf41a223dcb1fde36c6fa622958 (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 0bc687e2e01f4e6e3f2a2f7ac10c7e1fdbaf5ba2 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Apr 16 13:36:12 2019 -0400 makepkg: propagate error codes when package failed to sign correctly Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9375f49865296f04bd51e5e39ddca863b67cbd6c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 7 21:55:03 2019 -0400 libmakepkg: install pkg-config file Since makepkg exports a public library of functions, other projects may wish to use these functions. Highlights include parseopts or our messaging functions. Install a pkg-config file in order to let downstream users detect where they can source the libmakepkg functionality. This is useful e.g. to gracefully handle the case where a thirdparty project is configured and installed into a different datarootdir from pacman, but still wants to use the installed pacman's version of libmakepkg. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 614ef781ebf8ef7ae116c26d419bc9002c162599 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Apr 16 13:12:39 2019 -0400 libmakepkg: fix missing or inaccurate interdependencies When the executable checking was refactored into libmakepkg, it carried with it, usage of $E_* error codes, which need to be declared from error.sh but are only available when the parent program already sources error.sh; additionally, message.sh was only loaded in a parent library, but not where it was needed, and option.sh was often loaded when it wasn't needed at all. util.sh, meanwhile, has always depended on message.sh functions. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b93dfa935f900d884f14d5be8949dc0ae85f1692 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Apr 27 22:54:17 2019 -0400 scripts: protect against unintended glob matching in [[ ]] RHS The right-hand side of the [[ ... = ... ]] keyword is an exception to the general rule that quoting is unnecessary with [[ This is usually not a problem, e.g. in libmakepkg, lint_one_pkgname will already fail if pkgname has an asterisk, but it certainly doesn't hurt to be "more proper" and go with the spec; it is more dangerous in repo-add, which can get caught in an infinite loop instead of safely asserting there is no package named 'foo*'. Reported-by: Rafael Ascensão <rafa.almas(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a0f4429e95240b8a275ab6c43c4b8d0b11cfcd5d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 7 20:39:40 2019 -0400 makepkg: use more schema.sh to clean the environment of special variables Fixes "arch" and "checkdepends" never having been unset, fixes b2sums (but not ${!b2sums_@}) being recently left out. The "build" function used to be unset as well, explicitly unset it as a function and do the same for other official functions as well. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 583f3122ce3b98c384165d47c126aaa5c98ea392 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Apr 14 20:56:17 2019 -0400 meson: fix build of executables with nonstandard libarchive path The libarchive header is used in alpm.h, and several binaries include this header. This is noticeably a problem when using e.g. the musl-gcc compiler which does not include /usr/include by default, and thus the build system reports: ...../lib/libalpm/alpm.h:35:10: fatal error: archive.h: No such file or directory More commonly, this will result in compiling against potentially the wrong headers, if the libarchive installation picked up by pkg-config is different from the one with headers in /usr/include, and /usr/include is in the -isystem path. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6911904a033c1494f32f438f2d5cac2dc5b1ee19 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Apr 10 01:50:31 2019 -0400 makepkg: fix bash 5 compatibility when packaging symlinks to a directory In commit b5191ea140386dd9b73e4509ffa9a6d347c1b5fa we moved to using shell globbing to print package files for a couple of reasons including reproducible packaging of .METADATA files. Unfortunately, this only works reliably when the glob pattern does not resolve to a symlinked directory due to a change in the bash 5.0 release. Note that the previous, desired behavior was rather to merely refuse to recurse into symlinked directories, but due to an unrelated issue, the symlink handling for globstar was reworked in a way that had this side effect. See https://lists.gnu.org/archive/html/bug-bash/2019-04/msg00015.html for discussion; this may be fixed at some point, but bash 5.0 is broken either way. The appropriate way of handling this seems to be to use **/* to match instead; this produces the same results on both bash 4 and bash 5, as the ** matches any leading directory component (or none), and the * matches any file, directory, or symlink to either one. Fixes FS#62278 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f2a7fb2b96dd76f48b7750d1edeb6a85b7006856 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Fri Apr 5 00:02:51 2019 +0200 Fix clang 8 string-plus-int warnings Clang 8 warns that adding a string to an integer does not append to string. Indeed it doesn't, but that was not the intentetion. Use array indexing as suggested by the compiler to silence the warning. There should be no functional change. Example of warning message: alpm.c:71:54: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1); ~~~~~~~~~~~^~~ alpm.c:71:54: note: use array indexing to silence this warning sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1); ^ & [ ] 1 warning generated. commit a8b3d1a62afaeee4f1586f6c463f6bf51f7a2d70 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Mar 31 12:15:40 2019 -0400 makepkg: correctly handle hg sources with updates on a non-default branch The "tip" ref actually signifies the most recently updated branch. hg does not support a default branch named anything other than "default", except by creating a "@" bookmark. The correct way to explicitly update to the default clone ref, is therefore to use one of these, rather than "tip". Fixes FS#62092 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 915ac9ff9b112997bcdb14d7136f4862c9537a35 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Mar 31 12:13:20 2019 -0400 libmakepkg: fix migration to schema.sh for integsums One of the callers was changed to use known_hash_algos, one was not. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.asciidoc | 2 +- lib/libalpm/alpm.c | 2 +- meson.build | 2 ++ scripts/.gitignore | 1 + scripts/Makefile.am | 8 ++++++-- scripts/libmakepkg.pc.in | 6 ++++++ scripts/libmakepkg/buildenv.sh.in | 5 ----- scripts/libmakepkg/executable.sh.in | 5 ----- scripts/libmakepkg/executable/ccache.sh.in | 1 + scripts/libmakepkg/executable/checksum.sh.in | 1 + scripts/libmakepkg/executable/distcc.sh.in | 1 + scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 1 + scripts/libmakepkg/executable/gzip.sh.in | 1 + scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 1 + scripts/libmakepkg/executable/sudo.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 3 ++- scripts/libmakepkg/integrity/generate_signature.sh.in | 8 ++++++-- scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 +- scripts/libmakepkg/source/git.sh.in | 2 +- scripts/libmakepkg/source/hg.sh.in | 6 +++++- scripts/libmakepkg/srcinfo.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util/util.sh.in | 3 +++ scripts/makepkg.sh.in | 11 ++++++----- scripts/meson.build | 6 ++++++ scripts/pacman-db-upgrade.sh.in | 2 +- scripts/repo-add.sh.in | 4 ++-- src/pacman/conf.c | 4 ++-- 35 files changed, 68 insertions(+), 40 deletions(-) create mode 100644 scripts/libmakepkg.pc.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: install pkg-config file
by Eli Schwartz 08 May '19

08 May '19

Since makepkg exports a public library of functions, other projects may wish to use these functions. Highlights include parseopts or our messaging functions. Install a pkg-config file in order to let downstream users detect where they can source the libmakepkg functionality. This is useful e.g. to gracefully handle the case where a thirdparty project is configured and installed into a different datarootdir from pacman, but still wants to use the installed pacman's version of libmakepkg. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- pkgconfig.generate is bloat for this and results in useless keys cluttering up the generated .pc -- there is no advantage of generating it over configuring it, if we're not benefiting from library autodetection. scripts/.gitignore | 1 + scripts/Makefile.am | 5 ++++- scripts/libmakepkg.pc.in | 6 ++++++ scripts/meson.build | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 scripts/libmakepkg.pc.in diff --git a/scripts/.gitignore b/scripts/.gitignore index b8bb1f83..541fd18d 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,3 +1,4 @@ +libmakepkg.pc makepkg makepkg-template pacman-db-upgrade diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2c743e82..5cb8cf71 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,6 +5,9 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = \ SUBDIRS = po +pkgconfigdir = $(datarootdir)/pkgconfig +pkgconfig_DATA = libmakepkg.pc + bin_SCRIPTS = \ $(OURSCRIPTS) \ makepkg-template \ @@ -195,7 +198,7 @@ $(LIBMAKEPKG_IN): %: %.in Makefile $(AM_V_at)chmod a-w $@ @$(BASH_SHELL) -O extglob -n $@ -$(COMPLETION_IN): %: %.in Makefile +$(COMPLETION_IN) libmakepkg.pc: %: %.in Makefile $(AM_V_at)$(RM) $@ $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(edit) $(srcdir)/$@.in >$@ diff --git a/scripts/libmakepkg.pc.in b/scripts/libmakepkg.pc.in new file mode 100644 index 00000000..05e9566a --- /dev/null +++ b/scripts/libmakepkg.pc.in @@ -0,0 +1,6 @@ +libmakepkgdir=@libmakepkgdir@ + +Name: libmakepkg +Description: Arch Linux package build utility +URL: https://www.archlinux.org/pacman/ +Version: @PACKAGE_VERSION@ diff --git a/scripts/meson.build b/scripts/meson.build index db442973..7d533f35 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -78,6 +78,12 @@ endforeach subdir('libmakepkg') +configure_file( + configuration : { 'libmakepkgdir': LIBMAKEPKGDIR, 'PACKAGE_VERSION': PACKAGE_VERSION }, + input : 'libmakepkg.pc.in', + output : '@BASENAME@', + install_dir : join_paths(DATAROOTDIR, 'pkgconfig')) + custom_target( 'bash_completion', command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], -- 2.21.0

2 3

[pacman-dev] [PATCH] repo-remove: Fix infinite loop when given a pkgname ending in '*'
by Rafael Ascensão 08 May '19

08 May '19

While this is most likely the result of user error, as repo-remove doesn't accept globs, using 'package*' as the pkgname will result in an endless loop of the following message being printed: -> Removing existing entry 'package**'... This happens because find_pkgentry() fails to account the case where globbing fails and the expression is taken literally. Fix that by checking the existence of the file before doing anything else. Signed-off-by: Rafael Ascensão <rafa.almas(a)gmail.com> --- scripts/repo-add.sh.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..123bb796 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -120,10 +120,12 @@ find_pkgentry() { local pkgentry for pkgentry in "$tmpdir/db/$pkgname"*; do - name=${pkgentry##*/} - if [[ ${name%-*-*} = $pkgname ]]; then - echo $pkgentry - return 0 + if [[ -e $pkgentry ]]; then + name=${pkgentry##*/} + if [[ ${name%-*-*} = $pkgname ]]; then + echo $pkgentry + return 0 + fi fi done return 1 -- 2.21.0

5 7