[arch-commits] Commit in bash/trunk (2 files)

[Allan McRae]

    Date: Sunday, August 25, 2013 @ 14:12:27
  Author: allan
Revision: 193602

upgpkg: bash 4.2.045-5

fix memcpy usage - FS#36664

Added:
  bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
Modified:
  bash/trunk/PKGBUILD

--------------------------------------------------------+
 PKGBUILD                                               |   10 +++++++---
 bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-25 08:01:04 UTC (rev 193601)
+++ PKGBUILD	2013-08-25 12:12:27 UTC (rev 193602)
@@ -6,7 +6,7 @@
 _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')
 license=('GPL')
@@ -21,7 +21,8 @@
         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 @@
 
   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 @@
          '42f4400ed2314bd7519c020d0187edc5'
          '3546099a1b2f667adc9794f52e78e35b'
          '472f536d7c9e8250dc4568ec4cfaf294'
+         '9e55d01f2d9dda4a0c96031b25d19f45'
          '1100bc1dda2cdc06ac44d7e5d17864a3'
          'SKIP'
          '30e7948079921d3261efcc6a40722135'

Added: bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
===================================================================
--- bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch	                        (rev 0)
+++ bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch	2013-08-25 12:12:27 UTC (rev 193602)
@@ -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;