- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg.conf: add missing sha224 sums
by Michael Straube 01 Jul '18

01 Jul '18

Add missing sha224 sums to makepkg.conf and it's man page. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- doc/makepkg.conf.5.asciidoc | 2 +- etc/makepkg.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 3b596a91..ec543db8 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -183,7 +183,7 @@ Options **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: - `md5`, `sha1`, `sha256`, `sha384`, and `sha512`. + `md5`, `sha1`, `sha224`, `sha256`, `sha384`, and `sha512`. **STRIP_BINARIES=**"--strip-all":: Options to be used when stripping binaries. See linkman:strip[1] diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1cf79664..e2f9b5fd 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -87,7 +87,7 @@ BUILDENV=(!distcc color !ccache check !sign) # OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) -#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="@STRIP_BINARIES@" -- 2.18.0

1 0

[pacman-dev] Regarding pacman's "No database errors have been found!"-message.
by Peter Krauß 25 Jun '18

25 Jun '18

Hello! I suggest to remove pacman's "No database errors have been found!" message and instead have it replaced by an actual error message in case an error has been found. The expected behavior of pacman is that there are no database errors and thus it's less confusing for users to show the message only in cases of something unexpected happening. Any opinions on this? Cheers, Peter

2 1

[pacman-dev] [PATCH] makepkg: reject PKGBUILDs with both split and non-split package functions
by Eli Schwartz 21 Jun '18

21 Jun '18

We accept package_foo() in non-split packages, because it's easier to switch to/from a split package just by removing a pkgname element. But it makes no sense to have both in one PKGBUILD. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/package_function.sh.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in index e52f1325..457b8f67 100644 --- a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in @@ -34,11 +34,18 @@ lint_package_function() { local i ret=0 if (( ${#pkgname[@]} == 1 )); then - if have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then + if have_function 'package' && have_function "package_$pkgname"; then + error "$(gettext "Duplicate %s and %s functions in %s")" "package()" "package_$pkgname()" "$BUILDFILE" + ret=1 + elif have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then error "$(gettext "Missing %s function in %s")" "package()" "$BUILDFILE" ret=1 fi else + if have_function "package"; then + error "$(gettext "Extra %s function for split package '%s'")" "package()" "$pkgbase" + ret=1 + fi for i in "${pkgname[@]}"; do if ! have_function "package_$i"; then error "$(gettext "Missing %s function for split package '%s'")" "package_$i()" "$i" -- 2.17.1

2 2

[pacman-dev] pacman 5.1.1 and the "final" makepkg bug
by Allan McRae 21 Jun '18

21 Jun '18

Hi all, I think we are near the point for a pacman-5.1.1 release. My intention is for it to be basically what on master current + the couple of patches in my patchqueue branch. The final thing that needs addressing is: https://bugs.archlinux.org/task/58776 The gist of this bug is makepkg --printsrcinfo was giving entries like "depends = perl>=". We caught these entries because they could be a genuine mistake. It turns out this also happens when the version used requires some bash that calls a function or variable that is not at a global scope. While this is fairly easily worked around, it breaks all perl PKGBUILDs that use the makepkg-template in Arch Linux, and removes the "anything correct bash is OK" mantra of PKGBUILDs. I see some choices here: 1) back out the change 2) partially back out the change 3) "hide" the change 4) document the change For 2), I could see changing the error to a warning, documenting the change and including it for next release. For 3), we could print a warning, then strip these empty "<=" at the end. Note libprovides and libdepends have dynamcially generated versions that are not in --sourceinfo so this would align with them. We should document that limitation. Opinions? (I'm leaning towards #3) Allan

2 2

[pacman-dev] [PATCH] libmakepkg: remove accidentally added file
by Allan McRae 21 Jun '18

21 Jun '18

A blank file slipped into libmakepkg in commit 2c94118d. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/3 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 scripts/libmakepkg/lint_pkgbuild/3 diff --git a/scripts/libmakepkg/lint_pkgbuild/3 b/scripts/libmakepkg/lint_pkgbuild/3 deleted file mode 100644 index e69de29b..00000000 -- 2.17.1

1 0

[pacman-dev] [PATCH] alpm-hooks.5: include more information on hook files
by Jouke Witteveen 20 Jun '18

20 Jun '18

--- This is a follow-up to my hook sorting patch. The information added is also available in pacman.conf(5), and in pacman(8), but this looks like a good place to repeat it. doc/alpm-hooks.5.asciidoc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/alpm-hooks.5.asciidoc b/doc/alpm-hooks.5.asciidoc index 1d19f96e..cf8d2710 100644 --- a/doc/alpm-hooks.5.asciidoc +++ b/doc/alpm-hooks.5.asciidoc @@ -30,9 +30,14 @@ DESCRIPTION libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more -'[Trigger]' section describing which transactions it should be run for. Hook -file names are required to have the suffix ".hook". Hooks are run in -alphabetical order of their file name. +'[Trigger]' section describing which transactions it should be run for. + +Hooks are read from files located in the system hook directory ++{datarootdir}/libalpm/hooks+, and additional custom directories. Additional +directories are specified linkman:pacman.conf[5]. The default +additional directory is +{sysconfdir}/pacman.d/hooks+. Hook file names are +required to have the suffix ".hook". Hooks are run in alphabetical order of +their file name, where the ordering ignores the suffix. TRIGGERS -------- -- 2.17.1

1 0

[pacman-dev] [PATCH 1/6] libmakepkg/util/option: Refactor checking to reduce code duplication
by Jan Alexander Steffens (heftig) 19 Jun '18

