From 15b4fa33117ac233ea3deb3927348ae3a45cd08e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 25 Sep 2014 07:06:18 +0000 Subject: main/bash: fix application of patches make sure all paches are properly applied --- main/bash/APKBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD index 815f6b9049..9a398f3c78 100644 --- a/main/bash/APKBUILD +++ b/main/bash/APKBUILD @@ -3,8 +3,8 @@ pkgname=bash pkgver=4.3.025 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} -_patchbase=${_myver%.*}${_myver#*.} -pkgrel=0 +_patchbase=${_myver/./} +pkgrel=1 pkgdesc="The GNU Bourne Again shell" url="http://www.gnu.org/software/bash/bash.html" arch="all" @@ -31,10 +31,13 @@ prepare() { local p cd "$_builddir" update_config_sub || return 1 - #for p in ../bash${_patchbase}-??? ../*.patch; do - for p in ../*.patch; do - msg "applying patch ${p##*/}" - patch -p0 -i $p || return 1 + for p in $source; do + case $p in + *.patch|*/bash[0-9][0-9]-[0-9]*) + msg "$p" + patch -p0 -i "$srcdir"/${p##*/} || return 1 + ;; + esac done } -- cgit v1.2.3