From f17859f016eee6e7dcdae1ade79b7263e67fe5c3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sat, 27 Feb 2016 19:39:34 -0300
Subject: pacman-5.0.1-2.parabola1: updating version

* libmakepkg bug fix
---
 .../0001-libmakepkg-fix-is_array-function.patch    | 32 ++++++++++++++++++++++
 libre/pacman/PKGBUILD                              | 12 +++++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 libre/pacman/0001-libmakepkg-fix-is_array-function.patch

(limited to 'libre/pacman')

diff --git a/libre/pacman/0001-libmakepkg-fix-is_array-function.patch b/libre/pacman/0001-libmakepkg-fix-is_array-function.patch
new file mode 100644
index 000000000..b8ada06f4
--- /dev/null
+++ b/libre/pacman/0001-libmakepkg-fix-is_array-function.patch
@@ -0,0 +1,32 @@
+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/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index ca377657b..2b3bd3e50 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,5 +1,5 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 258691 2016-01-30 00:40:01Z allan $
+# $Id: PKGBUILD 260254 2016-02-26 05:11:10Z allan $
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -9,8 +9,8 @@
 # Contributor: Daniel Milewski <niitotantei@riseup.net>
 
 pkgname=pacman
-pkgver=5.0.0
-pkgrel=1.parabola2
+pkgver=5.0.1
+pkgrel=2.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.archlinux.org/pacman/"
@@ -35,10 +35,11 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         makepkg.conf
         $pkgname-keyring.service
         $pkgname-keyring.timer
+        0001-libmakepkg-fix-is_array-function.patch
         0001-Sychronize-filesystem.patch
         0002-Revert-close-stdin-before-running-install-scripts.patch
         makepkg-pkgrel-5.patch)
-md5sums=('9ecf8a5b659c0e02232c945ab198e6e1'
+md5sums=('377a2664d6007d72d6d8a126add83bcf'
          'SKIP'
          'f67cafd2e70b5b1231831f454e4ecb90'
          '9853109830015e7516fd01a9ad00fe31'
@@ -46,6 +47,7 @@ md5sums=('9ecf8a5b659c0e02232c945ab198e6e1'
          '19c91127e409cf24246de252be44eaa9'
          '11a5fac02651041e44d65d66c3538030'
          '7fb448e0d2b5b22da5ddc0040378efb0'
+         '55732144f1048f714f1f93203e9b7728'
          '11869a104d0944cc86215098cf5a32bf'
          'd4692c3add0b0dab87036edad3f59626'
          'da78f246ac281ed949cf97d48f86d994')
@@ -54,6 +56,8 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@
 prepare() {
   cd "$pkgname-$pkgver"
 
+  patch -p1 -i $srcdir/0001-libmakepkg-fix-is_array-function.patch
+
   if [ "${CARCH}" = "armv7h" ]; then
     patch -p1 -i ../0001-Sychronize-filesystem.patch
     patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch
-- 
cgit v1.2.3-54-g00ecf