diff options
Diffstat (limited to 'libre/pacman/makepkg-pkgrel-4.patch')
| -rw-r--r-- | libre/pacman/makepkg-pkgrel-4.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/libre/pacman/makepkg-pkgrel-4.patch b/libre/pacman/makepkg-pkgrel-4.patch deleted file mode 100644 index aeeb17859..000000000 --- a/libre/pacman/makepkg-pkgrel-4.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 6357edfc61e293170a4c922fbdcfa260963d7268 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@sbcglobal.net> -Date: Sun, 31 Aug 2014 17:10:32 -0400 -Subject: [PATCH] makepkg: treat pkgrel more similarly to pkgver - -This is perfectly fine with libalpm; it was only makepkg that was more -strict with pkgrel than pkgver. - -Further, the former error message about invalid pkgrel formats claimed that -pkgrel was a "decimal", which would mean that `1.1 == 1.10`. This was not -the case; alpm parsed pkgrel as a version, not a decimal. In that light, -enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly. ---- - doc/PKGBUILD.5.txt | 4 ++-- - scripts/makepkg.sh.in | 4 ++-- - test/util/vercmptest.sh | 18 ++++++++++++++++++ - 3 files changed, 22 insertions(+), 4 deletions(-) - -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. -@@ -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 -- variable is not allowed to contain hyphens. -+ variable is not allowed to contain colons, hyphens or whitespace. - - *pkgdesc*:: - This should be a brief description of the package and its functionality. -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 - -+# complex pkgrel values -+runtest 1-1.5.0 1-1.5.0 0 -+runtest 1-1.5.1 1-1.5.0 1 -+runtest 1-1.5.1 1-1.5 1 -+runtest 1-1.5b 1-1.5 -1 -+runtest 1-1.5b 1-1.5.1 -1 -+runtest 1-1.0a 1-1.0alpha -1 -+runtest 1-1.0alpha 1-1.0b -1 -+runtest 1-1.0b 1-1.0beta -1 -+runtest 1-1.0beta 1-1.0rc -1 -+runtest 1-1.0rc 1-1.0 -1 -+runtest 1-1.5.a 1-1.5 1 -+runtest 1-1.5.b 1-1.5.a 1 -+runtest 1-1.5.1 1-1.5.b 1 -+runtest 1-2 1-2.par1 1 -+runtest 1-2 1-2.par1 1 -+runtest 1-3 1-2.par1 -1 -+ - #END TESTS - - if [[ $failure -eq 0 ]]; then |