diff options
Diffstat (limited to 'libre/pacman/makepkg-pkgrel-4.patch')
| -rw-r--r-- | libre/pacman/makepkg-pkgrel-4.patch | 56 |
1 files changed, 25 insertions, 31 deletions
diff --git a/libre/pacman/makepkg-pkgrel-4.patch b/libre/pacman/makepkg-pkgrel-4.patch index 4024b0ad6..aeeb17859 100644 --- a/libre/pacman/makepkg-pkgrel-4.patch +++ b/libre/pacman/makepkg-pkgrel-4.patch @@ -16,20 +16,19 @@ enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly. test/util/vercmptest.sh | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) -diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt -index e78a8e5..986a4f6 100644 ---- a/doc/PKGBUILD.5.txt -+++ b/doc/PKGBUILD.5.txt -@@ -46,7 +46,7 @@ similar to `$_basekernver`. +diff -Nur pacman-4.2.0.orig/doc/PKGBUILD.5.txt pacman-4.2.0/doc/PKGBUILD.5.txt +--- pacman-4.2.0.orig/doc/PKGBUILD.5.txt 2014-10-13 22:44:20.000000000 -0200 ++++ pacman-4.2.0/doc/PKGBUILD.5.txt 2014-12-29 21:54:08.717826697 -0200 +@@ -48,7 +48,7 @@ *pkgver*:: The version of the software as released from the author (e.g., '2.7.1'). - The variable is not allowed to contain colons or hyphens. + The variable is not allowed to contain colons, hyphens or whitespace. + - The `pkgver` variable can be automatically updated by providing a `pkgver()` function - in the PKGBUILD that outputs the new package version. This is run after downloading -@@ -58,7 +58,7 @@ This is most useful when used with sources from version control systems (see bel + The `pkgver` variable can be automatically updated by providing a `pkgver()` + function in the PKGBUILD that outputs the new package version. +@@ -62,7 +62,7 @@ allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The @@ -38,26 +37,24 @@ index e78a8e5..986a4f6 100644 *pkgdesc*:: This should be a brief description of the package and its functionality. -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index 940e947..88b654d 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -2134,8 +2134,8 @@ check_sanity() { - awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | - while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" -- if [[ $i != +([0-9])?(.+([0-9])) ]]; then -- error "$(gettext "%s must be a decimal.")" "pkgrel" -+ if [[ $i = *[[:space:]:-]* ]]; then -+ error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgrel" - return 1 - fi - done || ret=1 -diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh -index 04b841f..7985ddc 100755 ---- a/test/util/vercmptest.sh -+++ b/test/util/vercmptest.sh -@@ -144,6 +144,24 @@ runtest 1:1.0 1.0 1 +diff -Nur pacman-4.2.0.orig/scripts/makepkg.sh.in pacman-4.2.0/scripts/makepkg.sh.in +--- pacman-4.2.0.orig/scripts/makepkg.sh.in 2014-12-29 21:53:44.674296011 -0200 ++++ pacman-4.2.0/scripts/makepkg.sh.in 2014-12-29 22:00:21.607534761 -0200 +@@ -2576,8 +2576,8 @@ + return 1 + fi + +- if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then +- error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" ++ if [[ $pkgrel = *[[:space:]:-]* ]]; then ++ error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgrel" "$pkgrel" + return 1 + fi + } +diff -Nur pacman-4.2.0.orig/test/util/vercmptest.sh pacman-4.2.0/test/util/vercmptest.sh +--- pacman-4.2.0.orig/test/util/vercmptest.sh 2014-01-06 02:40:08.000000000 -0200 ++++ pacman-4.2.0/test/util/vercmptest.sh 2014-12-29 21:54:08.717826697 -0200 +@@ -142,6 +142,24 @@ runtest 1:1.0 1.1 1 runtest 1:1.1 1.1 1 @@ -82,6 +79,3 @@ index 04b841f..7985ddc 100755 #END TESTS if [[ $failure -eq 0 ]]; then --- -2.1.0 - |