19 Jun '18

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. --- scripts/libmakepkg/util/option.sh.in | 85 +++++++++------------------- 1 file changed, 28 insertions(+), 57 deletions(-) diff --git a/scripts/libmakepkg/util/option.sh.in b/scripts/libmakepkg/util/option.sh.in index 46e0568d..3299df9c 100644 --- a/scripts/libmakepkg/util/option.sh.in +++ b/scripts/libmakepkg/util/option.sh.in @@ -48,95 +48,66 @@ in_opt_array() { } +## +# usage : check_opt_array( $option, $expected_val, $haystack ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found +## +check_opt_array() { + local option=$1 expected=$2; shift 2 + + in_opt_array "$option" "$@" + case $? in + 0) # assert enabled + [[ $expected = y ]] + return ;; + 1) # assert disabled + [[ $expected = n ]] + return ;; + esac + + # not found + return 127 +} + + ## # Checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence. # # usage : check_option( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_option() { - in_opt_array "$1" ${options[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # fall back to makepkg.conf options - in_opt_array "$1" ${OPTIONS[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # not found - return 127 + check_opt_array "$@" "${OPTIONS[@]}" "${options[@]}" } ## # Check if option is present in BUILDENV # # usage : check_buildenv( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_buildenv() { - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = "y" ]] - return ;; - 1) # assert disabled - [[ $2 = "n" ]] - return ;; - esac - - # not found - return 127 + check_opt_array "$@" "${BUILDENV[@]}" } + ## # Checks to see if options are present in BUILDENV or PKGBUILD; # PKGBUILD options always take precedence. # # usage : check_buildoption( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_buildoption() { - in_opt_array "$1" ${options[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # not found - return 127 + check_opt_array "$@" "${BUILDENV[@]}" "${options[@]}" } -- 2.17.1

1 5

[pacman-dev] [PATCH] libmakepkg/tidy: fix debug sources not being properly detected sometimes
by Eli Schwartz 19 Jun '18

19 Jun '18

DW_AT_comp_dir is meant to contain the directory in which the compiler was run DW_AT_name contains the source file the compiler was told to use. In the event that DW_AT_name is an absolute path, it is (obviously) not meant to be computed relative to DW_AT_comp_dir. However, we did not handle this correctly, and as a result tried to copy source files using doubled-up filepaths. The correct approach should be to use DW_AT_name on its own, in the event that it is an absolute path. This fixes debug package generation for many packages that use absolute paths in their build systems... like CMake. Reported-by: Jagannathan Tiruvallur Eachambadi <jagannathante(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 36d1b89e..5937e13c 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -37,7 +37,7 @@ build_id() { source_files() { LANG=C readelf "$1" --debug-dump | \ - awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{print $8 "/" name}' + awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{{if (name !~ /^\//) {printf "%s/", $8}}{print name}}' } strip_file() { -- 2.17.1

1 1

[pacman-dev] [PATCH 01/10] libmakepkg/util/option: Refactor checking to reduce code duplication
by Jan Alexander Steffens (heftig) 19 Jun '18

19 Jun '18

Pull out the expected=y/n check into a separate function and make use of the fact we can just concatenate the fallback arrays to get the same result. --- scripts/libmakepkg/util/option.sh.in | 85 +++++++++------------------- 1 file changed, 28 insertions(+), 57 deletions(-) diff --git a/scripts/libmakepkg/util/option.sh.in b/scripts/libmakepkg/util/option.sh.in index 46e0568d..28357e27 100644 --- a/scripts/libmakepkg/util/option.sh.in +++ b/scripts/libmakepkg/util/option.sh.in @@ -48,95 +48,66 @@ in_opt_array() { } +## +# usage : check_opt_array( $option, $expected_val, $haystack ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found +## +check_opt_array() { + local option=$1 expected=$2; shift 2 + + in_opt_array "$option" "$@" + case $? in + 0) # assert enabled + [[ $expected = y ]] + return ;; + 1) # assert disabled + [[ $expected = n ]] + return ;; + esac + + # not found + return 127 +} + + ## # Checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence. # # usage : check_option( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_option() { - in_opt_array "$1" ${options[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # fall back to makepkg.conf options - in_opt_array "$1" ${OPTIONS[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # not found - return 127 + check_opt_array "$@" "${options[@]}" "${OPTIONS[@]}" } ## # Check if option is present in BUILDENV # # usage : check_buildenv( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_buildenv() { - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = "y" ]] - return ;; - 1) # assert disabled - [[ $2 = "n" ]] - return ;; - esac - - # not found - return 127 + check_opt_array "$@" "${BUILDENV[@]}" } + ## # Checks to see if options are present in BUILDENV or PKGBUILD; # PKGBUILD options always take precedence. # # usage : check_buildoption( $option, $expected_val ) # return : 0 - matches expected # 1 - does not match expected # 127 - not found ## check_buildoption() { - in_opt_array "$1" ${options[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = y ]] - return ;; - 1) # assert disabled - [[ $2 = n ]] - return - esac - - # not found - return 127 + check_opt_array "$@" "${options[@]}" "${BUILDENV[@]}" } -- 2.17.0

4 17

[pacman-dev] [PATCH] libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST
by Michael Straube 19 Jun '18

19 Jun '18

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> --- lib/libalpm/dload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index eeef32f5..7f34c89e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -473,6 +473,13 @@ static int curl_download_internal(struct dload_payload *payload, payload->remote_name, hostname); } goto cleanup; + case CURLE_COULDNT_RESOLVE_HOST: + payload->unlink_on_fail = 1; + handle->pm_errno = ALPM_ERR_SERVER_BAD_URL; + _alpm_log(handle, ALPM_LOG_ERROR, + _("failed retrieving file '%s' from %s : %s\n"), + payload->remote_name, hostname, error_buffer); + goto cleanup; default: /* delete zero length downloads */ if(fstat(fileno(localf), &st) == 0 && st.st_size == 0) { -- 2.17.1

2 1