Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-12-07 17:48:16 +1000
committerDan McGee <dan@archlinux.org>2010-12-12 20:32:13 -0600
commitef977865a143eb682baf0d4f598c0c6924aeaa1a (patch)
treef284c43e13ee0e6e10fc4430fcb263a68d26476b
parentb7015af0fc9325740950223e719f6dec153e264b (diff)
makepkg: perform sanity checks on variables in package functions
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>
-rw-r--r--scripts/makepkg.sh.in19
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 4e321d1f..ac10ad3a 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -27,7 +27,7 @@
# makepkg uses quite a few external programs during its execution. You
# 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 initialization
@@ -1222,21 +1222,27 @@ check_sanity() {
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
error "$(gettext "Provides array cannot contain comparison (< or >) operators.")"
return 1
fi
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
error "$(gettext "Backup entry should not contain leading slash : %s")" "$i"
return 1
fi
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%%:*}
if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then
error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i"
@@ -1257,8 +1263,9 @@ check_sanity() {
done
local valid_options=1
- local known kopt
- for i in ${options[@]}; do
+ local known kopt options_list
+ eval $(awk '/^[[:space:]]*options=/,/)/' "$BUILDFILE" | sed "s/options=/options_list+=/")
+ for i in ${options_list[@]}; do
known=0
# check if option matches a known option or its inverse
for kopt in ${packaging_options[@]} ${other_options[@]}; do