From a31be811198ba7ffc062fb0b6adeab610754a402 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Apr 02 2013 16:38:42 +0000
Subject: 3.8.1-13 add valgrind-3.8.1-regtest-fixlets.patch


---

diff --git a/valgrind-3.8.1-regtest-fixlets.patch b/valgrind-3.8.1-regtest-fixlets.patch
new file mode 100644
index 0000000..e8ee194
--- /dev/null
+++ b/valgrind-3.8.1-regtest-fixlets.patch
@@ -0,0 +1,55 @@
+commit 6f0b0c294b995df6c32edc75f90dfac3ad04114a
+Author: mjw <mjw@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Thu Mar 28 22:52:13 2013 +0000
+
+    memcheck/tests/strchr test should not depend on line numbers.
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13348 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/memcheck/tests/strchr.stderr.exp3 b/memcheck/tests/strchr.stderr.exp3
+index 9f90e69..e1832fa 100644
+--- a/memcheck/tests/strchr.stderr.exp3
++++ b/memcheck/tests/strchr.stderr.exp3
+@@ -1,9 +1,9 @@
+ Conditional jump or move depends on uninitialised value(s)
+-   at 0x........: __GI_strchr (mc_replace_strmem.c:211)
++   at 0x........: __GI_strchr (mc_replace_strmem.c:...)
+    by 0x........: main (strchr.c:15)
+ 
+ Conditional jump or move depends on uninitialised value(s)
+-   at 0x........: __GI_strchr (mc_replace_strmem.c:211)
++   at 0x........: __GI_strchr (mc_replace_strmem.c:...)
+    by 0x........: main (strchr.c:15)
+ 
+ Conditional jump or move depends on uninitialised value(s)
+diff --git a/memcheck/tests/strchr.vgtest b/memcheck/tests/strchr.vgtest
+index e914726..152c97e 100644
+--- a/memcheck/tests/strchr.vgtest
++++ b/memcheck/tests/strchr.vgtest
+@@ -1,2 +1,3 @@
+ prog: strchr
+ vgopts: -q
++stderr_filter_args: strchr.c
+
+commit 48b0ae338abe2dcd726e1733532a971837049ceb
+Author: mjw <mjw@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Thu Mar 28 22:52:14 2013 +0000
+
+    For memcheck overlap filter_memcpy str[n]cpy and __GI_str[n]cpy are equal.
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13349 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/memcheck/tests/filter_memcpy b/memcheck/tests/filter_memcpy
+index 47741ba..737304c 100755
+--- a/memcheck/tests/filter_memcpy
++++ b/memcheck/tests/filter_memcpy
+@@ -1,5 +1,8 @@
+ #! /bin/sh
+ 
+ # mc_replace_strmem.c intercepts various memcpy glibc versions.
++# mc_replace_strmem.c str[n]cpy and __GI_str[n]cpy are the same.
+ ./filter_stderr "$@" |
+-perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/"
++perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/" |
++sed -e "s/: __GI_strcpy (mc_replace_strmem.c:/: strcpy (mc_replace_strmem.c:/" |
++sed -e "s/: __GI_strncpy (mc_replace_strmem.c:/: strncpy (mc_replace_strmem.c:/"
diff --git a/valgrind.spec b/valgrind.spec
index 6f20a18..9c506c3 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -153,6 +153,9 @@ Patch37: valgrind-3.8.1-manpages.patch
 # KDE#317091 Use -Wl,-Ttext-segment when static linking to keep build-ids
 Patch38: valgrind-3.8.1-text-segment.patch
 
+# svn revisions 13348 and 13349
+Patch39: valgrind-3.8.1-regtest-fixlets.patch
+
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -286,6 +289,7 @@ touch ./memcheck/tests/linux/getregset.stderr.exp
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 
 # To suppress eventual automake warnings/errors
 rm -f gdbserver_tests/filter_gdb.orig
@@ -439,6 +443,7 @@ echo ===============END TESTING===============
 - Fix quoting in valgrind valgrind-3.8.1-enable-armv5.patch and
   remove arm configure hunk from valgrind-3.8.1-text-segment.patch #947440
 - Replace valgrind-3.8.1-text-segment.patch with upstream variant.
+- Add valgrind-3.8.1-regtest-fixlets.patch.
 
 * Wed Mar 20 2013 Mark Wielaard <mjw@redhat.com> 3.8.1-12
 - Add valgrind-3.8.1-text-segment.patch