November 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/7] Improve linting for makepkg
by morganamilo 31 Jan '19

31 Jan '19

I recently did some data crunshing on AUR packages, trying to find ones that are formatted incorrectly, catching mistakes makepkg did not. I wrote up on the results here https://github.com/Morganamilo/go-srcinfo/issues/1. This patch should cover all the mistakes found and make is so that makepkg bails out duing the linting phase and users are forced to make more correct pkgbuilds. morganamilo (7): libmakepkg: disallow empty arch libmakepkg: stop printsrcinfo generating empty values libmakepkg: lint disallowed variables in package() libmakepkg: lint disallowed architecture specific variables libmakepkg: disallow using any as an architecture specific variable libmakepkg: add pkgbase to linted variables libmakepkg: disallow using 'any' with other arches scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 14 +++- .../libmakepkg/lint_pkgbuild/variable.sh.in | 72 ++++++++++++++++++- scripts/libmakepkg/srcinfo.sh.in | 6 +- 3 files changed, 86 insertions(+), 6 deletions(-) -- 2.17.1

5 56

[pacman-dev] [PATCH 1/2] libalpm: Add dlclientcert and dlclientkey options.
by Maarten de Vries 30 Jan '19

30 Jan '19

These patches add support for client certificates to alpm and pacman. This can already be achieved currently by setting an XferCommand, but doing so significantly reduces the quality of the feedback pacman gives during the downloads. Especially annoying are the 404 errors on most database signature files, but that's not the only issue. I admit this is a bit of an edge case, but I find myself in the situation where I have to download packages from a private repository that requires a valid client certificate. I really want the nice regular pacman feedback back though, so I figured I'd hack it in myself. I tried to follow naming schemes and other conventions the best I could, but please let me know if I should change anything, or forgot something. --- lib/libalpm/alpm.h | 6 ++++ lib/libalpm/dload.c | 3 ++ lib/libalpm/handle.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 2 ++ 4 files changed, 86 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d3d198a..b894e249 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -933,6 +933,12 @@ int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level); int alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout); +const char *alpm_option_get_dlclientcert(alpm_handle_t *handle); +int alpm_option_set_dlclientcert(alpm_handle_t *handle, const char * path); + +const char *alpm_option_get_dlclientkey(alpm_handle_t *handle); +int alpm_option_set_dlclientkey(alpm_handle_t *handle, const char * path); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 36ae4ee1..df57e175 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -276,6 +276,9 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_TCP_KEEPINTVL, 60L); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(curl, CURLOPT_SSLCERT, alpm_option_get_dlclientcert(handle)); + curl_easy_setopt(curl, CURLOPT_SSLKEY, alpm_option_get_dlclientkey(handle)); + _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); if(payload->max_size) { diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2213ce53..a9481837 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -88,6 +88,8 @@ void _alpm_handle_free(alpm_handle_t *handle) FREE(handle->lockfile); FREE(handle->arch); FREE(handle->gpgdir); + FREE(handle->dlclientcert); + FREE(handle->dlclientkey); FREELIST(handle->noupgrade); FREELIST(handle->noextract); FREELIST(handle->ignorepkg); @@ -417,6 +419,37 @@ alpm_errno_t _alpm_set_directory_option(const char *value, return 0; } +alpm_errno_t _alpm_set_file_option(const char *value, + char **storage, int must_exist) +{ + struct stat st; + char real[PATH_MAX]; + const char *path; + + path = value; + if(!path) { + return ALPM_ERR_WRONG_ARGS; + } + if(must_exist) { + if(stat(path, &st) == -1 || !S_ISREG(st.st_mode)) { + return ALPM_ERR_NOT_A_FILE; + } + if(!realpath(path, real)) { + return ALPM_ERR_NOT_A_FILE; + } + path = real; + } + + if(*storage) { + FREE(*storage); + } + *storage = strdup(path); + if(!*storage) { + return ALPM_ERR_MEMORY; + } + return 0; +} + int SYMEXPORT alpm_option_add_hookdir(alpm_handle_t *handle, const char *hookdir) { char *newhookdir; @@ -876,3 +909,45 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, #endif return 0; } + +const char * SYMEXPORT alpm_option_get_dlclientcert(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dlclientcert; +} + +int SYMEXPORT alpm_option_set_dlclientcert(alpm_handle_t *handle, const char * path) +{ + int err; + CHECK_HANDLE(handle, return -1); + if(!path) { + FREE(handle->dlclientcert); + return 0; + } + if((err = _alpm_set_file_option(path, &(handle->dlclientcert), 1))) { + RET_ERR(handle, err, -1); + } + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'dlclient_cert' = %s\n", handle->dlclientcert); + return 0; +} + +const char * SYMEXPORT alpm_option_get_dlclientkey(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dlclientkey; +} + +int SYMEXPORT alpm_option_set_dlclientkey(alpm_handle_t *handle, const char * path) +{ + int err; + CHECK_HANDLE(handle, return -1); + if(!path) { + FREE(handle->dlclientkey); + return 0; + } + if((err = _alpm_set_file_option(path, &(handle->dlclientkey), 1))) { + RET_ERR(handle, err, -1); + } + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'dlclient_key' = %s\n", handle->dlclientkey); + return 0; +} diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 44c4904b..4bcfeb8a 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -82,6 +82,8 @@ struct __alpm_handle_t { char *logfile; /* Name of the log file */ char *lockfile; /* Name of the lock file */ char *gpgdir; /* Directory where GnuPG files are stored */ + char *dlclientcert; /* Name of the client certificate */ + char *dlclientkey; /* Name of the client key */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ alpm_list_t *hookdirs; /* Paths to hook directories */ alpm_list_t *overwrite_files; /* Paths that may be overwritten */ -- 2.19.1

3 7

[pacman-dev] [PATCH] Check for all return values of _alpm_key_in_keychain
by David Phillips 24 Jan '19

24 Jan '19

This fixes a bug I encountered with a GPG keyring where the key id used to locate a key in the keyring was ambiguous within my keychain. This commit ensures that all valid return values are checked to catch this and related error cases rather than incorrectly taking an error case to mean the key was found, since this is rarely going to be the case. --- lib/libalpm/be_package.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 7e8b7920..1891fa5a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -754,10 +754,21 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; - if(_alpm_key_in_keychain(handle, key) == 0) { - if(_alpm_key_import(handle, key) == -1) { + switch(_alpm_key_in_keychain(handle, key)) { + case 1: + /* key is known; proceed */ + break; + case 0: + /* key is unknown; attempt to import */ + if(_alpm_key_import(handle, key) == -1) { + fail = 1; + } + break; + case -1: + /* error finding key in keychain */ + default: fail = 1; - } + break; } } FREELIST(keys); -- 2.12.2

3 3

[pacman-dev] [PATCH 1/3] libmakepkg: optimize get_protocol to always return proto, not proto+uri
by Eli Schwartz 22 Jan '19

22 Jan '19

e.g. git+https:// is commonly used for git repositories cloned over HTTPS, but we assume a proto with a plus in it is actually a protocol followed by some URI handler. So we might as well simplify the return value and not have to always add glob matching everywhere when checking the proto in use. This is required in order to use the proto directly in function calls, which will be used in a followup patch. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- .../libmakepkg/integrity/generate_checksum.sh.in | 2 +- .../libmakepkg/integrity/verify_signature.sh.in | 4 ++-- scripts/libmakepkg/source.sh.in | 16 ++++++++-------- scripts/libmakepkg/util/source.sh.in | 14 ++++++++------ 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index eb9b74fc..b8b078ec 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -52,7 +52,7 @@ generate_one_checksum() { proto="$(get_protocol "$netfile")" case $proto in - bzr*|git*|hg*|svn*) + bzr|git|hg|svn) sum="SKIP" ;; *) diff --git a/scripts/libmakepkg/integrity/verify_signature.sh.in b/scripts/libmakepkg/integrity/verify_signature.sh.in index ea877822..38f8afa1 100644 --- a/scripts/libmakepkg/integrity/verify_signature.sh.in +++ b/scripts/libmakepkg/integrity/verify_signature.sh.in @@ -49,7 +49,7 @@ check_pgpsigs() { for netfile in "${all_sources[@]}"; do proto="$(get_protocol "$netfile")" - if [[ $proto = git* ]]; then + if [[ $proto = git ]]; then verify_git_signature "$netfile" "$statusfile" || continue else verify_file_signature "$netfile" "$statusfile" || continue @@ -263,7 +263,7 @@ source_has_signatures() { proto="$(get_protocol "$netfile")" query=$(get_uri_query "$netfile") - if [[ ${netfile%%::*} = *.@(sig?(n)|asc) || ( $proto = git* && $query = signed ) ]]; then + if [[ ${netfile%%::*} = *.@(sig?(n)|asc) || ( $proto = git && $query = signed ) ]]; then return 0 fi done diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index 5d7df732..198efd5e 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -63,16 +63,16 @@ download_sources() { local) download_local "$netfile" ;; - bzr*) + bzr) (( get_vcs )) && download_bzr "$netfile" ;; - git*) + git) (( get_vcs )) && download_git "$netfile" ;; - hg*) + hg) (( get_vcs )) && download_hg "$netfile" ;; - svn*) + svn) (( get_vcs )) && download_svn "$netfile" ;; *) @@ -93,16 +93,16 @@ extract_sources() { local file=$(get_filename "$netfile") local proto=$(get_protocol "$netfile") case "$proto" in - bzr*) + bzr) extract_bzr "$netfile" ;; - git*) + git) extract_git "$netfile" ;; - hg*) + hg) extract_hg "$netfile" ;; - svn*) + svn) extract_svn "$netfile" ;; *) diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index 17e44664..faa7061b 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -41,10 +41,12 @@ get_protocol() { if [[ $1 = *://* ]]; then # strip leading filename local proto="${1#*::}" - printf "%s\n" "${proto%%://*}" + proto="${proto%%://*}" + # strip proto+uri:// + printf "%s\n" "${proto%%+*}" elif [[ $1 = *lp:* ]]; then local proto="${1#*::}" - printf "%s\n" "${proto%%lp:*}" + printf "%s\n" "${proto%%+lp:*}" else printf "%s\n" local fi @@ -63,15 +65,15 @@ get_filename() { local proto=$(get_protocol "$netfile") case $proto in - bzr*|git*|hg*|svn*) + bzr|git|hg|svn) filename=${netfile%%#*} filename=${filename%%\?*} filename=${filename%/} filename=${filename##*/} - if [[ $proto = bzr* ]]; then + if [[ $proto = bzr ]]; then filename=${filename#*lp:} fi - if [[ $proto = git* ]]; then + if [[ $proto = git ]]; then filename=${filename%%.git*} fi ;; @@ -89,7 +91,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - bzr*|git*|hg*|svn*) + bzr|git|hg|svn) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then -- 2.17.0

2 5

[pacman-dev] [PATCH v2 0/3] makepkg: Improve lint_pkgbuild error messages for epoch/ver/rel
by Luke Shumaker 10 Jan '19

10 Jan '19

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. v2: - Don't skip lint_pkgrel if (( PKGVERFUNC )), I should have never included that bit in v1. - check_fullpkgver: Don't let rel strip ver down to nothing 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 ++-- .../libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/depends.sh.in | 14 ++--- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 10 +++- .../libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 58 +++++++++++++++++++ .../lint_pkgbuild/makedepends.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 15 +++-- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- .../libmakepkg/lint_pkgbuild/provides.sh.in | 10 ++-- 11 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in -- Happy hacking, ~ Luke Shumaker 2.18.0

2 6

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: check for invalid variables even if they're empty
by Eli Schwartz 10 Jan '19

10 Jan '19

Checking the length of the variable to be non-zero before considering it an error is inconsistent; license=() and depends='' and `declare arch` should be considered just as wrong. In fact the current check detects depends='' as non-zero and returns an error, but happily considers the others to be perfectly okay. A more reliable check is to simply see if the name has been declared (whether it is set or not), and then enforce that it's been declared to the right type. As an added benefit, avoiding the creation of proxy-evaled variables to count the number of indexes results in simpler code. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 3266cb5e..52bb61a9 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -37,12 +37,11 @@ lint_variable() { replaces sha1sums sha256sums sha384sums sha512sums source) local string=(changelog epoch install pkgdesc pkgrel pkgver url) - local i a v pkg keys out bad ret=0 + local i a pkg out bad ret=0 # global variables for i in ${array[@]} ${arch_array[@]}; do - eval "keys=(\"\${!$i[@]}\")" - if (( ${#keys[*]} > 0 )); then + if declare -p $i > /dev/null 2>&1; then if ! is_array $i; then error "$(gettext "%s should be an array")" "$i" ret=1 @@ -54,11 +53,9 @@ lint_variable() { [[ $a == "any" ]] && continue for i in ${arch_array[@]}; do - v="${i}_${a}" - eval "keys=(\"\${!${v}[@]}\")" - if (( ${#keys[*]} > 0 )); then - if ! is_array $v; then - error "$(gettext "%s_%s should be an array")" "$i" "$a" + if declare -p "${i}_${a}" > /dev/null 2>&1; then + if ! is_array ${i}_${a}; then + error "$(gettext "%s should be an array")" "${i}_${a}" ret=1 fi fi @@ -66,8 +63,7 @@ lint_variable() { done for i in ${string[@]}; do - eval "keys=(\"\${!$i[@]}\")" - if (( ${#keys[*]} > 0 )); then + if declare -p "$i" > /dev/null 2>&1; then if is_array $i; then error "$(gettext "%s should not be an array")" "$i" ret=1 -- 2.17.1

2 1

[pacman-dev] [PATCH] makepkg: fix broken check for the fakeroot binary
by Eli Schwartz 04 Jan '19

04 Jan '19

In commit d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 we made use of fakeroot absolutely mandatory, and disabled a lot of the code which checked to see if this now-defunct BUILDENV option was set, before setting up the environment to use fakeroot. Unfortunately, we missed one spot. The check_software routine still checked to see if fakeroot was enabled, but due to the option being removed, thought that it was in fact disabled, and as a result this check would never run. Fix by unconditionally checking for the fakeroot binary. While in theory, users could be using --verifysource or --packagelist or --printsrcinfo without, strictly speaking, needing fakeroot, they are sure to be building the software too, anyway, so this use case is not one we need to support. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8b39ca9a..db71d044 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,11 +1000,9 @@ check_software() { fi # fakeroot - correct package file permissions - if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then - if ! type -p fakeroot >/dev/null; then - error "$(gettext "Cannot find the %s binary.")" "fakeroot" - ret=1 - fi + if ! type -p fakeroot >/dev/null; then + error "$(gettext "Cannot find the %s binary.")" "fakeroot" + ret=1 fi # gpg - package signing -- 2.19.1

3 10

[pacman-dev] [PATCH] check localdb before upgrading package
by Andrew Gregory 04 Dec '18

04 Dec '18

Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#5554 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + .../tests/replace-and-upgrade-package.py | 27 +++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5a3e06b8..e415bb17 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -427,7 +427,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, ASSERT(trans != NULL, return -1); /* see if this is an upgrade. if so, remove the old package first */ - if((oldpkg = newpkg->oldpkg)) { + if(_alpm_db_get_pkgfromcache(db, newpkg->name) && (oldpkg = newpkg->oldpkg)) { int cmp = _alpm_pkg_compare_versions(newpkg, oldpkg); if(cmp < 0) { log_msg = "downgrading"; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index dbdb429e..90885015 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -148,6 +148,7 @@ pacman_tests = [ { 'name': 'tests/remove060.py' }, { 'name': 'tests/remove070.py' }, { 'name': 'tests/remove071.py' }, + { 'name': 'tests/replace-and-upgrade-package.py' }, { 'name': 'tests/replace100.py' }, { 'name': 'tests/replace101.py' }, { 'name': 'tests/replace102.py' }, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index dc0b4ec3..74c8f674 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -144,6 +144,7 @@ TESTS += test/pacman/tests/remove052.py TESTS += test/pacman/tests/remove060.py TESTS += test/pacman/tests/remove070.py TESTS += test/pacman/tests/remove071.py +TESTS += test/pacman/tests/replace-and-upgrade-package.py TESTS += test/pacman/tests/replace100.py TESTS += test/pacman/tests/replace101.py TESTS += test/pacman/tests/replace102.py diff --git a/test/pacman/tests/replace-and-upgrade-package.py b/test/pacman/tests/replace-and-upgrade-package.py new file mode 100644 index 00000000..ef2152a7 --- /dev/null +++ b/test/pacman/tests/replace-and-upgrade-package.py @@ -0,0 +1,27 @@ +self.description = 'Simultaneously replace and upgrade a package' + +# replacement package +sp1 = pmpkg('foo1', '1-2') +sp1.replaces = ['foo=1-1'] +sp1.conflicts = ['foo=1-1'] +self.addpkg2db('sync', sp1) + +# upgrade package +sp2 = pmpkg('foo', '2-1') +self.addpkg2db('sync', sp2) + +# depend on upgraded package to pull it into transaction +sp3 = pmpkg('bar', '1-1') +sp3.depends = [ 'foo=2-1' ] +self.addpkg2db('sync', sp3) + +lp = pmpkg('foo', '1-1') +self.addpkg2db('local', lp) + +self.args = "-Su bar" + +self.addrule('PACMAN_RETCODE=0') +self.addrule('PKG_VERSION=foo1|1-2') +self.addrule('PKG_VERSION=foo|2-1') +self.addrule('PKG_VERSION=bar|1-1') +self.addrule('!PACMAN_OUTPUT=error') -- 2.19.1

3 4

[pacman-dev] [PATCH] libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes
by Eli Schwartz 04 Dec '18

04 Dec '18

Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in index 68c48038..92031d43 100644 --- a/scripts/libmakepkg/executable.sh.in +++ b/scripts/libmakepkg/executable.sh.in @@ -38,7 +38,7 @@ check_software() { local ret=0 for func in ${executable_functions[@]}; do - $func + $func || ret=1 done return $ret diff --git a/scripts/libmakepkg/executable/ccache.sh.in b/scripts/libmakepkg/executable/ccache.sh.in index dafde076..6143fee2 100644 --- a/scripts/libmakepkg/executable/ccache.sh.in +++ b/scripts/libmakepkg/executable/ccache.sh.in @@ -31,7 +31,7 @@ executable_ccache() { if check_buildoption "ccache" "y"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/distcc.sh.in b/scripts/libmakepkg/executable/distcc.sh.in index b9883f6b..d3a8cc25 100644 --- a/scripts/libmakepkg/executable/distcc.sh.in +++ b/scripts/libmakepkg/executable/distcc.sh.in @@ -31,7 +31,7 @@ executable_distcc() { if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/fakeroot.sh.in b/scripts/libmakepkg/executable/fakeroot.sh.in index e22d9a96..56c1b3fd 100644 --- a/scripts/libmakepkg/executable/fakeroot.sh.in +++ b/scripts/libmakepkg/executable/fakeroot.sh.in @@ -31,7 +31,7 @@ executable_fakeroot() { if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then error "$(gettext "Cannot find the %s binary.")" "fakeroot" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/gpg.sh.in b/scripts/libmakepkg/executable/gpg.sh.in index c0f57013..139773ef 100644 --- a/scripts/libmakepkg/executable/gpg.sh.in +++ b/scripts/libmakepkg/executable/gpg.sh.in @@ -28,6 +28,8 @@ source "$LIBRARY/util/option.sh" executable_functions+=('executable_gpg') executable_gpg() { + local ret=0 + if [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; then if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" @@ -41,4 +43,6 @@ executable_gpg() { ret=1 fi fi + + return $ret } diff --git a/scripts/libmakepkg/executable/gzip.sh.in b/scripts/libmakepkg/executable/gzip.sh.in index 66748320..bb1626bc 100644 --- a/scripts/libmakepkg/executable/gzip.sh.in +++ b/scripts/libmakepkg/executable/gzip.sh.in @@ -31,7 +31,7 @@ executable_gzip() { if check_option "zipman" "y"; then if ! type -p gzip >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/pacman.sh.in b/scripts/libmakepkg/executable/pacman.sh.in index d9967f45..d1433ffd 100644 --- a/scripts/libmakepkg/executable/pacman.sh.in +++ b/scripts/libmakepkg/executable/pacman.sh.in @@ -31,7 +31,7 @@ executable_pacman() { if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then if [[ -z $PACMAN_PATH ]]; then error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index a6b81db6..867dc928 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -31,7 +31,7 @@ executable_strip() { if check_option "strip" "y"; then if ! type -p strip >/dev/null; then error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/vcs.sh.in b/scripts/libmakepkg/executable/vcs.sh.in index 527d6f22..46631f39 100644 --- a/scripts/libmakepkg/executable/vcs.sh.in +++ b/scripts/libmakepkg/executable/vcs.sh.in @@ -49,7 +49,7 @@ get_vcsclient() { printf "%s\n" "$client" } -check_vcs_software() { +executable_vcs() { local netfile all_sources all_deps deps ret=0 if (( SOURCEONLY == 1 )); then @@ -101,9 +101,3 @@ check_vcs_software() { return $ret } - -executable_vcs() { - if ! check_vcs_software; then - ret=1 - fi -} -- 2.19.2

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-75-g5fc3056e
by Allan McRae 28 Nov '18

28 Nov '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 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 (commit) via e1b9dc6bea9585701637e0ed14f24cb5b20cf341 (commit) via 71f837e45ea56eb7457759fbb31164f62c10a112 (commit) via 83a16d30416cd853898e3cbb9dd57d700a85ddb4 (commit) via 363664e47dd99e8f9593ecf98d73544617fb72fd (commit) via fbc6d8b42811d6d0507ec9dcc33e729cdcc54029 (commit) via 6e819c819a319b47a35c598200ea4a0cf35b517a (commit) via b95ba13df15217f4cad40fcde8f6b5fe7ff1118a (commit) from 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 (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 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 23:14:31 2018 -0500 scripts: make repo-add utilize a wrapper as well Now that repo-add uses libmakepkg, it needs to have $LIBRARY set before testing it in-tree. [Allan: fix "make distcheck"] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e1b9dc6bea9585701637e0ed14f24cb5b20cf341 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 21:28:21 2018 -0500 autotools: be more accurate in comments when generating processed scripts Instead of assuming all scripts are .sh.in and leaving a comment to that effect, just take the input file directly. This depends on the first dependency for the target being the source of the script. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71f837e45ea56eb7457759fbb31164f62c10a112 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Nov 3 20:46:42 2018 -0400 scripts: fix some inaccurate Makefile targets, and be more templated All of our scripts depend on the same pattern .sh.in, and since commit b5d62d2c91a2caf5c18945921cdf12af6f36b2d4, they also all (not just makepkg itself) depend on libmakepkg. There's no real reason to include separate targets for them just to establish dependency rules. While we are at it, fix a longstanding bug where generated wrapper scripts did not depend on wrapper.sh.in (which due to moving to .lib, requires we regenerate the script too), by making the shared target pattern depend on it. All our generated scripts now require the wrapper, even repo-add which now uses libmakepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 83a16d30416cd853898e3cbb9dd57d700a85ddb4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 22:46:36 2018 -0500 scripts: fix repo-remove/elephant Makefile targets repo-remove and repo-elephant don't care whether repo-add.sh.in is updated... but they do require the repo-add target to be up to date, so use that instead. As a bonus, use the same rule for both of them. commit 363664e47dd99e8f9593ecf98d73544617fb72fd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 4 23:24:39 2018 -0500 meson: be more accurate in comments when generating processed scripts Instead of assuming all scripts are .sh.in and leaving a comment to that effect, just take the input file directly. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fbc6d8b42811d6d0507ec9dcc33e729cdcc54029 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 21 17:36:53 2018 -0400 build-aux: rm annoying and useless file tap-driver.sh is added to the build tree by autoreconf, and contains upstream modifications as such. This results in dirty working trees. It was originally added in commit 403c175dbc84a8198b92bbe76f66eade613cff48 which made the testsuite use automake, but as far as I can tell, never served any purpose. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6e819c819a319b47a35c598200ea4a0cf35b517a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:31 2018 -0800 add missing tests to meson.build Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b95ba13df15217f4cad40fcde8f6b5fe7ff1118a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:32 2018 -0800 common/ini: remove unnecessary alpm include Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: build-aux/edit-script.sh.in | 2 +- build-aux/tap-driver.sh | 652 -------------------------------------------- scripts/Makefile.am | 36 +-- src/common/ini.c | 3 +- test/pacman/meson.build | 2 + 5 files changed, 13 insertions(+), 682 deletions(-) delete mode 100755 build-aux/tap-driver.sh hooks/post-receive -- The official pacman repository

1 0