libre/pacman: fix check()

2 files changed, 52 insertions, 32 deletions

diff --git a/libre/pacman/makepkg-pkgrel-5.patch b/libre/pacman/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch
index 82da38d3f..7378896ba 100644
--- a/libre/pacman/makepkg-pkgrel-5.patch
+++ b/libre/pacman/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch
@@ -1,25 +1,26 @@
-From 6357edfc61e293170a4c922fbdcfa260963d7268 Mon Sep 17 00:00:00 2001
+From 0c2242fa1569a3516c59e3d84d28a2d8603aa774 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
+Date: Thu, 14 Apr 2016 17:06:07 -0400
+Subject: [PATCH 1/1] 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,
+pkgrel was a "decimal", which would mean that `1.1 == 1.10`.  This is not
+the case; alpm parses 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/libmakepkg/lint_pkgbuild/pkgrel.sh.in   |  4 ++--
- test/util/vercmptest.sh                         | 18 ++++++++++++++++++
- 3 files changed, 22 insertions(+), 4 deletions(-)
+ doc/PKGBUILD.5.txt                            |  4 ++--
+ scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in |  4 ++--
+ test/util/vercmptest.sh                       | 23 ++++++++++++++++++++++-
+ 3 files changed, 26 insertions(+), 5 deletions(-)
 
-diff -Nur pacman-5.0.0.orig/doc/PKGBUILD.5.txt pacman-5.0.0/doc/PKGBUILD.5.txt
---- pacman-5.0.0.orig/doc/PKGBUILD.5.txt	2016-01-28 20:50:49.000000000 -0300
-+++ pacman-5.0.0/doc/PKGBUILD.5.txt	2016-02-01 10:11:47.825919218 -0300
-@@ -48,7 +48,7 @@
+diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
+index e410481..86df1e8 100644
+--- a/doc/PKGBUILD.5.txt
++++ b/doc/PKGBUILD.5.txt
+@@ -48,7 +48,7 @@ similar to `$_basekernver`.
  
  *pkgver*::
  	The version of the software as released from the author (e.g., '2.7.1').
@@ -28,7 +29,7 @@ diff -Nur pacman-5.0.0.orig/doc/PKGBUILD.5.txt pacman-5.0.0/doc/PKGBUILD.5.txt
  +
  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 @@
+@@ -62,7 +62,7 @@ below).
  	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
@@ -37,10 +38,11 @@ diff -Nur pacman-5.0.0.orig/doc/PKGBUILD.5.txt pacman-5.0.0/doc/PKGBUILD.5.txt
  
  *epoch*::
  	Used to force the package to be seen as newer than any previous versions
-diff -Nur pacman-5.0.0.orig/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in pacman-5.0.0/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
---- pacman-5.0.0.orig/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in	2016-01-04 00:27:45.000000000 -0300
-+++ pacman-5.0.0/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in	2016-02-01 10:31:09.102801369 -0300
-@@ -35,8 +35,8 @@
+diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
+index 95cb808..ca618f8 100644
+--- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
++++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
+@@ -35,8 +35,8 @@ lint_pkgrel() {
  		return 1
  	fi
  
@@ -51,10 +53,20 @@ diff -Nur pacman-5.0.0.orig/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in pacman
  		return 1
  	fi
  }
-diff -Nur pacman-5.0.0.orig/test/util/vercmptest.sh pacman-5.0.0/test/util/vercmptest.sh
---- pacman-5.0.0.orig/test/util/vercmptest.sh	2016-01-04 00:27:45.000000000 -0300
-+++ pacman-5.0.0/test/util/vercmptest.sh	2016-02-01 10:36:29.503809606 -0300
-@@ -113,6 +113,24 @@
+diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh
+index 5542f59..4f9b1f3 100755
+--- a/test/util/vercmptest.sh
++++ b/test/util/vercmptest.sh
+@@ -39,7 +39,7 @@ tap_runtest() {
+ 	tap_is_str "$($bin "$ver2" "$ver1")" "$exp" "$ver2 $ver1"
+ }
+ 
+-tap_plan 92
++tap_plan 124
+ 
+ # all similar length, no pkgrel
+ tap_runtest 1.5.0 1.5.0  0
+@@ -113,6 +113,27 @@ tap_runtest 1:1.0    1.0   1
  tap_runtest 1:1.0    1.1   1
  tap_runtest 1:1.1    1.1   1
  
@@ -64,18 +76,24 @@ diff -Nur pacman-5.0.0.orig/test/util/vercmptest.sh pacman-5.0.0/test/util/vercm
 +tap_runtest 1-1.5.1    1-1.5       1
 +tap_runtest 1-1.5b     1-1.5      -1
 +tap_runtest 1-1.5b     1-1.5.1    -1
++# based on "from the manpage"
 +tap_runtest 1-1.0a     1-1.0alpha -1
 +tap_runtest 1-1.0alpha 1-1.0b     -1
 +tap_runtest 1-1.0b     1-1.0beta  -1
 +tap_runtest 1-1.0beta  1-1.0rc    -1
 +tap_runtest 1-1.0rc    1-1.0      -1
++# based on "going crazy? alpha-dotted versions"
 +tap_runtest 1-1.5.a    1-1.5       1
 +tap_runtest 1-1.5.b    1-1.5.a     1
 +tap_runtest 1-1.5.1    1-1.5.b     1
-+tap_runtest 1-2        1-2.par1    1
-+tap_runtest 1-2        1-2.par1    1
-+tap_runtest 1-3        1-2.par1   -1
++# based on Parabola usage
++tap_runtest 1-1        1-2.par1   -1
++tap_runtest 1-2        1-2.par1   -1
++tap_runtest 1-3        1-2.par1    1
 +
  tap_finish
  
  # vim: set noet:
+-- 
+2.8.0
+
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 62ad57314..3922d1a0b 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -37,7 +37,7 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         0001-Sychronize-filesystem.patch
         0002-Revert-close-stdin-before-running-install-scripts.patch
         0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
-        makepkg-pkgrel-5.patch)
+        0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch)
 md5sums=('377a2664d6007d72d6d8a126add83bcf'
          'SKIP'
          'f67cafd2e70b5b1231831f454e4ecb90'
@@ -50,22 +50,24 @@ md5sums=('377a2664d6007d72d6d8a126add83bcf'
          '11869a104d0944cc86215098cf5a32bf'
          'd4692c3add0b0dab87036edad3f59626'
          'fd59d9fb04abadffb937082c288bb10c'
-         'da78f246ac281ed949cf97d48f86d994')
+         '5c01220f49538d37bf1a424af46790d0')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
 prepare() {
   cd "$pkgname-$pkgver"
 
+  # From Arch Linux
   patch -p1 -i $srcdir/0001-libmakepkg-fix-is_array-function.patch
 
+  # From Arch Linux ARM
   if [ "${CARCH}" = "armv7h" ]; then
     patch -p1 -i ../0001-Sychronize-filesystem.patch
     patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch
     patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
   fi
 
-  # treat pkgrel more similarly to pkgver
-  patch -p1 -i "$srcdir/makepkg-pkgrel-5.patch"
+  # From Parabola
+  patch -p1 -i ../0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch
 }
 
 build() {
@@ -109,9 +111,9 @@ build() {
   done
 }
 
-#check() {
-#  make -C "$pkgname-$pkgver" check
-#}
+check() {
+  make -C "$pkgname-$pkgver" check
+}
 
 package() {
   cd "$pkgname-$pkgver"