diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-04-03 23:48:14 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-04-29 13:49:05 +0200 |
| commit | 91b72cc386ca03241791748da5da2b150c724ace (patch) | |
| tree | acd1519d07a1a3eeb6913ba7bd2606edb00e263f /scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | |
| parent | bcaf1b84ff0f0709d35cd0adb1f13965d1101aeb (diff) | |
| download | pacman-91b72cc386ca03241791748da5da2b150c724ace.tar.gz pacman-91b72cc386ca03241791748da5da2b150c724ace.tar.xz | |
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@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in')
| -rw-r--r-- | scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 10 |
1 files changed, 6 insertions, 4 deletions
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 } |