diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index e6c32b522..ea6684b5d 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -12,7 +12,7 @@ pkgname=pacman pkgver=5.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -31,6 +31,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 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 0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -39,6 +40,7 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312' 'SKIP' 'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1' + 'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9' '187bef40b14461ef7caba83e8124b6725e0cc9d46fa84353dae3b2afdc013589' '83597d3092edb2414d3b1a3e2e7337c0edcf102636a5884f3d3f3755fdceb2b0' '6e6434d123dd57961922627b39d967de384e3902a041e12dfc077081552fec28' @@ -48,6 +50,7 @@ sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312' 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 -p1 -i ../0001-Sychronize-filesystem.patch patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch diff --git a/core/pacman/makepkg-fix-one-more-file-seccomp-issue.patch b/core/pacman/makepkg-fix-one-more-file-seccomp-issue.patch new file mode 100644 index 000000000..7b077ad8c --- /dev/null +++ b/core/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 +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 +--- + 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 +