Date: Friday, February 26, 2016 @ 06:11:10 Author: allan Revision: 260254
upgpkg: pacman 5.0.1-2 libmakepkg bug fix Added: pacman/trunk/0001-libmakepkg-fix-is_array-function.patch Modified: pacman/trunk/PKGBUILD ---------------------------------------------+ 0001-libmakepkg-fix-is_array-function.patch | 32 ++++++++++++++++++++++++++ PKGBUILD | 10 +++++++- 2 files changed, 41 insertions(+), 1 deletion(-) Added: 0001-libmakepkg-fix-is_array-function.patch =================================================================== --- 0001-libmakepkg-fix-is_array-function.patch (rev 0) +++ 0001-libmakepkg-fix-is_array-function.patch 2016-02-26 05:11:10 UTC (rev 260254) @@ -0,0 +1,32 @@ +From 2822a45fa91b430c99b4b8bd3531ee745ada1ab7 Mon Sep 17 00:00:00 2001 +From: Allan McRae <[email protected]> +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 <[email protected]> +--- + 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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-26 02:19:35 UTC (rev 260253) +++ PKGBUILD 2016-02-26 05:11:10 UTC (rev 260254) @@ -5,7 +5,7 @@ pkgname=pacman pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/"; @@ -21,11 +21,13 @@ backup=(etc/pacman.conf etc/makepkg.conf) options=('strip' 'debug') 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.conf) md5sums=('377a2664d6007d72d6d8a126add83bcf' 'SKIP' + '55732144f1048f714f1f93203e9b7728' 'bdb40c76225c2fd8874bd34b6a3f6ad7' 'c511ee4c7a86a37e8841440ede89300d' 'f5b59fe5f016eebd9590318530bbd996') @@ -32,6 +34,12 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <[email protected]> +prepare() { + cd "$pkgname-$pkgver" + + patch -p1 -i $srcdir/0001-libmakepkg-fix-is_array-function.patch +} + build() { cd "$pkgname-$pkgver"
