Wed Mar 19 03:59:18 UTC 2014

3 files changed, 71 insertions, 100 deletions

diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index c6f692ac4..b9533b217 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 193699 2013-08-28 09:22:56Z allan $
+# $Id: PKGBUILD 208144 2014-03-18 07:53:38Z bpiotrowski $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=bash
-_basever=4.2
-_patchlevel=045 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=5
+_basever=4.3
+_patchlevel=000 #prepare for some patches
+pkgver=$_basever #.$_patchlevel
+pkgrel=2
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/bash/bash.html"
 groups=('base')
 backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('readline>=6.1' 'glibc')
+depends=('readline>=6.3' 'glibc')
 provides=('sh')
 install=bash.install
 source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
@@ -22,7 +22,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
         dot.bash_logout
         system.bashrc
         system.bash_logout
-        bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
+        bash-4.3-debug-trap.patch
+        bash-4.3-test-nameref.patch)
 if [ $_patchlevel -gt 000 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
@@ -37,7 +38,9 @@ prepare() {
     patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
   done
   
-  patch -p1 -i $srcdir/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
+  # upstream patches I assume will be made official later...
+  patch -p0 -i $srcdir/bash-4.3-debug-trap.patch
+  patch -p0 -i $srcdir/bash-4.3-test-nameref.patch
 }
 
 build() {
@@ -77,101 +80,14 @@ package() {
   install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
 }
 
-md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
+md5sums=('81348932d5da294953e15d4814c74dd1'
          'SKIP'
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
          '3546099a1b2f667adc9794f52e78e35b'
          '472f536d7c9e8250dc4568ec4cfaf294'
-         '9e55d01f2d9dda4a0c96031b25d19f45'
-         '1100bc1dda2cdc06ac44d7e5d17864a3'
-         'SKIP'
-         '30e7948079921d3261efcc6a40722135'
-         'SKIP'
-         '9ea06decec43a198f3d7cf29acc602f8'
-         'SKIP'
-         'fb48f6134d7b013135929476aa0c250c'
-         'SKIP'
-         'e70e45de33426b38153b390be0dbbcd4'
-         'SKIP'
-         'ce4e5c484993705b27daa151eca242c2'
-         'SKIP'
-         '88d1f96db29461767602e2546803bda7'
-         'SKIP'
-         '24c574bf6d6a581e300823d9c1276af6'
-         'SKIP'
-         '4c5835f2fbab36c4292bb334977e5b6d'
-         'SKIP'
-         '0a51602b535ef661ee707be6c8bdb373'
-         'SKIP'
-         '58deacf3d57cbd75575444ff6a3b0806'
-         'SKIP'
-         '72d5059820015231483bb7415d09e9db'
-         'SKIP'
-         '608336ebe215984ef126e3c29d2d3409'
-         'SKIP'
-         'ed19da878e3f630834c62b9d9dcc6fce'
-         'SKIP'
-         '2d07daba0b8ca8f876d2aa052ff594b4'
-         'SKIP'
-         '53d246537e1fffd1aaa02ba5c056211c'
-         'SKIP'
-         '304fd129a58fee2d8a34f8b4704db0aa'
-         'SKIP'
-         '6921a0b4228fe89b6537a5c29f027c89'
-         'SKIP'
-         '1195d85447f3d048d2c9bcd075fa765c'
-         'SKIP'
-         'b09000bba08da6ac753124593850cdf7'
-         'SKIP'
-         '09d3f96a16b881334cfaee0cf320b47e'
-         'SKIP'
-         '597bf71a2aac6feb510b7505cdd3d4f7'
-         'SKIP'
-         '3fab459b4e09daea529cacad025b13b3'
-         'SKIP'
-         '4ad8d11e72afc6090e701073ff034cf4'
-         'SKIP'
-         'c7d2493e44490f01dd20bdc8feb0a6a7'
-         'SKIP'
-         '9f19c199dd8d1fa9254eebe738759272'
-         'SKIP'
-         'a6ed82daf034587aee2f2581ba5fe829'
-         'SKIP'
-         'da9265aa2527fd4a7481baa3e0550287'
-         'SKIP'
-         'ec444d229e8899fbaaf6fc7de2d82ae6'
-         'SKIP'
-         'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
-         'SKIP'
-         '89390ff6a3c2ef7e09dd4b8b097a8e56'
-         'SKIP'
-         'eee08003395c417f677d1a4bf8c548ee'
-         'SKIP'
-         '2fe070dd6d75d8ff16f269184a16e9c4'
-         'SKIP'
-         '4e610506c1711bf3483b965800ac3d5d'
-         'SKIP'
-         '7cd9bfdf7cbfd45274d07620ee94c8d9'
-         'SKIP'
-         '9c3142956064d175a880bcb186e51ef9'
-         'SKIP'
-         'c10692f447d4966c879f8fb8d7c8ebc9'
-         'SKIP'
-         '9ef3c308cde413e95866c1266cfb4e98'
-         'SKIP'
-         'cd48f57a404498d4e5c73a3501c4b1a5'
-         'SKIP'
-         '00a2371b6c05acbfce6bc850c6d982f8'
-         'SKIP'
-         '7bc4942a66ca4024ee964db7ede07896'
-         'SKIP'
-         '1cf7701017ebfc8e129de92c8f8b798c'
-         'SKIP'
-         '9e61168fca692d8d1a733c389a63712e'
-         'SKIP'
-         'b4b11d64b45ea9ec50dcc74c6c3861f6'
-         'SKIP'
-         '1661bcc83c4715f54368877452ff2247'
-         'SKIP')
+         '3d5b91bc498c43d7bf902b679c8168ef'
+         '0615db31244215fd102ecbcd38b8b2e8')
+
+
diff --git a/core/bash/bash-4.3-debug-trap.patch b/core/bash/bash-4.3-debug-trap.patch
new file mode 100644
index 000000000..8d0a73288
--- /dev/null
+++ b/core/bash/bash-4.3-debug-trap.patch
@@ -0,0 +1,30 @@
+*** ../bash-4.3/trap.c	2014-02-05 10:03:21.000000000 -0500
+--- trap.c	2014-02-28 09:51:43.000000000 -0500
+***************
+*** 921,925 ****
+  
+  #if defined (JOB_CONTROL)
+!       save_pipeline (1);	/* XXX only provides one save level */
+  #endif
+  
+--- 921,926 ----
+  
+  #if defined (JOB_CONTROL)
+!       if (sig != DEBUG_TRAP)	/* run_debug_trap does this */
+! 	save_pipeline (1);	/* XXX only provides one save level */
+  #endif
+  
+***************
+*** 941,945 ****
+  
+  #if defined (JOB_CONTROL)
+!       restore_pipeline (1);
+  #endif
+  
+--- 942,947 ----
+  
+  #if defined (JOB_CONTROL)
+!       if (sig != DEBUG_TRAP)	/* run_debug_trap does this */
+! 	restore_pipeline (1);
+  #endif
+  
diff --git a/core/bash/bash-4.3-test-nameref.patch b/core/bash/bash-4.3-test-nameref.patch
new file mode 100644
index 000000000..d64a3ccfa
--- /dev/null
+++ b/core/bash/bash-4.3-test-nameref.patch
@@ -0,0 +1,25 @@
+*** ../bash-4.3/test.c	2014-02-04 16:52:58.000000000 -0500
+--- test.c	2014-02-28 21:22:44.000000000 -0500
+***************
+*** 647,652 ****
+  
+      case 'R':
+!       v = find_variable (arg);
+!       return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE);
+      }
+  
+--- 647,652 ----
+  
+      case 'R':
+!       v = find_variable_noref (arg);
+!       return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE);
+      }
+  
+***************
+*** 724,727 ****
+--- 724,728 ----
+      case 'u': case 'v': case 'w': case 'x': case 'z':
+      case 'G': case 'L': case 'O': case 'S': case 'N':
++     case 'R':
+        return (1);
+      }