[bash/f19] Patchlevel 47

[Ondrej Oprala]

commit f02e2a5f54085a4008787de5161dc09ad2b8fccf
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Tue Apr 15 09:50:17 2014 +0200

    Patchlevel 47

 bash.spec  |    7 ++++++-
 bash42-047 |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/bash.spec b/bash.spec
index 497f55c..b345a86 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,5 +1,5 @@
 #% define beta_tag rc2
-%define patchleveltag .46
+%define patchleveltag .47
 %define baseversion 4.2
 %bcond_without tests
 
@@ -66,6 +66,7 @@ Patch043: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-043
 Patch044: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-044
 Patch045: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-045
 Patch046: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-046
+Patch047: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-047
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -190,6 +191,7 @@ This package contains documentation files for %{name}.
 %patch044 -p0 -b .044
 %patch045 -p0 -b .045
 %patch046 -p0 -b .046
+%patch047 -p0 -b .047
 
 # Other patches
 %patch101 -p1 -b .security
@@ -410,6 +412,9 @@ end
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Apr 15 2014 Ondrej Oprala <ooprala at redhat.com> - 4.2.47-1
+- Patchlevel 47
+
 * Tue Apr 01 2014 Ondrej Oprala <ooprala at redhat.com> - 4.2.46-1
 - Patchlevel 46
 
diff --git a/bash42-047 b/bash42-047
new file mode 100644
index 0000000..65aff1c
--- /dev/null
+++ b/bash42-047
@@ -0,0 +1,49 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-047
+
+Bug-Reported-by:	Matthew Riley <mattdr at google.com>
+Bug-Reference-ID:	<CA+NEdkwP3gw+gbcF5+xnR1pvcuzb1mDVzvmuJOpHRGHA9T7VFg at mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2013-03/msg00047.html
+
+Bug-Description:
+
+The function that shortens pathnames for $PS1 according to the value of
+$PROMPT_DIRTRIM uses memcpy on potentially-overlapping regions of memory,
+when it should use memmove.  The result is garbled pathnames in prompt
+strings.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/general.c	2010-12-12 15:06:27.000000000 -0500
+--- general.c	2014-01-30 16:46:15.000000000 -0500
+***************
+*** 767,771 ****
+  
+    nlen = nend - ntail;
+!   memcpy (nbeg, ntail, nlen);
+    nbeg[nlen] = '\0';
+  
+--- 767,771 ----
+  
+    nlen = nend - ntail;
+!   memmove (nbeg, ntail, nlen);
+    nbeg[nlen] = '\0';
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 46
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 47
+  
+  #endif /* _PATCHLEVEL_H_ */