pacman-5.2.1-6.parabola1: rebuild

3 files changed, 53 insertions, 5 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 63a055e99..752de4b32 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -9,8 +9,8 @@
 
 pkgname=pacman
 pkgver=5.2.1
-pkgrel=4
-pkgrel+=.parabola3
+pkgrel=6
+pkgrel+=.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -33,8 +33,9 @@ options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-        pacman-5.2.1-fix-pactest-package-tar-format.patch::https://git.archlinux.org/pacman.git/patch/?id=b9faf652735c603d1bdf849a570185eb721f11c1
+        pacman-5.2.1-fix-pactest-package-tar-format.patch
         makepkg-fix-one-more-file-seccomp-issue.patch
+        pacman-5.2.1-reproducible-libprovides.patch
         "${arch[@]/#/pacman.conf.}"
         makepkg.conf.in
         pacman-keyring.service
@@ -45,9 +46,10 @@ source_armv7h=(0001-Sychronize-filesystem.patch
                0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)
 sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
             'SKIP'
-            'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1'
+            '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
             'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
-            '509a4f253a17670b9def43a0daa3aa17f113961aec65429d1996c93478d6693f'
+            '667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
+            'fdc78b55947d41d08d9a0404b4fbb37e409517733ab11cbe336f5aaa24dcfffd'
             'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265'
             'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c'
             '78be8885fd61999cdd65e61ceb70eed3828fd87f89dec19f4a04d87c8924d451'
@@ -63,6 +65,7 @@ prepare() {
 
   patch -Np1 < ../pacman-5.2.1-fix-pactest-package-tar-format.patch
   patch -Np1 < ../makepkg-fix-one-more-file-seccomp-issue.patch
+  patch -Np1 < ../pacman-5.2.1-reproducible-libprovides.patch
 
   # From Arch ARM
   if [ "${CARCH}" = "armv7h" ]; then
diff --git a/libre/pacman/pacman-5.2.1-fix-pactest-package-tar-format.patch b/libre/pacman/pacman-5.2.1-fix-pactest-package-tar-format.patch
new file mode 100644
index 000000000..cdf7e3279
--- /dev/null
+++ b/libre/pacman/pacman-5.2.1-fix-pactest-package-tar-format.patch
@@ -0,0 +1,32 @@
+From b9faf652735c603d1bdf849a570185eb721f11c1 Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Tue, 12 Nov 2019 16:14:57 +1000
+Subject: pactest: set package tar format to GNU_FORMAT
+
+python-3.8 changed the default tar format to PAX_FORMAT. This caused
+issues in our testsuite with package extraction of files with UTF-8
+characters as we run the tests under the C locale.
+
+sycn600.py:
+error: error while reading package /tmp/pactest-xuhri4xa/var/cache/pacman/pkg/unicodechars-2.0-1.pkg.tar.gz: Pathname can't be converted from UTF-8 to current locale.
+
+Set format back to GNU_FORMAT.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ test/pacman/pmpkg.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
+index 6a845222..e40868cc 100644
+--- a/test/pacman/pmpkg.py
++++ b/test/pacman/pmpkg.py
+@@ -142,7 +142,7 @@ class pmpkg(object):
+         util.mkdir(os.path.dirname(self.path))
+ 
+         # Generate package metadata
+-        tar = tarfile.open(self.path, "w:gz")
++        tar = tarfile.open(self.path, "w:gz", format=tarfile.GNU_FORMAT)
+         for name, data in archive_files:
+             info = tarfile.TarInfo(name)
+             info.size = len(data)
diff --git a/libre/pacman/pacman-5.2.1-reproducible-libprovides.patch b/libre/pacman/pacman-5.2.1-reproducible-libprovides.patch
new file mode 100644
index 000000000..fea695882
--- /dev/null
+++ b/libre/pacman/pacman-5.2.1-reproducible-libprovides.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
+index d1416d15..b95a03af 100644
+--- a/scripts/makepkg.sh.in
++++ b/scripts/makepkg.sh.in
+@@ -521,7 +521,7 @@ find_libprovides() {
+ 		missing=0
+ 		case "$p" in
+ 			*.so)
+-				mapfile -t filename < <(find "$pkgdir" -type f -name $p\*)
++				mapfile -t filename < <(find "$pkgdir" -type f -name $p\* | LC_ALL=C sort)
+ 				if [[ $filename ]]; then
+ 					# packages may provide multiple versions of the same library
+ 					for fn in "${filename[@]}"; do