From 75957ca00e7625c37f151b8e6d37296fa480ccc7 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Wed, 24 Sep 2014 21:39:40 +0000
Subject: [PATCH] update bash for CVE-2014-6271

---
 bash/PKGBUILD | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bash/PKGBUILD b/bash/PKGBUILD
index b48bac47e..62858d377 100644
--- a/bash/PKGBUILD
+++ b/bash/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=bash
 _basever=4.3
-_patchlevel=024 #prepare for some patches
+_patchlevel=025 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
@@ -53,8 +53,7 @@ build() {
   export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
 
   ./configure --prefix=/usr --with-curses --enable-readline \
-    --without-bash-malloc --with-installed-readline \
-    --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
+    --without-bash-malloc --with-installed-readline
   make
 }
 
@@ -67,9 +66,13 @@ package() {
   cd $pkgname-$_basever
   make DESTDIR=${pkgdir} install
 
-  # for now, bash is our default /bin/sh
-  cd ${pkgdir}/bin
-  ln -s bash sh
+  ln -s bash ${pkgdir}/usr/bin/sh
+
+  # pre-usr move
+  # put needed symlinks in /bin
+  install -dm755 ${pkgdir}/bin
+  ln -s ../usr/bin/bash ${pkgdir}/bin/bash
+  ln -s ../usr/bin/bash ${pkgdir}/bin/sh
 
   install -dm755 ${pkgdir}/etc/skel/
   
@@ -138,4 +141,6 @@ md5sums=('81348932d5da294953e15d4814c74dd1'
          'b3cb0d80fd0c47728264405cbb3b23c7'
          'SKIP'
          'b5ea5600942acceb4b6f07313d2de74e'
+         'SKIP'
+         '193c06f578d38ffdbaebae9c51a7551f'
          'SKIP')