pacman: update to 5.2.1

1 files changed, 36 insertions, 52 deletions

diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index e30c4bd..94ef2a4 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -1,33 +1,50 @@
 # vim: set ts=2 sw=2 et:
-# $Id$
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=5.0.2
-pkgrel=2
+pkgver=5.2.1
+pkgrel=6
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
-url="http://www.archlinux.org/pacman/"
+url="https://www.archlinux.org/pacman/"
 license=('GPL')
-groups=('base' 'base-devel')
+groups=('base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
-checkdepends=('python2' 'fakechroot')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
-backup=(etc/pacman.conf etc/makepkg.conf)
+checkdepends=('python' 'fakechroot')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
+provides=('libalpm.so')
+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.conf.i686
-        pacman.conf.x86_64
         makepkg-asroot.patch
+        makepkg-wait-f.patch
+        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
+        pacman.conf
         makepkg.conf)
+sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
+            'SKIP'
+            'd86967f28c57adf778070e7b92021a7e0dd14dcd67e32aa75fd09518c7cfe114'
+            '2f7f800e5632de4f51307c82006be5c86e183a6f649292d9e4c41ed00ce7f048'
+            '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
+            'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
+            '667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
+            '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
+            '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
 
+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
+}
 
 build() {
   cd "$pkgname-$pkgver"
@@ -37,7 +54,6 @@ build() {
     --with-scriptlet-shell=/usr/bin/bash \
     --with-ldconfig=/usr/bin/ldconfig
   make V=1
-  make -C contrib 
 }
 
 check() {
@@ -48,51 +64,19 @@ package() {
   cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C contrib install
 
   # install Arch specific stuff
   install -dm755 "$pkgdir/etc"
-  install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf"
-
-  case $CARCH in
-    i686)
-      mycarch="i686"
-      mychost="i686-pc-linux-gnu"
-      myflags="-march=i686"
-      ;;
-    x86_64)
-      mycarch="x86_64"
-      mychost="x86_64-pc-linux-gnu"
-      myflags="-march=x86-64"
-      ;;
-  esac
-
-  # set things correctly in the default conf file
+  install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
   install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
-  sed -i "$pkgdir/etc/makepkg.conf" \
-    -e "s|@CARCH[@]|$mycarch|g" \
-    -e "s|@CHOST[@]|$mychost|g" \
-    -e "s|@CARCHFLAGS[@]|$myflags|g"
-
-  # 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
-
-  install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim"
 
   #restore --asroot makepkg option
   cd $pkgdir/usr/bin/
   patch -p0 -i "$srcdir/makepkg-asroot.patch"
-  rm $pkgdir/usr/bin/makepkg.orig
+  #rm $pkgdir/usr/bin/makepkg.orig
+
+  #remove wait -t option in makepkg
+  cd $pkgdir/usr/bin/
+  patch -p0 -i "$srcdir/makepkg-wait-f.patch"
+
 }
-md5sums=('f36f5e7e95a89436febe1bcca874fc33'
-         'SKIP'
-         'bdb40c76225c2fd8874bd34b6a3f6ad7'
-         'c511ee4c7a86a37e8841440ede89300d'
-         '4950b7c5adf80e082a726dd11b9cb12f'
-         'ce959232a30f1fbd33f536c76a9df198')