core/pacman to 5.2.1-6

This commit is contained in:
Kevin Mihelich 2020-05-24 00:54:48 +00:00
parent 3bd932814a
commit b83b4249c2
2 changed files with 17 additions and 1 deletions

View file

@ -12,7 +12,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/"
@ -32,6 +32,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@a
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
0001-Sychronize-filesystem.patch
0002-Revert-close-stdin-before-running-install-scripts.patch
0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
@ -41,6 +42,7 @@ sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
'SKIP'
'824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
'667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
'187bef40b14461ef7caba83e8124b6725e0cc9d46fa84353dae3b2afdc013589'
'83597d3092edb2414d3b1a3e2e7337c0edcf102636a5884f3d3f3755fdceb2b0'
'6e6434d123dd57961922627b39d967de384e3902a041e12dfc077081552fec28'
@ -51,6 +53,7 @@ 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
patch -p1 -i ../0001-Sychronize-filesystem.patch
patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch

View file

@ -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