Date: Saturday, March 1, 2014 @ 04:10:24 Author: allan Revision: 206515
upgpkg: bash 4.3-2 grab a few patchs from upstream mailing list Added: bash/trunk/bash-4.3-debug-trap.patch bash/trunk/bash-4.3-test-nameref.patch Modified: bash/trunk/PKGBUILD -----------------------------+ PKGBUILD | 16 +++++++++++++--- bash-4.3-debug-trap.patch | 30 ++++++++++++++++++++++++++++++ bash-4.3-test-nameref.patch | 25 +++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-01 01:03:48 UTC (rev 206514) +++ PKGBUILD 2014-03-01 03:10:24 UTC (rev 206515) @@ -6,7 +6,7 @@ _basever=4.3 _patchlevel=000 #prepare for some patches pkgver=$_basever #.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') @@ -21,7 +21,9 @@ dot.bash_profile dot.bash_logout system.bashrc - system.bash_logout) + system.bash_logout + 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}) @@ -35,6 +37,10 @@ msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done + + # 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() { @@ -80,4 +86,8 @@ '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' '3546099a1b2f667adc9794f52e78e35b' - '472f536d7c9e8250dc4568ec4cfaf294') + '472f536d7c9e8250dc4568ec4cfaf294' + '3d5b91bc498c43d7bf902b679c8168ef' + '0615db31244215fd102ecbcd38b8b2e8') + + Added: bash-4.3-debug-trap.patch =================================================================== --- bash-4.3-debug-trap.patch (rev 0) +++ bash-4.3-debug-trap.patch 2014-03-01 03:10:24 UTC (rev 206515) @@ -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 + Added: bash-4.3-test-nameref.patch =================================================================== --- bash-4.3-test-nameref.patch (rev 0) +++ bash-4.3-test-nameref.patch 2014-03-01 03:10:24 UTC (rev 206515) @@ -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); + }