diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
| commit | 037bcb846a6662420bd0f5d1edaad58bda4c86a7 (patch) | |
| tree | 82494884d013c7b2cc9cd5df16c54cae0712d472 /core/bash | |
| parent | 830afd54d0d990fdb982292bed4c97f577dc195d (diff) | |
| parent | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/darkhttpd/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpicview/PKGBUILD
community/iftop/PKGBUILD
community/lazarus/PKGBUILD
community/netsurf/PKGBUILD
community/polkit-gnome/PKGBUILD
community/texvc/PKGBUILD
community/unbound/PKGBUILD
community/xfmedia/PKGBUILD
core/glibc/PKGBUILD
extra/arora/PKGBUILD
extra/cairo/PKGBUILD
extra/graphviz/PKGBUILD
extra/libmng/PKGBUILD
extra/mesa/PKGBUILD
extra/nx/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/sqlite/PKGBUILD
libre/midori-libre/PKGBUILD
~fauno/distccd-zeroconf/PKGBUILD
~fauno/kyotocabinet/PKGBUILD
~fauno/kyototycoon/PKGBUILD
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 |
2 files changed, 20 insertions, 4 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 5c6e0be11..5825ee0eb 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187018 2013-06-03 11:14:54Z allan $ +# $Id: PKGBUILD 193699 2013-08-28 09:22:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=045 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=4 +pkgrel=5 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,7 +21,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bash_profile dot.bash_logout system.bashrc - system.bash_logout) + system.bash_logout + bash-4.2-do-not-use-memcpy-on-overlapping-memory.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}) @@ -33,8 +34,10 @@ prepare() { for (( p=1; p<=$((10#${_patchlevel})); p++ )); do msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) + 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 } build() { @@ -81,6 +84,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '42f4400ed2314bd7519c020d0187edc5' '3546099a1b2f667adc9794f52e78e35b' '472f536d7c9e8250dc4568ec4cfaf294' + '9e55d01f2d9dda4a0c96031b25d19f45' '1100bc1dda2cdc06ac44d7e5d17864a3' 'SKIP' '30e7948079921d3261efcc6a40722135' 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 new file mode 100644 index 000000000..c621f0af8 --- /dev/null +++ b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch @@ -0,0 +1,12 @@ +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; |