pacman: update to 5.0.2

5 files changed, 11 insertions, 95 deletions

diff --git a/abs/core/pacman/0001-libmakepkg-fix-is_array-function.patch b/abs/core/pacman/0001-libmakepkg-fix-is_array-function.patch
deleted file mode 100644
index b8ada06..0000000
--- a/abs/core/pacman/0001-libmakepkg-fix-is_array-function.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2822a45fa91b430c99b4b8bd3531ee745ada1ab7 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Fri, 26 Feb 2016 15:01:11 +1000
-Subject: [PATCH] libmakepkg: fix is_array function
-
-This happened to work for the majority of cases because the only calling
-function used a variable named "i" that was related to the variable being
-passed to the function.
-
-Fixes FS#48340.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
----
- scripts/libmakepkg/util/util.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh
-index 675e75d..f9f1c20 100644
---- a/scripts/libmakepkg/util/util.sh
-+++ b/scripts/libmakepkg/util/util.sh
-@@ -46,7 +46,7 @@ is_array() {
- 	local shellopts=$(shopt -p)
- 	shopt -s extglob
- 
--	if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
-+	if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
- 		ret=0
- 	fi
- 
--- 
-2.7.1
-
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index 877dc11..a88c10f 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -4,39 +4,31 @@
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=5.0.1
+pkgver=5.0.2
 pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base' 'base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-makedepends=('asciidoc')   # roundup patch alters docs
+makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
 provides=('pacman-contrib')
 conflicts=('pacman-contrib')
 replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
 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}
-        0001-libmakepkg-fix-is_array-function.patch
         pacman.conf.i686
         pacman.conf.x86_64
         makepkg-asroot.patch
-        pacman.cron
         makepkg.conf)
-validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  
-  patch -p1 -i $srcdir/0001-libmakepkg-fix-is_array-function.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
@@ -70,7 +62,7 @@ package() {
       ;;
     x86_64)
       mycarch="x86_64"
-      mychost="x86_64-unknown-linux-gnu"
+      mychost="x86_64-pc-linux-gnu"
       myflags="-march=x86-64"
       ;;
   esac
@@ -96,16 +88,10 @@ package() {
   #restore --asroot makepkg option
   cd $pkgdir/usr/bin/
   patch -p0 -i "$srcdir/makepkg-asroot.patch"
-
-  #run pacman-db-upgrade from cron
-  mkdir -p "$pkgdir/usr/MythVantage/bin"
-  install -m 0644 "$srcdir/pacman.cron" "$pkgdir/usr/MythVantage/bin/pacman.cron"
 }
-md5sums=('377a2664d6007d72d6d8a126add83bcf'
+md5sums=('f36f5e7e95a89436febe1bcca874fc33'
          'SKIP'
-         '55732144f1048f714f1f93203e9b7728'
          'bdb40c76225c2fd8874bd34b6a3f6ad7'
          'c511ee4c7a86a37e8841440ede89300d'
          '4950b7c5adf80e082a726dd11b9cb12f'
-         'd62e10ea6cc7ae617ba1a99d8f11eaf5'
-         'f5b59fe5f016eebd9590318530bbd996')
+         'ce959232a30f1fbd33f536c76a9df198')
diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf
index bd0e0cf..8fa4fb0 100644
--- a/abs/core/pacman/makepkg.conf
+++ b/abs/core/pacman/makepkg.conf
@@ -37,9 +37,9 @@ CHOST="@CHOST@"
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong"
-CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
diff --git a/abs/core/pacman/pacman.cron b/abs/core/pacman/pacman.cron
deleted file mode 100644
index 9155aed..0000000
--- a/abs/core/pacman/pacman.cron
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-function pacman_wait {
-    if [ -f /var/lib/pacman/db.lck ]
-    then
-        echo "Pacman is running and must quit before continuing."
-        echo "  Waiting for pacman to quit..."
-        while [ -f /var/lib/pacman/db.lck ]
-        do
-        sleep 5
-        done
-    fi
-}
-
-pacman_wait
-pacman-db-upgrade &
-#remove pacman.cron from root crontab
-grep -v "* * * * *    /usr/bin/bash /usr/MythVantage/bin/pacman.cron" /var/spool/cron/root > /var/spool/cron/root2
-mv /var/spool/cron/root2 /var/spool/cron/root
-echo "root" >> /var/spool/cron/cron.update
diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install
deleted file mode 100644
index 637a741..0000000
--- a/abs/core/pacman/pacman.install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    if [ "$(vercmp $2 4.2.0)" -lt 0 ]; then
-        _warnupgrade
-    fi
-    sed -i '/^# If upgrades are available/d' /etc/pacman.conf
-    sed -i '/^SyncFirst/d' /etc/pacman.conf
-}
-
-_warnupgrade() {
-    echo ">>> The pacman database format has changed as of pacman 4.2.0."
-    echo ">>> You will need to run \`pacman-db-upgrade\` as root."
-    echo ">>>"
-    echo "* * * * *    /usr/bin/bash /usr/MythVantage/bin/pacman.cron" >> /var/spool/cron/root
-    echo "root" >> /var/spool/cron/cron.update
-}