[arch-commits] Commit in pacman/trunk (2 files)

[Allan McRae]

    Date: Saturday, May 23, 2020 @ 10:04:04
  Author: allan
Revision: 387446

upgpkg: pacman 5.2.1-6: backport reproducibility patch

Added:
  pacman/trunk/pacman-5.2.1-reproducible-libprovides.patch
Modified:
  pacman/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |    5 ++++-
 pacman-5.2.1-reproducible-libprovides.patch |   13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 08:52:02 UTC (rev 387445)
+++ PKGBUILD	2020-05-23 10:04:04 UTC (rev 387446)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -24,6 +24,7 @@
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         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
         pacman.conf
         makepkg.conf)
 sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
@@ -30,6 +31,7 @@
             'SKIP'
             '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
             'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
+            '667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
             '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
             '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
 
@@ -37,6 +39,7 @@
   cd "$pkgname-$pkgver"
   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
 }
 
 build() {

Added: pacman-5.2.1-reproducible-libprovides.patch
===================================================================
--- pacman-5.2.1-reproducible-libprovides.patch	                        (rev 0)
+++ pacman-5.2.1-reproducible-libprovides.patch	2020-05-23 10:04:04 UTC (rev 387446)
@@ -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