[pacman]: rebuild for new 'file' package

7 files changed, 106 insertions, 139 deletions

diff --git a/libre-testing/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch b/libre-testing/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch
deleted file mode 100644
index e666299ff..000000000
--- a/libre-testing/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-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch b/libre-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
index ab0877950..eff801b55 100644
--- a/libre-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
+++ b/libre-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
@@ -24,8 +24,8 @@ index f12effde..1ad8de37 100644
  	allows package maintainers to make updates to the package's configure
  	flags, for example. This is typically set to '1' for each new upstream
  	software release and incremented for intermediate PKGBUILD updates. The
--	variable is a postive integer, with an optional subrelease level
--	specified by adding another postive integer separated by a period
+-	variable is a positive integer, with an optional subrelease level
+-	specified by adding another positive integer separated by a period
 -	(i.e. in the form x.y).
 +	variable is not allowed to contain colons, forward slashes, hyphens or
 +	whitespace.
diff --git a/libre-testing/pacman/PKGBUILD b/libre-testing/pacman/PKGBUILD
index 8ad959088..5104f8eaf 100644
--- a/libre-testing/pacman/PKGBUILD
+++ b/libre-testing/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>
@@ -9,58 +8,52 @@
 # Contributor: Daniel Milewski <niitotantei@riseup.net>
 
 pkgname=pacman
-pkgver=5.1.3
-pkgrel=1
+pkgver=5.2.1
+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=('python2' 'fakechroot')
-optdepends=('perl-locale-gettext: translation support in makepkg-template'
-            'xdelta3: delta support in repo-add')
-backup=(etc/pacman.conf
-        etc/makepkg.conf)
-provides=('pacman-parabola')
+checkdepends=('python' 'fakechroot')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
+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
         pacman-keyring.timer
-        0001-makepkg-Better-error-messages-for-versions-in-check-.patch
-        0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
-        0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
-        0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
-        0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch)
+        0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch)
 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=('10db61a0928d619871340c3f93a677d1541d6c52353c516aec4f8d96e830d4eb'
+sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
             'SKIP'
-            '418a2c7675f3b350beebf8fbfd267744724e8437f1ad61c86a2f5fcdca44409b'
-            'fa4c0d2db22583c962f34e3e2fb7666dd30c68bfd5b298c76da1a09227bc6cf8'
-            'ae034a05c4373aa30419c541e121e5d6dac33dd6fa8d4cc494d3c98cedd95a2e'
-            'c0cbdc0df96f13a73d241c1eb85a969098bd414f12ecd7c045922b154537e00a'
+            'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1'
+            'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
+            '509a4f253a17670b9def43a0daa3aa17f113961aec65429d1996c93478d6693f'
+            'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265'
+            'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c'
+            '78be8885fd61999cdd65e61ceb70eed3828fd87f89dec19f4a04d87c8924d451'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
-            '075ac1f8d782ac9868f5e7f3043f684a00da33915eba9ec7e4a8940992ddc269'
-            '8065c468706be669bc6718a6634e5e58507cba9b8121bf5cfe1703daacab1c3e'
-            'd01100d19b9868da8c689a7a14b6340574ecca0105a8d8ef866b281ad3d7e637'
-            'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033'
-            '1f6a0a8518dc912bc5d9df335b6da220bd3cc51630b6b47c09ec9d4cd47ae432')
+            '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8')
 sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc'
                    '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9'
                    '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb')
@@ -68,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
@@ -76,16 +72,7 @@ prepare() {
   fi
 
   # From Parabola
-  patch -p1 -i ../0001-makepkg-Better-error-messages-for-versions-in-check-.patch
-  patch -p1 -i ../0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
-  patch -p1 -i ../0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
   patch -p1 -i ../0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
-
-  # From pacman-dev mailing list
-  # Properly drop whirlpoolsums support (instead of mysteriously
-  # failing).  Backported because some Parabola packages actually use
-  # whirlpoolsums.
-  patch -p1 -i ../0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch
 }
 
 build() {
@@ -123,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
 }
 
@@ -150,15 +137,6 @@ package() {
     install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
   done
 
-  # put bash_completion in the right location
-  install -dm755 "$pkgdir/usr/share/bash-completion/completions"
-  mv "$pkgdir/etc/bash_completion.d/pacman" "$pkgdir/usr/share/bash-completion/completions"
-  rmdir "$pkgdir/etc/bash_completion.d"
-
-  for f in makepkg pacman-key; do
-    ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
-  done
-
   # Parabola's pacman began shipping a weekly job for this back in
   # 2014.  Why is it nescessary for Parabola installs, but it
   # seemingly isn't for Arch installs?
diff --git a/libre-testing/pacman/makepkg-fix-one-more-file-seccomp-issue.patch b/libre-testing/pacman/makepkg-fix-one-more-file-seccomp-issue.patch
new file mode 100644
index 000000000..7b077ad8c
--- /dev/null
+++ b/libre-testing/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
+
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
+