moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

makepkg: disallow values of 'arch' which might be problematic

Browse Source 
We rely on values in the arch array to be valid as part of variable
names, so extend the arch lint check to catch this.

This also cleans up lint_arch to restrict the use of "lint" only to the
package-specific architecture checks. It previously had an odd
declaration with a conditional expansion that would never be true.
This commit is contained in:
Dave Reisner 2014-08-09 18:08:13 -04:00 committed by Allan McRae
parent 85c055da73
commit 9c066dff43
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/makepkg.sh.in
View File

@ -2359,13 +2359,21 @@ lint_epoch() {
}
lint_arch() {
local name list=("${@:-"${arch[@]}"}")
local a name list
if [[ $list == 'any' ]]; then
if [[ $arch == 'any' ]]; then
return 0
fi
if ! in_array "$CARCH" "${list[@]}" && (( ! IGNOREARCH )); then
for a in "${arch[@]}"; do
if [[ $a = *[![:alnum:]_]* ]]; then
error "$(gettext "%s contains invalid characters: '%s'")" \
'arch' "${a//[[:alnum:]_]}"
ret=1
fi
done
if (( ! IGNOREARCH )) && ! in_array "$CARCH" "${arch[@]}"; then
error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH"
plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT"
plain "$(gettext "such as %s.")" "arch=('$CARCH')"