pacman-5.2.2-1.parabola1: updating version

5 files changed, 7 insertions, 90 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 752de4b32..30b809421 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -8,8 +8,8 @@
 # Contributor: Daniel Milewski <niitotantei@riseup.net>
 
 pkgname=pacman
-pkgver=5.2.1
-pkgrel=6
+pkgver=5.2.2
+pkgrel=1
 pkgrel+=.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
@@ -33,9 +33,6 @@ 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
-        makepkg-fix-one-more-file-seccomp-issue.patch
-        pacman-5.2.1-reproducible-libprovides.patch
         "${arch[@]/#/pacman.conf.}"
         makepkg.conf.in
         pacman-keyring.service
@@ -44,15 +41,12 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
 source_armv7h=(0001-Sychronize-filesystem.patch
                0002-Revert-close-stdin-before-running-install-scripts.patch
                0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)
-sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
+sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             'SKIP'
-            '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
-            'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
-            '667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
             'fdc78b55947d41d08d9a0404b4fbb37e409517733ab11cbe336f5aaa24dcfffd'
             'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265'
             'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c'
-            '78be8885fd61999cdd65e61ceb70eed3828fd87f89dec19f4a04d87c8924d451'
+            '23df8ebdc0981f296aa16c13a5f060dcb06f2c048aaa50379c3eef526109a752'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
             '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8')
@@ -63,10 +57,6 @@ sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041c
 prepare() {
   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
-
   # From Arch ARM
   if [ "${CARCH}" = "armv7h" ]; then
     patch -p1 -i ../0001-Sychronize-filesystem.patch
diff --git a/libre/pacman/makepkg-fix-one-more-file-seccomp-issue.patch b/libre/pacman/makepkg-fix-one-more-file-seccomp-issue.patch
deleted file mode 100644
index 7b077ad8c..000000000
--- a/libre/pacman/makepkg-fix-one-more-file-seccomp-issue.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 00cfc6c5c9700b597c384743c2f057a2ba7125e2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Thu, 9 Jan 2020 20:49:17 -0500
-Subject: [pacman-dev] [PATCH] makepkg: fix one more file-seccomp issue
-
-When file is called via fakeroot, it doesn't matter whether you use -z
-or not, it is still incompatible with seccomp. Fix by configuring it
-with FILECMD when used in the fakeroot 'tidy' run.
-
-Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
----
- scripts/libmakepkg/tidy/strip.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
-index 1bd810f0..876f00f0 100644
---- a/scripts/libmakepkg/tidy/strip.sh.in
-+++ b/scripts/libmakepkg/tidy/strip.sh.in
-@@ -111,7 +111,7 @@ tidy_strip() {
- 
- 		local binary strip_flags
- 		find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do
--			case "$(file -bi "$binary")" in
-+			case "$(@FILECMD@ -bi "$binary")" in
- 				*application/x-sharedlib*)  # Libraries (.so)
- 					strip_flags="$STRIP_SHARED";;
- 				*application/x-archive*)    # Libraries (.a)
--- 
-2.24.1
-
diff --git a/libre/pacman/makepkg.conf.in b/libre/pacman/makepkg.conf.in
index 6e7358cab..f4ff65a0f 100644
--- a/libre/pacman/makepkg.conf.in
+++ b/libre/pacman/makepkg.conf.in
@@ -40,11 +40,13 @@ CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="@CARCHFLAGS@"
 CXXFLAGS="@CARCHFLAGS@"
 LDFLAGS="@LDFLAGS@"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -87,7 +89,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
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
deleted file mode 100644
index cdf7e3279..000000000
--- a/libre/pacman/pacman-5.2.1-fix-pactest-package-tar-format.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index fea695882..000000000
--- a/libre/pacman/pacman-5.2.1-reproducible-libprovides.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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