[pacman]: rebuild for new 'file' package

3 files changed, 49 insertions, 52 deletions

diff --git a/libre/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch b/libre/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch
deleted file mode 100644
index e666299ff..000000000
--- a/libre/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 59e20edc16b7f13c3d753ac3a28358c467e32965 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Mon, 27 Aug 2018 16:41:29 -0400
-Subject: [PATCH] makepkg: Pass --stream to `hg clone` when creating the
- working copy
-
-Without --stream, `hg clone` reencodes+recompresses the entire repository,
-to the storage settings of the host.  But download_hg() already did that
-on the initial network clone, and it is 100% pointless duplicated work for
-the local clone.
-
-The work that this saves is CPU-bound (not disk-bound), and is restricted
-to a single core.
-
-The --stream flag has only existed since Mercurial 4.4 (2017-11-01).  Prior
-to that, it was named --uncompressed.  --uncompressed still exists as a
-compatibility alias for --stream, and marked deprecated, though there is
-currently no schedule for its removal.
----
- scripts/libmakepkg/source/hg.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in
-index ae9aed3b..7346e1e3 100644
---- a/scripts/libmakepkg/source/hg.sh.in
-+++ b/scripts/libmakepkg/source/hg.sh.in
-@@ -94,7 +94,7 @@ extract_hg() {
- 			plain "$(gettext "Aborting...")"
- 			exit 1
- 		fi
--	elif ! hg clone -u "$ref" "$dir" "${dir##*/}"; then
-+	elif ! hg clone -u "$ref" --stream "$dir" "${dir##*/}"; then
- 		error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg"
- 		plain "$(gettext "Aborting...")"
- 		exit 1
--- 
-2.18.0
-
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index a7c4fe56c..5104f8eaf 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,4 +1,3 @@
-# vim: set ts=2 sw=2 et:
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
@@ -10,31 +9,32 @@
 
 pkgname=pacman
 pkgver=5.2.1
-pkgrel=1
-pkgrel+=.parabola2
+pkgrel=4
+pkgrel+=.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 url="https://www.archlinux.org/pacman/"
 license=('GPL')
-groups=('base' 'base-devel')
-groups+=('base-openrc')
+groups=('base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 depends+=('parabola-keyring' 'archlinuxarm-keyring' 'archlinux32-keyring')
 makedepends=('asciidoc')
 checkdepends=('python' 'fakechroot')
 optdepends=('perl-locale-gettext: translation support in makepkg-template')
-backup=(etc/pacman.conf
-        etc/makepkg.conf)
-provides=('libalpm.so' 'pacman-parabola')
+provides=('libalpm.so')
+provides+=('pacman-parabola')
 conflicts=('pacman-parabola')
 replaces=('pacman-parabola')
-backup=(etc/pacman.conf etc/makepkg.conf)
+backup=(etc/pacman.conf
+        etc/makepkg.conf)
 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
+        makepkg-fix-one-more-file-seccomp-issue.patch
         "${arch[@]/#/pacman.conf.}"
         makepkg.conf.in
         pacman-keyring.service
@@ -45,9 +45,11 @@ source_armv7h=(0001-Sychronize-filesystem.patch
                0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)
 sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
             'SKIP'
-            'aa6f91f18db815c71f947c6e5517cd030736f21308d3eeabeb1d4b771bff2287'
-            '670c7ae3e7f56b5f04efb942d0418577256e439dd072f9ffaa22d0bab10ff41f'
-            '3900caad7fffe8ea6581cf477fe2b17274f7fae88a2300a60861451f35350293'
+            'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1'
+            'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
+            '509a4f253a17670b9def43a0daa3aa17f113961aec65429d1996c93478d6693f'
+            'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265'
+            'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c'
             '78be8885fd61999cdd65e61ceb70eed3828fd87f89dec19f4a04d87c8924d451'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
@@ -59,6 +61,9 @@ 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
+
   # From Arch ARM
   if [ "${CARCH}" = "armv7h" ]; then
     patch -p1 -i ../0001-Sychronize-filesystem.patch
@@ -105,8 +110,8 @@ build() {
     sed < "$srcdir/makepkg.conf.in" > "$srcdir/makepkg.conf.$carch" \
         -e "s|@CARCH[@]|$mycarch|g" \
         -e "s|@CHOST[@]|$mychost|g" \
-        -e "s|@LDFLAGS[@]|$myldflags|g" \
-        -e "s|@CARCHFLAGS[@]|$myflags|g"
+        -e "s|@CARCHFLAGS[@]|$myflags|g" \
+        -e "s|@LDFLAGS[@]|$myldflags|g"
   done
 }
 
diff --git a/libre/pacman/makepkg-fix-one-more-file-seccomp-issue.patch b/libre/pacman/makepkg-fix-one-more-file-seccomp-issue.patch
new file mode 100644
index 000000000..7b077ad8c
--- /dev/null
+++ b/libre/pacman/makepkg-fix-one-more-file-seccomp-issue.patch
@@ -0,0 +1,30 @@
+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
+