- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-252-gab7393c5
by Allan McRae 29 Apr '18

29 Apr '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 ab7393c53edb3a399751aa41b5c8693157ae0aa3 (commit) via 91b72cc386ca03241791748da5da2b150c724ace (commit) via bcaf1b84ff0f0709d35cd0adb1f13965d1101aeb (commit) from 27f64e378958204314a17b5c5416bd40f47603ac (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 ab7393c53edb3a399751aa41b5c8693157ae0aa3 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 16 18:12:59 2018 -0400 libalpm.pc: migrate to Requires.private pkg-config has built-in dependency handling, but we currently insert the raw $LIBS into libalpm's own linker flags and fail to handle Cflags at all. For dependencies which support pkg-config, simply use that instead. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91b72cc386ca03241791748da5da2b150c724ace Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Apr 3 17:48:14 2018 -0400 libmakepkg/lint_pkgbuild: lint depends/etc. as if they are pkgname depends, provides, conflicts, replaces, and other variables that are meant to contain package names, are now checked to ensure 1) the name component contains only characters that would equate to a valid pkgname. 2) the version component contains only characters that would equate to a valid pkgver. 3) comparison operator is a valid comparison operator (e.g. provides only allows exact = while optdepends doesn't allow anything) This also refactors pkgname into a shared utility function, wires up pkgbase optdepends and provides to use it, and gives pkgver a touchup to allow referencing where it was called from. Fixes FS#57833 and a bit of extra. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcaf1b84ff0f0709d35cd0adb1f13965d1101aeb Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Mar 19 23:05:21 2018 -0400 libmakepkg/util/pkgbuild.sh: fix missing extglob We use an extended glob here, but were relying on having it globally set in makepkg. This causes it to fail when used in scripts. Since scripts using libmakepkg may not want extglob to be set, save and restore the environment while explicitly setting extglob only where we need it. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +++ lib/libalpm/libalpm.pc.in | 3 +- scripts/Makefile.am | 4 ++ .../{backup.sh.in => checkdepends.sh.in} | 37 ++++++++------- .../{backup.sh.in => conflicts.sh.in} | 37 ++++++++------- .../lint_pkgbuild/{backup.sh.in => depends.sh.in} | 37 ++++++++------- .../{backup.sh.in => makedepends.sh.in} | 37 ++++++++------- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 28 ++---------- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 19 ++------ scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 53 +++++++++++++--------- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 29 +++++------- scripts/libmakepkg/util/pkgbuild.sh.in | 33 ++++++++++++++ 13 files changed, 186 insertions(+), 147 deletions(-) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => checkdepends.sh.in} (52%) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => conflicts.sh.in} (53%) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => depends.sh.in} (54%) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => makedepends.sh.in} (52%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: lint depends/etc. as if they are pkgname
by Eli Schwartz 29 Apr '18

29 Apr '18

depends, provides, conflicts, replaces, and other variables that are meant to contain package names, are now checked to ensure 1) the name component contains only characters that would equate to a valid pkgname. 2) the version component contains only characters that would equate to a valid pkgver. 3) comparison operator is a valid comparison operator (e.g. provides only allows exact = while optdepends doesn't allow anything) This also refactors pkgname into a shared utility function, wires up pkgbase optdepends and provides to use it, and gives pkgver a touchup to allow referencing where it was called from. Fixes FS#57833 and a bit of extra. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 4 ++ .../{pkgbase.sh.in => checkdepends.sh.in} | 42 +++++++++-------- .../{pkgbase.sh.in => conflicts.sh.in} | 42 +++++++++-------- .../lint_pkgbuild/{pkgbase.sh.in => depends.sh.in} | 42 +++++++++-------- .../{pkgbase.sh.in => makedepends.sh.in} | 42 +++++++++-------- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 28 ++---------- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 19 ++------ scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 53 +++++++++++++--------- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 27 ++++------- scripts/libmakepkg/util/pkgbuild.sh.in | 27 +++++++++++ 11 files changed, 178 insertions(+), 158 deletions(-) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => checkdepends.sh.in} (50%) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => conflicts.sh.in} (51%) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => depends.sh.in} (53%) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => makedepends.sh.in} (50%) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7fe169b3..17e54eff 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -69,8 +69,12 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_pkgbuild/arch.sh \ libmakepkg/lint_pkgbuild/backup.sh \ libmakepkg/lint_pkgbuild/changelog.sh \ + libmakepkg/lint_pkgbuild/checkdepends.sh \ + libmakepkg/lint_pkgbuild/conflicts.sh \ + libmakepkg/lint_pkgbuild/depends.sh \ libmakepkg/lint_pkgbuild/epoch.sh \ libmakepkg/lint_pkgbuild/install.sh \ + libmakepkg/lint_pkgbuild/makedepends.sh \ libmakepkg/lint_pkgbuild/optdepends.sh \ libmakepkg/lint_pkgbuild/options.sh \ libmakepkg/lint_pkgbuild/package_function.sh \ diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in similarity index 50% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in index b2f7af04..2f4aae1a 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# checkdepends.sh - Check the 'checkdepends' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_checkdepends') -lint_pkgbase() { - local ret=0 +lint_checkdepends() { + local checkdepends_list checkdepend name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes checkdepends checkdepends_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for checkdepend in "${checkdepends_list[@]}"; do + name=${checkdepend%%@(<|>|=|>=|<=)*} + ver=${checkdepend#*@(<|>|=|>=|<=)} + lint_one_pkgname checkdepends "$name" || ret=1 + check_pkgver "$ver" checkdepends || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in similarity index 51% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in index b2f7af04..19dfefd5 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# conflicts.sh - Check the 'conflicts' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_conflicts') -lint_pkgbase() { - local ret=0 +lint_conflicts() { + local conflicts_list conflict name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes conflicts conflicts_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for conflict in "${conflicts_list[@]}"; do + name=${conflict%%@(<|>|=|>=|<=)*} + ver=${conflict#*@(<|>|=|>=|<=)} + lint_one_pkgname conflicts "$name" || ret=1 + check_pkgver "$ver" conflicts || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in similarity index 53% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/depends.sh.in index b2f7af04..9154dcca 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# depends.sh - Check the 'depends' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_depends') -lint_pkgbase() { - local ret=0 +lint_depends() { + local depends_list depend name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes depends depends_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for depend in "${depends_list[@]}"; do + name=${depend%%@(<|>|=|>=|<=)*} + ver=${depend#*@(<|>|=|>=|<=)} + lint_one_pkgname depends "$name" || ret=1 + check_pkgver "$ver" depends || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in similarity index 50% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in index b2f7af04..b461d673 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# makedepends.sh - Check the 'makedepends' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_makedepends') -lint_pkgbase() { - local ret=0 +lint_makedepends() { + local makedepends_list makedepend name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes makedepends makedepends_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for makedepend in "${makedepends_list[@]}"; do + name=${makedepend%%@(<|>|=|>=|<=)*} + ver=${makedepend#*@(<|>|=|>=|<=)} + lint_one_pkgname makedepends "$name" || ret=1 + check_pkgver "$ver" makedepends || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in index 7758334c..87e561cb 100644 --- a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in @@ -33,31 +33,13 @@ lint_pkgbuild_functions+=('lint_optdepends') lint_optdepends() { local a list name optdepends_list ret=0 - optdepends_list=("${optdepends[@]}") - for a in "${arch[@]}"; do - array_build list "optdepends_$a" - optdepends_list+=("${list[@]}") - done - - for name in "${pkgname[@]}"; do - if extract_function_variable "package_$name" optdepends 1 list; then - optdepends_list+=("${list[@]}") - fi + local optdepends_list optdepend name ret=0 - for a in "${arch[@]}"; do - if extract_function_variable "package_$name" "optdepends_$a" 1 list; then - optdepends_list+=("${list[@]}") - fi - done - done + get_pkgbuild_all_split_attributes optdepends optdepends_list - for name in "${optdepends_list[@]}"; do - local pkg=${name%%:[[:space:]]*} - # the '-' character _must_ be first or last in the character range - if [[ $pkg != +([-[:alnum:]><=.+_:]) ]]; then - error "$(gettext "Invalid syntax for %s: '%s'")" "optdepend" "$name" - ret=1 - fi + for optdepend in "${optdepends_list[@]}"; do + name=${optdepend%%:[[:space:]]*} + lint_one_pkgname optdepends "$name" || ret=1 done return $ret diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in index b2f7af04..b012b226 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in @@ -23,6 +23,7 @@ LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" source "$LIBRARY/util/message.sh" @@ -30,21 +31,9 @@ lint_pkgbuild_functions+=('lint_pkgbase') lint_pkgbase() { - local ret=0 - - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 + if [[ -z $pkgbase ]]; then + return 0 fi - return $ret + lint_one_pkgname "pkgbase" "$pkgbase" } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in index 4024253e..d51c6313 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in @@ -29,34 +29,43 @@ source "$LIBRARY/util/message.sh" lint_pkgbuild_functions+=('lint_pkgname') +lint_one_pkgname() { + local type=$1 name=$2 ret=0 + + + if [[ -z $name ]]; then + error "$(gettext "%s is not allowed to be empty.")" "$type" + ret=1 + continue + fi + if [[ ${name:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "$type" + ret=1 + fi + if [[ ${name:0:1} = "." ]]; then + error "$(gettext "%s is not allowed to start with a dot.")" "$type" + ret=1 + fi + if [[ $name = *[^[:alnum:]+_.@-]* ]]; then + error "$(gettext "%s contains invalid characters: '%s'")" \ + "$type" "${name//[[:alnum:]+_.@-]}" + ret=1 + fi + + return $ret +} + lint_pkgname() { local ret=0 i if [[ -z ${pkgname[@]} ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" - return 1 + ret=1 + else + for i in "${pkgname[@]}"; do + lint_one_pkgname "pkgname" "$i" || ret=1 + done fi - for i in "${pkgname[@]}"; do - if [[ -z $i ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgname" - ret=1 - continue - fi - if [[ ${i:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - ret=1 - fi - if [[ ${i:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgname" - ret=1 - fi - if [[ $i = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgname' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi - done - return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index b9e2e439..c105212b 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -30,13 +30,15 @@ lint_pkgbuild_functions+=('lint_pkgver') check_pkgver() { - if [[ -z $1 ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgver" + local ver=$1 type=$2 + + if [[ -z $ver ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgver${type:+ in $type}" return 1 fi - if [[ $1 = *[[:space:]/:-]* ]]; then - error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver" + if [[ $ver = *[[:space:]/:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver${type:+ in $type}" return 1 fi } diff --git a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in index c2407dc0..e9961c1c 100644 --- a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in @@ -23,6 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_PROVIDES_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" @@ -31,31 +33,20 @@ lint_pkgbuild_functions+=('lint_provides') lint_provides() { - local a list name provides_list ret=0 + local provides_list provide name ver ret=0 - provides_list=("${provides[@]}") - for a in "${arch[@]}"; do - array_build list "provides_$a" - provides_list+=("${list[@]}") - done - - for name in "${pkgname[@]}"; do - if extract_function_variable "package_$name" provides 1 list; then - provides_list+=("${list[@]}") - fi - - for a in "${arch[@]}"; do - if extract_function_variable "package_$name" "provides_$a" 1 list; then - provides_list+=("${list[@]}") - fi - done - done + get_pkgbuild_all_split_attributes provides provides_list for provide in "${provides_list[@]}"; do if [[ $provide == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" ret=1 + continue fi + name=${provide%%=*} + ver=${provide#*=} + lint_one_pkgname provides "$name" || ret=1 + check_pkgver "$ver" provides || ret=1 done return $ret diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index d35c064b..2db46f1f 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -116,6 +116,33 @@ get_pkgbuild_attribute() { fi } +get_pkgbuild_all_split_attributes() { + local attrname=$1 outputvar=$2 all_list list + + if extract_global_variable "$attrname" 1 list; then + all_list+=("${list[@]}") + fi + for a in "${arch[@]}"; do + if extract_global_variable "${attrname}_$a" 1 list; then + all_list+=("${list[@]}") + fi + done + + for name in "${pkgname[@]}"; do + if extract_function_variable "package_$name" "$attrname" 1 list; then + all_list+=("${list[@]}") + fi + + for a in "${arch[@]}"; do + if extract_function_variable "package_$name" "${attrname}_$a" 1 list; then + all_list+=("${list[@]}") + fi + done + done + + [[ ${all_list[@]} ]] && array_build "$outputvar" all_list +} + ## # usage : get_full_version() # return : full version spec, including epoch (if necessary), pkgver, pkgrel -- 2.16.2

2 2

[pacman-dev] [PATCH] libalpm.pc: migrate to Requires.private
by Eli Schwartz 16 Apr '18

16 Apr '18

pkg-config has built-in dependency handling, but we currently insert the raw $LIBS into libalpm's own linker flags and fail to handle Cflags at all. For dependencies which support pkg-config, simply use that instead. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I've been working on getting pacman-static to build, and it is now in the AUR. I happened to notice this in the process. configure.ac | 6 ++++++ lib/libalpm/libalpm.pc.in | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a8c526e3..4d2f7d34 100644 --- a/configure.ac +++ b/configure.ac @@ -223,12 +223,14 @@ PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , have_openssl=no have_nettle=no if test "x$with_crypto" = "xnettle"; then + AC_SUBST(pc_crypto, [nettle]) PKG_CHECK_MODULES(NETTLE, [nettle], [AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no) if test "x$have_nettle" = xno -a "x$with_crypto" = xnettle; then AC_MSG_ERROR([*** nettle support requested but libraries not found]) fi else if test "x$with_crypto" = "xopenssl"; then + AC_SUBST(pc_crypto, [libcrypto]) PKG_CHECK_MODULES(LIBSSL, [libcrypto], [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no) if test "x$have_openssl" = xno; then @@ -251,6 +253,10 @@ if test "x$with_libcurl" != "xno"; then fi fi AM_CONDITIONAL(HAVE_LIBCURL, [test "$have_libcurl" = "yes"]) +# used to generate libalpm.pc +if test "x$have_libcurl" = xyes; then + AC_SUBST(pc_libcurl, [libcurl]) +fi # Check for gpgme AC_MSG_CHECKING(whether to link with libgpgme) diff --git a/lib/libalpm/libalpm.pc.in b/lib/libalpm/libalpm.pc.in index e1d74ef9..6b905747 100644 --- a/lib/libalpm/libalpm.pc.in +++ b/lib/libalpm/libalpm.pc.in @@ -7,6 +7,7 @@ Name: libalpm Description: Arch Linux package management library URL: http://www.archlinux.org/pacman/ Version: @LIB_VERSION@ +Requires.private: libarchive @pc_crypto@ @pc_libcurl@ Cflags: -I${includedir} @LFS_CFLAGS@ Libs: -L${libdir} -lalpm -Libs.private: @LIBS@ @LIBARCHIVE_LIBS@ @LIBSSL_LIBS@ @NETTLE_LIBS@ @LIBCURL_LIBS@ @GPGME_LIBS@ +Libs.private: @LIBS@ @GPGME_LIBS@ -- 2.17.0

1 0

[pacman-dev] [PATCH 1/1] makepkg: Handle dependencies that contain spaces
by morganamilo 22 Mar '18

22 Mar '18

In {,opt,check,make}depends makepkg treats packages that contain whitespace as separate packages. For example: depends=('foo bar') Would be treated as two seperate packages instead of a single package. Packages should not contain whitespace in their name. Pkgbuilds that lists depends like the example above have probably done so in error. Now we correctly error instead of ignoring the improper pkgbuild. Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- scripts/makepkg.sh.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 63b6c3e1..d695c09f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -290,19 +290,19 @@ resolve_deps() { # deplist cannot be declared like this: local deplist=$(foo) # Otherwise, the return value will depend on the assignment. local deplist - deplist=($(check_deps "$@")) || exit $E_INSTALL_DEPS_FAILED + deplist=("$(check_deps "$@")") || exit $E_INSTALL_DEPS_FAILED [[ -z $deplist ]] && return $R_DEPS_SATISFIED 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 "$@")") || exit $E_INSTALL_DEPS_FAILED [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi msg "$(gettext "Missing dependencies:")" local dep - for dep in $deplist; do - msg2 "$dep" + for ((i = 0; i < ${#deplist[@]}; i++)); do + msg2 "${deplist[$i]}" done return $R_DEPS_MISSING @@ -328,7 +328,7 @@ remove_deps() { msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully - if ! run_pacman -Rn ${deplist[@]}; then + if ! run_pacman -Rn "${deplist[@]}"; then warning "$(gettext "Failed to remove installed dependencies.")" return $E_REMOVE_DEPS_FAILED fi @@ -1612,7 +1612,7 @@ else deperr=0 msg "$(gettext "Checking runtime dependencies...")" - resolve_deps ${depends[@]} || deperr=1 + resolve_deps "${depends[@]}" || deperr=1 if (( RMDEPS && INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep -- 2.16.2

4 7

[pacman-dev] [PATCH] libmakepkg/util/pkgbuild.sh: fix missing extglob
by Eli Schwartz 20 Mar '18

20 Mar '18

We use an extended glob here, but were relying on having it globally set in makepkg. This causes it to fail when used in scripts. Since scripts using libmakepkg may not want extglob to be set, save and restore the environment while explicitly setting extglob only where we need it. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/pkgbuild.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 25ad03ce..d35c064b 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -80,6 +80,10 @@ extract_function_variable() { printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2" fi + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + while read -r; do # strip leading whitespace and any usage of declare decl=${REPLY##*([[:space:]])} @@ -89,6 +93,8 @@ extract_function_variable() { r=0 done < <(grep_function "$funcname" "$attr_regex") + eval "$shellopts" + return $r } -- 2.16.2

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-249-g27f64e37
by Allan McRae 18 Mar '18

18 Mar '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 27f64e378958204314a17b5c5416bd40f47603ac (commit) via 9ca88575e60adfb930ae2bf6e05f36cf40fdec21 (commit) via 9e52a36794552b77ecf26f7f34b226d096978f1e (commit) via f054351e528eebf985378f2f4cb0f621ca15023d (commit) via 9c8d7a80932e23baed1fc247b56b4c5725f9eff4 (commit) via c54621d81986e14c7d112350fdf288e74df7a8a8 (commit) via d8717a6a9666ec80c8645d190d6f9c7ab73084ac (commit) via 0565cebfc387be67e0daac73a4d0a312965ca1d3 (commit) via 3e619ccffe585ddf19b1faa053ff46654d2b8a48 (commit) via 1b288bae1f1dfae1e8c6d7c4f592117dff6eab57 (commit) via b6bb8cb7dc884d91a9c7939b994843b02792e674 (commit) via d884a791b9523ebda4e780e9457842565c116ab5 (commit) via a5dd5d41412930000d4e5ca602365639c7ccec86 (commit) via 5c1853124dcaf5d744f90f293801b0ac741674ff (commit) via 55092d0fa79fc4f720bb697c3538a8fe23962f2d (commit) via e4e0add629f054c71f780d48e3934576c1f055d9 (commit) via 03ce7cc4eb8713a38877a1823b310198a63b6f15 (commit) via b3a1f89611736ecffa6e9b775aa90fac02a2a25e (commit) via df0a8f74069b03356900d93f12adba6e090db736 (commit) via c968e625e84c1dfa9a5f49e816a7969b66fd148c (commit) via 0e260f9335546d5834eb3e1d37cd23bc72765162 (commit) via 2dd8b88d5cbb04ccab528cdd7b6b4db04c514748 (commit) via d8591dd3418d55c5736022ef003891fc03b953e0 (commit) via a100cd6bca5b56ef4a8f3ec15ef39efe9d23f1f8 (commit) via 640c2462bb573f6d228234af79f25c519b8ab6d5 (commit) via a278356f75866f89232e3e6230bbf9fb2dc1893c (commit) from a7dbe4635b4af9b5bd927ec0e7a211d1f6c1b0f2 (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 27f64e378958204314a17b5c5416bd40f47603ac Author: Christian Hesse <mail(a)eworm.de> Date: Thu Mar 15 09:08:33 2018 +0100 pacman.conf.5: use consistent presentation for paths Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9ca88575e60adfb930ae2bf6e05f36cf40fdec21 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Mar 14 20:47:05 2018 -0400 makepkg --packagelist: fix listing debug packages with makepkg.conf print_all_package_names used in_opt_array to check whether or not the PKGBUILD itself has options=('debug' 'split') -- while checking to see if it was enabled per split package which doesn't make sense as these options apply globally. This prevented debug packages from being listed if enabled via makepkg.conf rather than per PKGBUILD. Instead, use check_option to determine whether makepkg actually thinks it is meant to try creating a split debug package. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9e52a36794552b77ecf26f7f34b226d096978f1e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Mar 14 23:13:31 2018 -0400 makepkg: use the `declare` builtin when backing up variables to eval Rather than manually crafting foo_backup in a loop and eval'ing them with a complicated escape pattern, store every splitpkg_overrides element into a single variable via the eval-friendly `declare` builtin. An alternative to eval would be using `printf -v` but this does not work for arrays. This has the additional benefit of reducing the number of variables/arrays floating around in the environment. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f054351e528eebf985378f2f4cb0f621ca15023d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Mar 14 22:59:18 2018 -0400 libmakepkg: Add basic rules to lint makepkg.conf variables Currently the only things we check are: - Things that should be arrays, are not strings, and vice versa (this was mostly copy-pasted from the similar code in lint_pkgbuild). - Variables that are meant to contain pathname components cannot contain a newline character, because newline characters in pathnames are weird and also don't play well with future changes intended for the --packagelist option. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9c8d7a80932e23baed1fc247b56b4c5725f9eff4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Mar 14 20:42:11 2018 -0400 libmakepkg/integrity: fix regression that broke --install In commit c6b04c04653ba9933fe978829148312e412a9ea7 package signing was moved out of fakeroot, and as part of this process, the global pkgname variable was modified in order to extract the built package names. However, if a debug package was not available and added to the list of packages, the function was aborted early, before the pkgname array was restored, thereby corrupting the later stages of makepkg and specifically the install_package function which needs to know which pkgnames to install. Fix this by inlining the debug package signing inside the `if` check, and as added security switch to using `for pkg in "${pkgname[@]}"` as is done in many other parts of makepkg, since package signing does not depend on the value of pkgname for anything. Additionally, since debug packages may not actually exist, check if the package file exists first. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c54621d81986e14c7d112350fdf288e74df7a8a8 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 12 12:26:56 2017 -0500 makepkg: avoid false "Signing package(s)" msg when signing is disabled Followup on c6b04c04653ba9933fe978829148312e412a9ea7 which refactored the signing function to run outside of fakeroot, and in the process moved the status message to outside the $SIGNPKG check. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8717a6a9666ec80c8645d190d6f9c7ab73084ac Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 7 23:56:01 2018 -0500 makepkg: refactor checking for write permissions into a utility function Additionally provide a separate error for failure to create the directory vs lack of write permissions on a pre-existing directory. This also means we now consistently try to create any nonexistent *DEST directories as needed before aborting with E_FS_PERMISSIONS. Previously only $BUILDDIR received that kindness. Fixes FS#43537 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0565cebfc387be67e0daac73a4d0a312965ca1d3 Author: Eric Renfro via pacman-dev <pacman-dev(a)archlinux.org> Date: Tue Feb 27 08:27:49 2018 -0500 Added gpg-agent.conf to disable the gnupg scdaemon This fixes an issue where smartcards, such a Yubikey, would cause the keyring to fail locally signing, thus also failing to verify signed packages. Signed-off-by: Eric Renfro <psi-jack(a)linux-help.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3e619ccffe585ddf19b1faa053ff46654d2b8a48 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 14 15:08:36 2018 +1000 make_aligned_titles: initialise wbuf This prevents a valgrind warning from deep inside wcstombs. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1b288bae1f1dfae1e8c6d7c4f592117dff6eab57 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Tue Feb 20 21:52:11 2018 +0100 PKGBUILD.5: Mention valid characters for arch Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b6bb8cb7dc884d91a9c7939b994843b02792e674 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 14 13:31:31 2018 +1000 Update coyrights for 2018 make update-copyright OLD=2017 NEW=201 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d884a791b9523ebda4e780e9457842565c116ab5 Author: Stefan Klinger <git(a)stefan-klinger.de> Date: Sun Feb 25 18:36:05 2018 +0100 hooks: Complain if hook parameters are overwritten. Fixed 2 space leaks. Signed-off-by: Stefan Klinger <git(a)stefan-klinger.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a5dd5d41412930000d4e5ca602365639c7ccec86 Author: Felix Glaser <neindochoh.kraut(a)mailbox.org> Date: Mon Feb 26 00:10:51 2018 +0100 makepkg: set umask 0022 again after syncing deps makepkg configures the umask 0022 as a sane default for building packages. After installing dependencies, it sources `/etc/profile` again. If the user configured a umask other than Arch's default of 0022 (or 022) in `/etc/profile`, this sane default is now gone and needs to be set again. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c1853124dcaf5d744f90f293801b0ac741674ff Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Tue Feb 20 21:52:13 2018 +0100 Fix linting of whitespace in pkgver In order to detect if pkgver contains whitespace, we need to quote it. Previously, only the characters up to the first whitespace was checked. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 55092d0fa79fc4f720bb697c3538a8fe23962f2d Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Tue Feb 20 21:52:12 2018 +0100 PKGBUILD.5: Mention that pkgver can't contain whitespace Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e4e0add629f054c71f780d48e3934576c1f055d9 Author: Yen Chi Hsuan <yan12125(a)gmail.com> Date: Sun Feb 11 01:27:52 2018 +0800 makepkg: use localized date strings Before this change, LC_TIME=zh_TW.UTF-8 makepkg has the following line: ==> Making package: foobar 1-1 (日 2月 11 01:13:42 CST 2018) With this patch, this line becomes: ==> Making package: foobar 1-1 (西元2018年02月11日 (週日) 01時13分57秒) The latter is more natural for a Chinese native speaker. Signed-off-by: Chih-Hsuan Yen <yan12125(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03ce7cc4eb8713a38877a1823b310198a63b6f15 Author: Huáng Jùnliàng <i(a)jhuang.me> Date: Thu Feb 8 15:25:29 2018 +0800 autoconf: bump AC_PREREQ to 2.64 The acinclude.m4 uses AS_VAR_APPEND macro. This marco is introduced in 2.64[1], hence we bump AC_PREREQ to 2.64 to avoid undefined marco on 2.63 autoconf. [1] https://lists.gnu.org/archive/html/autoconf/2009-07/msg00079.html Signed-off-by: Huáng Jùnliàng <i(a)jhuang.me> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b3a1f89611736ecffa6e9b775aa90fac02a2a25e Author: Huáng Jùnliàng <i(a)jhuang.me> Date: Fri Feb 9 10:11:58 2018 +0800 configure: bump libarchive requirements bump libarchive requirement to >= 3.0.0 as we use `archive_write_free` available from 3.0.0 Signed-off-by: Huáng Jùnliàng <i(a)jhuang.me> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit df0a8f74069b03356900d93f12adba6e090db736 Author: Ivy Foster <iff(a)escondida.tk> Date: Sat Feb 10 22:23:27 2018 -0600 doc/.gitignore: ignore all manpages They're all generated during make. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c968e625e84c1dfa9a5f49e816a7969b66fd148c Author: Ivy Foster <iff(a)escondida.tk> Date: Fri Feb 16 19:10:57 2018 -0600 pacman-conf.c: exit if cannot set rootdir or parse config file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e260f9335546d5834eb3e1d37cd23bc72765162 Author: Ivy Foster <iff(a)escondida.tk> Date: Thu Feb 15 16:20:40 2018 -0600 pacman-conf.c: exit if cannot create config data structure Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2dd8b88d5cbb04ccab528cdd7b6b4db04c514748 Author: Ivy Foster <iff(a)escondida.tk> Date: Thu Feb 15 16:20:39 2018 -0600 pacman-conf.c: add short options Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8591dd3418d55c5736022ef003891fc03b953e0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 7 23:43:40 2018 -0500 makepkg --packagelist: just list the built package files we will build Currently this seems to be only theoretically useful. The most likely reason for wanting a packagelist is in order to script makepkg and derive the filenames for the packages we want to install or repo-add, but in the current implementation this requires a lot of additional post-processing which must be duplicated in every utility to wrap makepkg. - It is of minimal use to know what packages might get created on some other device utilizing a different CPU/OS architecture, so don't list them. - It is non-trivial to reimplement makepkg's logic for sourcing any of several makepkg.conf configuration files, then applying environment overrides in order to get the PKGDEST and PKGEXT, so include them directly in the returned filenames. - Output is delimited by newlines, for readability. For maximum parsing reliability, libmakepkg needs to learn how to lint the PKGDEST and PKGEXT variables to ensure they do not contain newlines, which will be submitted in a separate patch. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a100cd6bca5b56ef4a8f3ec15ef39efe9d23f1f8 Author: Ivy Foster <iff(a)escondida.tk> Date: Thu Jan 25 14:56:39 2018 -0600 src/pacman/query.c: do not exit -Qo with error if file does not exist Query operations act on the local db, not the filesystem. Also, a valid use case for -Qo is to discover what package owns a deleted file so it can be reinstalled. Closes FS#55856. Signed-off-by: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 640c2462bb573f6d228234af79f25c519b8ab6d5 Author: Ivy Foster <iff(a)escondida.tk> Date: Thu Jan 25 14:56:38 2018 -0600 pacman/query.c: in query_fileowner, make is_dir an int S_ISDIR is int and "returns non-zero" if the file is a directory. Signed-off-by: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a278356f75866f89232e3e6230bbf9fb2dc1893c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 19 21:47:26 2018 +1000 Deprecate --root in favour of --sysroot The --root option was widely misunderstood, and is now replaced by --sysroot. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +- doc/.gitignore | 14 +---- doc/PKGBUILD.5.txt | 6 +- doc/index.txt | 2 +- doc/makepkg.8.txt | 4 +- doc/pacman.8.txt | 10 ---- doc/pacman.conf.5.txt | 14 ++--- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/hook.c | 18 +++++- lib/libalpm/hook.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 4 ++ scripts/libmakepkg/integrity.sh.in | 2 +- .../libmakepkg/integrity/generate_checksum.sh.in | 2 +- .../libmakepkg/integrity/generate_signature.sh.in | 31 +++++----- scripts/libmakepkg/integrity/verify_checksum.sh.in | 2 +- .../libmakepkg/integrity/verify_signature.sh.in | 2 +- .../{lint_pkgbuild.sh.in => lint_config.sh.in} | 24 ++++---- .../pkglist.sh.in => lint_config/paths.sh.in} | 22 +++---- scripts/libmakepkg/lint_config/variable.sh.in | 64 ++++++++++++++++++++ scripts/libmakepkg/lint_package.sh.in | 2 +- .../libmakepkg/lint_package/build_references.sh.in | 2 +- scripts/libmakepkg/lint_package/dotfiles.sh.in | 2 +- scripts/libmakepkg/lint_package/file_names.sh.in | 2 +- .../libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/install.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/options.sh.in | 2 +- .../lint_pkgbuild/package_function.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 4 +- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/source.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/source/bzr.sh.in | 2 +- scripts/libmakepkg/source/file.sh.in | 2 +- scripts/libmakepkg/source/git.sh.in | 2 +- scripts/libmakepkg/source/hg.sh.in | 2 +- scripts/libmakepkg/source/local.sh.in | 2 +- scripts/libmakepkg/source/svn.sh.in | 2 +- scripts/libmakepkg/srcinfo.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- scripts/libmakepkg/util/compress.sh.in | 2 +- scripts/libmakepkg/util/error.sh.in | 2 +- scripts/libmakepkg/util/message.sh.in | 2 +- scripts/libmakepkg/util/option.sh.in | 2 +- scripts/libmakepkg/util/parseopts.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 15 ++--- scripts/libmakepkg/util/source.sh.in | 2 +- scripts/libmakepkg/util/util.sh.in | 19 +++++- scripts/makepkg-template.pl.in | 4 +- scripts/makepkg.sh.in | 69 +++++++++------------- scripts/pacman-db-upgrade.sh.in | 4 +- scripts/pacman-key.sh.in | 10 +++- scripts/repo-add.sh.in | 4 +- scripts/wrapper.sh.in | 2 +- src/common/ini.c | 2 +- src/common/ini.h | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/files.c | 2 +- src/pacman/package.c | 4 +- src/pacman/package.h | 2 +- src/pacman/pacman-conf.c | 29 +++++---- src/pacman/pacman.c | 7 ++- src/pacman/pacman.h | 2 +- src/pacman/query.c | 27 ++++----- src/pacman/remove.c | 2 +- src/pacman/sighandler.c | 2 +- src/pacman/sighandler.h | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/testpkg.c | 2 +- src/util/vercmp.c | 2 +- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tap.py | 2 +- test/pacman/tests/TESTS | 4 ++ ...ith-arguments.py => hook-description-reused.py} | 9 +-- ...nstall-trigger-match.py => hook-exec-reused.py} | 9 ++- ...-exec-with-arguments.py => hook-type-reused.py} | 10 ++-- ...-exec-with-arguments.py => hook-when-reused.py} | 8 +-- test/pacman/util.py | 2 +- test/util/vercmptest.sh | 2 +- 166 files changed, 403 insertions(+), 324 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild.sh.in => lint_config.sh.in} (61%) mode change 100644 => 100755 copy scripts/libmakepkg/{lint_pkgbuild/pkglist.sh.in => lint_config/paths.sh.in} (59%) create mode 100644 scripts/libmakepkg/lint_config/variable.sh.in copy test/pacman/tests/{hook-exec-with-arguments.py => hook-description-reused.py} (56%) copy test/pacman/tests/{hook-pkg-postinstall-trigger-match.py => hook-exec-reused.py} (55%) copy test/pacman/tests/{hook-exec-with-arguments.py => hook-type-reused.py} (55%) copy test/pacman/tests/{hook-exec-with-arguments.py => hook-when-reused.py} (61%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] alpm-hooks: OVERRIDING HOOKS
by Sean Enck 18 Mar '18

18 Mar '18

If you read the "man alpm-hooks" it alludes to a priority-based directory overriding behavior. But the directory/priority queue for when hooks are loaded isn't stated [0] Some quick searching indicates: "/etc/pacman.d/hooks" [1] is (at least one example) place that will override "/usr/share/libalpm/hooks". The directories/priorities should be enumerated in the docs. Even if this is enumerated in another doc page somewhere, since the behavior really _matters_ in alpm-hooks it should probably be at least re-enumerated here if not become the source-of-record for this information. --Sean [0] https://www.archlinux.org/pacman/alpm-hooks.5.html [1] https://wiki.archlinux.org/index.php/User:Allan/Pacman_Hooks

3 4

[pacman-dev] [PATCH 1/1] pacman.conf.5: use unified presentation for paths
by Christian Hesse 15 Mar '18

15 Mar '18

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- doc/pacman.conf.5.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index f92ee207..3d7aace7 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -89,7 +89,7 @@ Options *NOTE*: this is an absolute path, the root path is not automatically prepended. -*LogFile =* /path/to/file:: +*LogFile =* path/to/file:: Overrides the default location of the pacman log file. The default is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory is not prepended. @@ -108,7 +108,7 @@ Options group when performing a '\--sysupgrade'. Shell-style glob patterns are allowed. -*Include =* path:: +*Include =* path/to/file:: Include another configuration file. This file can include repositories or general configuration options. Wildcards in the specified paths will get expanded based on linkman:glob[7] rules. @@ -121,7 +121,7 @@ Options architecture 'any' can always be installed, as they are meant to be architecture independent. -*XferCommand =* /path/to/command %u:: +*XferCommand =* path/to/command %u:: If set, an external program will be used to download all remote files. All instances of `%u` will be replaced with the download URL. If present, instances of `%o` will be replaced with the local filename, plus a @@ -241,7 +241,7 @@ listed first will take precedence over those listed later in the file when packages in two repositories have identical names, regardless of version number. -*Include =* path:: +*Include =* path/to/file:: Include another config file. This file can include repositories or general configuration options. Wildcards in the specified paths will get expanded based on linkman:glob[7] rules.

2 3

[pacman-dev] [PATCH] makepkg: use the `declare` builtin when backing up variables to eval
by Eli Schwartz 15 Mar '18

15 Mar '18

Rather than manually crafting foo_backup in a loop and eval'ing them with a complicated escape pattern, store every splitpkg_overrides element into a single variable via the eval-friendly `declare` builtin. An alternative to eval would be using `printf -v` but this does not work for arrays. This has the additional benefit of reducing the number of variables/arrays floating around in the environment. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f0703d41..d6cb00da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1111,34 +1111,22 @@ check_build_status() { backup_package_variables() { local var for var in ${splitpkg_overrides[@]}; do - local indirect="${var}_backup" - eval "${indirect}=(\"\${$var[@]}\")" - done -} - -restore_package_variables() { - local var - for var in ${splitpkg_overrides[@]}; do - local indirect="${var}_backup" - if [[ -n ${!indirect} ]]; then - eval "${var}=(\"\${$indirect[@]}\")" - else - unset ${var} - fi + declare -p $var || printf '%s\n' "unset $var" done } run_split_packaging() { local pkgname_backup=("${pkgname[@]}") + local restore_package_variables for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" - backup_package_variables + restore_package_variables="$(backup_package_variables)" run_package $pkgname tidy_install lint_package || exit $E_PACKAGE_FAILED create_package - restore_package_variables + eval "$restore_package_variables" done pkgname=("${pkgname_backup[@]}") create_debug_package -- 2.16.2

2 2

[pacman-dev] [PATCH] libmakepkg: Add basic rules to lint makepkg.conf variables
by Eli Schwartz 15 Mar '18

15 Mar '18

Currently the only things we check are: - Things that should be arrays, are not strings, and vice versa (this was mostly copy-pasted from the similar code in lint_pkgbuild). - Variables that are meant to contain pathname components cannot contain a newline character, because newline characters in pathnames are weird and also don't play well with future changes intended for the --packagelist option. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 4 ++ scripts/libmakepkg/lint_config.sh.in | 48 ++++++++++++++++++++ scripts/libmakepkg/lint_config/paths.sh.in | 47 ++++++++++++++++++++ scripts/libmakepkg/lint_config/variable.sh.in | 64 +++++++++++++++++++++++++++ scripts/makepkg.sh.in | 4 ++ 5 files changed, 167 insertions(+) create mode 100755 scripts/libmakepkg/lint_config.sh.in create mode 100644 scripts/libmakepkg/lint_config/paths.sh.in create mode 100644 scripts/libmakepkg/lint_config/variable.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8cf79f21..90593984 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -44,6 +44,7 @@ libmakepkgdir = $(datarootdir)/makepkg LIBMAKEPKGDIRS = \ integrity \ + lint_config \ lint_package \ lint_pkgbuild \ source \ @@ -56,6 +57,9 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/generate_signature.sh \ libmakepkg/integrity/verify_checksum.sh \ libmakepkg/integrity/verify_signature.sh \ + libmakepkg/lint_config.sh \ + libmakepkg/lint_config/paths.sh \ + libmakepkg/lint_config/variables.sh \ libmakepkg/lint_package.sh \ libmakepkg/lint_package/build_references.sh \ libmakepkg/lint_package/dotfiles.sh \ diff --git a/scripts/libmakepkg/lint_config.sh.in b/scripts/libmakepkg/lint_config.sh.in new file mode 100755 index 00000000..b383a910 --- /dev/null +++ b/scripts/libmakepkg/lint_config.sh.in @@ -0,0 +1,48 @@ +#!/usr/bin/bash +# +# lint_config.sh - functions for checking for makepkg.conf errors +# +# Copyright (c) 2018 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_SH" ]] && return +LIBMAKEPKG_LINT_CONFIG_SH=1 + +LIBRARY=${LIBRARY:-'/usr/share/makepkg'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/util.sh" + + +declare -a lint_config_functions + +for lib in "$LIBRARY/lint_config/"*.sh; do + source "$lib" +done + +readonly -a lint_config_functions + + +lint_package() { + cd_safe "$pkgdir" + msg "$(gettext "Checking for makepkg.conf issues...")" + + local ret=0 + for func in ${lint_config_functions[@]}; do + $func || ret=1 + done + return $ret +} diff --git a/scripts/libmakepkg/lint_config/paths.sh.in b/scripts/libmakepkg/lint_config/paths.sh.in new file mode 100644 index 00000000..36b090b4 --- /dev/null +++ b/scripts/libmakepkg/lint_config/paths.sh.in @@ -0,0 +1,47 @@ +#!/bin/bash +# +# paths.sh - Check that pathname components do not contain odd characters +# +# Copyright (c) 2018 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_PATHS_SH" ]] && return +LIBMAKEPKG_LINT_CONFIG_PATHS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" + +lint_config_functions+=('lint_variable') + + +lint_paths() { + local pathvars=(BUILDDIR PKGDEST SRCDEST SRCPKGDEST LOGDEST PKGEXT SRCEXT) + + local ret=0 + + # global variables + for i in ${pathvars[@]}; do + if [[ ${!i} = *$'\n'* ]]; then + error "$(gettext "%s contains invalid characters: '%s'")" \ + "$i" "${!i//[^$'\n']}" + ret=1 + fi + done + + return $ret +} diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in new file mode 100644 index 00000000..14bd0e05 --- /dev/null +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -0,0 +1,64 @@ +#!/bin/bash +# +# variable.sh - Check that variables are or are not arrays as appropriate +# +# Copyright (c) 2018 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_VARIABLE_SH" ]] && return +LIBMAKEPKG_LINT_CONFIG_VARIABLE_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_config_functions+=('lint_variable') + + +lint_variable() { + local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS + DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ + COMPRESSLRZ COMPRESSLZO COMPRESSZ) + local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS LDFLAGS DEBUG_CFLAGS + DEBUG_CXXFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES STRIP_SHARED + STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER GPGKEY + PKGEXT SRCEXT) + + local i keys ret=0 + + # global variables + for i in ${array[@]}; do + eval "keys=(\"\${!$i[@]}\")" + if (( ${#keys[*]} > 0 )); then + if ! is_array $i; then + error "$(gettext "%s should be an array")" "$i" + ret=1 + fi + fi + done + + for i in ${string[@]}; do + eval "keys=(\"\${!$i[@]}\")" + if (( ${#keys[*]} > 0 )); then + if is_array $i; then + error "$(gettext "%s should not be an array")" "$i" + ret=1 + fi + fi + done + + return $ret +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a22bcce2..f0703d41 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1361,6 +1361,10 @@ else fi +# check makepkg.conf for some basic requirements +lint_config || exit $E_CONFIG_ERROR + + # check that all settings directories are user-writable if ! ensure_writable_dir "BUILDDIR" "$BUILDDIR"; then plain "$(gettext "Aborting...")" -- 2.16.1

2 6