diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-24 03:30:57 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-24 03:30:57 +0000 |
| commit | 431023a318e680258f02c1fb5fdca176c68e5cb7 (patch) | |
| tree | cedbdd37d2a93310636cf71c781041a2b5ee68a3 /core/bash | |
| parent | 0459e6459ee534bf22ab8a5381cd485e6035e9e2 (diff) | |
Thu Apr 24 03:25:33 UTC 2014
Diffstat (limited to 'core/bash')
| -rw-r--r-- | core/bash/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch | 12 | ||||
| -rw-r--r-- | core/bash/bash-4.3-debug-trap.patch | 30 | ||||
| -rw-r--r-- | core/bash/bash-4.3-test-nameref.patch | 25 |
4 files changed, 9 insertions, 70 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index facd6a1ac..8ee46db7c 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 209915 2014-04-08 15:23:40Z anatolik $ +# $Id: PKGBUILD 211713 2014-04-23 18:51:16Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.3 -_patchlevel=008 +_patchlevel=011 pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=1 pkgdesc='The GNU Bourne Again shell' arch=('i686' 'x86_64') license=('GPL') @@ -94,4 +94,10 @@ md5sums=('81348932d5da294953e15d4814c74dd1' 'dcf471d222bcd83283d3094e6ceeb6f8' 'SKIP' 'f7553416646dc26c266454c78a916d36' + 'SKIP' + '7e73d2151f4064b484a4ba2c4b09960e' + 'SKIP' + 'a275463d21735bb6d7161f9fbd320d8f' + 'SKIP' + 'c17103ee20420d77e46b224c8d3fceda' 'SKIP') diff --git a/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch deleted file mode 100644 index c621f0af8..000000000 --- a/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bash-4.2-orig/general.c bash-4.2/general.c ---- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000 -+++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000 -@@ -766,7 +766,7 @@ - *nbeg++ = '.'; - - nlen = nend - ntail; -- memcpy (nbeg, ntail, nlen); -+ memmove (nbeg, ntail, nlen); - nbeg[nlen] = '\0'; - - return name; diff --git a/core/bash/bash-4.3-debug-trap.patch b/core/bash/bash-4.3-debug-trap.patch deleted file mode 100644 index 8d0a73288..000000000 --- a/core/bash/bash-4.3-debug-trap.patch +++ /dev/null @@ -1,30 +0,0 @@ -*** ../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 deleted file mode 100644 index d64a3ccfa..000000000 --- a/core/bash/bash-4.3-test-nameref.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** ../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); - } |