bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: perform sanity checks on variables in package functions

Browse source 
Check the over-ridden entries for provides, backup, optdepends and
options for illegal entries.  Partially fixes FS#16004.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2010-12-07 17:48:16 +10:00 • committed by Dan McGee
parent b7015af0fc
commit ef977865a1
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/makepkg.sh.in
View file

@ -27,7 +27,7 @@
# makepkg uses quite a few external programs during its execution. You # makepkg uses quite a few external programs during its execution. You
# need to have at least the following installed for makepkg to function: # need to have at least the following installed for makepkg to function:
# bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), # awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils),
# gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext, grep, gzip, openssl, sed, tput (ncurses), xz
# gettext initialization # gettext initialization
@ -1222,21 +1222,27 @@ check_sanity() {
fi fi
fi fi
for i in ${provides[@]}; do local provides_list
eval $(awk '/^[[:space:]]*provides=/,/)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/")
for i in ${provides_list[@]}; do
if [[ $i != ${i//</} || $i != ${i//>/} ]]; then if [[ $i != ${i//</} || $i != ${i//>/} ]]; then
error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" error "$(gettext "Provides array cannot contain comparison (< or >) operators.")"
return 1 return 1
fi fi
done done
for i in "${backup[@]}"; do local backup_list
eval $(awk '/^[[:space:]]*backup=/,/)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/")
for i in "${backup_list[@]}"; do
if [[ ${i:0:1} = "/" ]]; then if [[ ${i:0:1} = "/" ]]; then
error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" error "$(gettext "Backup entry should not contain leading slash : %s")" "$i"
return 1 return 1
fi fi
done done
for i in "${optdepends[@]}"; do local optdepends_list
eval $(awk '/^[[:space:]]*optdepends=/,/)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/")
for i in "${optdepends_list[@]}"; do
local pkg=${i%%:*} local pkg=${i%%:*}
if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then
error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i"
@ -1257,8 +1263,9 @@ check_sanity() {
done done
local valid_options=1 local valid_options=1
local known kopt local known kopt options_list
for i in ${options[@]}; do eval $(awk '/^[[:space:]]*options=/,/)/' "$BUILDFILE" | sed "s/options=/options_list+=/")
for i in ${options_list[@]}; do
known=0 known=0
# check if option matches a known option or its inverse # check if option matches a known option or its inverse
for kopt in ${packaging_options[@]} ${other_options[@]}; do for kopt in ${packaging_options[@]} ${other_options[@]}; do