libre/pacman: Fix the patches

5 files changed, 38 insertions, 19 deletions

diff --git a/libre/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch b/libre/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch
index 641984e94..4afdca595 100644
--- a/libre/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch
+++ b/libre/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch
@@ -1,4 +1,4 @@
-From d45e7d7e660704fac084badc1835aff037995b65 Mon Sep 17 00:00:00 2001
+From 0b1dacfbd6ed3e8b8af290a108cbcd90e2fbea5c Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Mon, 6 Aug 2018 23:42:48 -0400
 Subject: [PATCH 1/4] makepkg: Better error messages for versions in
@@ -29,18 +29,31 @@ good error messages when rejecting if it's because of the epoch or rel.
 3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and
    provides linters.
 ---
+ scripts/Makefile.am                           |  1 +
  .../lint_pkgbuild/checkdepends.sh.in          | 10 ++--
  .../libmakepkg/lint_pkgbuild/conflicts.sh.in  | 10 ++--
- .../libmakepkg/lint_pkgbuild/depends.sh.in    | 14 +++---
+ .../libmakepkg/lint_pkgbuild/depends.sh.in    | 14 ++---
  scripts/libmakepkg/lint_pkgbuild/epoch.sh.in  | 10 +++-
- .../libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 48 +++++++++++++++++++
+ .../libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 54 +++++++++++++++++++
  .../lint_pkgbuild/makedepends.sh.in           | 10 ++--
  .../libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++--
- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 20 ++++++--
+ scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 20 +++++--
  .../libmakepkg/lint_pkgbuild/provides.sh.in   | 10 ++--
- 9 files changed, 99 insertions(+), 43 deletions(-)
+ 10 files changed, 106 insertions(+), 43 deletions(-)
  create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in
 
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index f759e149..7cf8bed0 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -73,6 +73,7 @@ LIBMAKEPKG_IN = \
+ 	libmakepkg/lint_pkgbuild/conflicts.sh \
+ 	libmakepkg/lint_pkgbuild/depends.sh \
+ 	libmakepkg/lint_pkgbuild/epoch.sh \
++	libmakepkg/lint_pkgbuild/fullpkgver.sh \
+ 	libmakepkg/lint_pkgbuild/install.sh \
+ 	libmakepkg/lint_pkgbuild/makedepends.sh \
+ 	libmakepkg/lint_pkgbuild/optdepends.sh \
 diff --git a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in
 index d5648bd4..0a9ddf67 100644
 --- a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in
@@ -159,10 +172,10 @@ index 93bd05c1..c98f91b0 100644
 +}
 diff --git a/scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in
 new file mode 100644
-index 00000000..761b3dac
+index 00000000..1cac7fbc
 --- /dev/null
 +++ b/scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,54 @@
 +#!/bin/bash
 +#
 +#   fullpkgver.sh - Check whether a full version conforms to requirements.
@@ -183,8 +196,8 @@ index 00000000..761b3dac
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +#
 +
-+[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGVER_SH" ]] && return
-+LIBMAKEPKG_LINT_PKGBUILD_PKGVER_SH=1
++[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH" ]] && return
++LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH=1
 +
 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 +
@@ -197,12 +210,18 @@ index 00000000..761b3dac
 +	local fullver=$1 type=$2
 +	local ret=0
 +
++	# If there are multiple colons or multiple hyphens, there's a
++	# question of how we split it--it's invalid either way, but it
++	# will affect error messages.  Let's mimic version.c:parseEVR().
++
 +	if [[ $fullver = *:* ]]; then
-+		check_epoch "${fullver%:*}" "$type" || ret=1
-+		fullver=${fullver##*:}
++		# split at the *first* colon
++		check_epoch "${fullver%%:*}" "$type" || ret=1
++		fullver=${fullver#*:}
 +	fi
 +
 +	if [[ $fullver = *-* ]]; then
++		# split at the *last* hyphen
 +		check_pkgrel "${fullver##*-}" "$type" || ret=1
 +		fullver=${fullver%-*}
 +	fi
diff --git a/libre/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch b/libre/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
index 7b70fbe50..e005e1b4e 100644
--- a/libre/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
+++ b/libre/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
@@ -1,4 +1,4 @@
-From fbedcad0073c9c55084c1b619125a29a998c5fe2 Mon Sep 17 00:00:00 2001
+From 38a179d91b79efb44b33c5b5b64d2ee4202921b5 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Mon, 6 Aug 2018 23:50:39 -0400
 Subject: [PATCH 2/4] makepkg: check_pkgrel: Don't say "decimal" in the error
diff --git a/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch b/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
index 7704ce730..987473f85 100644
--- a/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
+++ b/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
@@ -1,4 +1,4 @@
-From 0a5f9c19a3c9c64f6ffacb860d4c7ae2727d6078 Mon Sep 17 00:00:00 2001
+From fb1606f4bba3386fd8d1cc710423c6e629060b86 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Mon, 6 Aug 2018 23:51:47 -0400
 Subject: [PATCH 3/4] makepkg: check_pkgver: Report what the bad pkgver is
diff --git a/libre/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch b/libre/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
index b66e6f88d..ab0877950 100644
--- a/libre/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
+++ b/libre/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
@@ -1,4 +1,4 @@
-From 25f307b670a10cd05a4584611b79b9d02de47c27 Mon Sep 17 00:00:00 2001
+From e72212e314f98a0cf9a082dfa1293baa019fbc90 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Thu, 14 Apr 2016 17:06:07 -0400
 Subject: [PATCH 4/4] makepkg: Treat pkgrel more similarly to pkgver
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 9f6f1e699..5397abe7e 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=pacman
 pkgver=5.1.1
 pkgrel=1
-pkgrel+=.parabola2
+pkgrel+=.parabola3
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -53,10 +53,10 @@ sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
             'ecef1e98eaaf207f4f2c3d07cfe13533866e1e774240eb833e8b3bd691ada95f'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
-            '4ada85b022f3fa7a39a0b67dce145d1da356665aa1d703005a698029e83e0515'
-            '7188edbc27382e1c1d29b0c3c7e1711ba407423447f4e135e451cf611aa4cea4'
-            '45c071c6005c590612f619419acd3685cc12cee2a46b9773b80cdb7aa5c6d1e2'
-            '5205b3b1d8872bbb421d8fe7518d0316d9c827ef2e2b24cb11440b5ba38d79a6')
+            '075ac1f8d782ac9868f5e7f3043f684a00da33915eba9ec7e4a8940992ddc269'
+            '8065c468706be669bc6718a6634e5e58507cba9b8121bf5cfe1703daacab1c3e'
+            'd01100d19b9868da8c689a7a14b6340574ecca0105a8d8ef866b281ad3d7e637'
+            'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033')
 sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc'
                    '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9'
                    '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb')