From 423b91df66ef58fb8cf1609dd3e3084a84426610 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Tue, 25 Sep 2012 09:46:21 +0200
Subject: [PATCH] Add valgrind-3.8.1-overlap_memcpy_filter.patch (KDE#307290)

---
 valgrind-3.8.1-overlap_memcpy_filter.patch | 39 ++++++++++++++++++++++
 valgrind.spec                              |  7 ++++
 2 files changed, 46 insertions(+)
 create mode 100644 valgrind-3.8.1-overlap_memcpy_filter.patch

diff --git a/valgrind-3.8.1-overlap_memcpy_filter.patch b/valgrind-3.8.1-overlap_memcpy_filter.patch
new file mode 100644
index 0000000..fe92d92
--- /dev/null
+++ b/valgrind-3.8.1-overlap_memcpy_filter.patch
@@ -0,0 +1,39 @@
+--- valgrind/memcheck/tests/filter_memcpy	(revision 0)
++++ valgrind/memcheck/tests/filter_memcpy	(working copy)
+@@ -0,0 +1,5 @@
++#! /bin/sh
++
++# mc_replace_strmem.c intercepts various memcpy glibc versions.
++./filter_stderr "$@" |
++perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/"
+
+--- valgrind/memcheck/tests/overlap.vgtest	(revision 13010)
++++ valgrind/memcheck/tests/overlap.vgtest	(working copy)
+@@ -1,2 +1,3 @@
+ prog: overlap
+ vgopts: -q
++stderr_filter: filter_memcpy
+--- valgrind/memcheck/tests/Makefile.am	2012-09-25 10:02:30.798819187 +0200
++++ valgrind/memcheck/tests/Makefile.am	2012-09-25 10:03:00.358251560 +0200
+@@ -44,7 +44,8 @@
+ 	filter_leak_cases_possible \
+ 	filter_stderr filter_xml \
+ 	filter_varinfo3 \
+-	filter_memcheck
++	filter_memcheck \
++	filter_memcpy
+ 
+ noinst_HEADERS = leak.h
+ 
+--- valgrind/memcheck/tests/Makefile.in	2012-09-25 10:02:30.797819171 +0200
++++ valgrind/memcheck/tests/Makefile.in	2012-09-25 10:03:28.620664967 +0200
+@@ -971,7 +971,8 @@
+ 	filter_leak_cases_possible \
+ 	filter_stderr filter_xml \
+ 	filter_varinfo3 \
+-	filter_memcheck
++	filter_memcheck \
++	filter_memcpy
+ 
+ noinst_HEADERS = leak.h
+ EXTRA_DIST = \
diff --git a/valgrind.spec b/valgrind.spec
index 9a0d5fd..ea3d093 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -63,6 +63,10 @@ Patch15: valgrind-3.8.1-x86_amd64_features-avx.patch
 # This is only a real issue when glibc-debuginfo is installed.
 Patch16: valgrind-3.8.1-gdbserver_tests-syscall-template-source.patch
 
+# KDE#307290 - memcheck overlap testcase needs memcpy version filter
+Patch17: valgrind-3.8.1-overlap_memcpy_filter.patch
+# Note: Need to make memcheck/tests/filter_memcpy executable
+
 
 # KDE#305728 - Add support for AVX2, BMI1, BMI2 and FMA instructions 
 # Combined patch for:
@@ -202,6 +206,8 @@ for details.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+chmod 755 memcheck/tests/filter_memcpy
 
 # Add support for AVX2, BMI1, BMI2 and FMA instructions
 %patch21 -p1
@@ -340,6 +346,7 @@ echo ===============END TESTING===============
 * Tue Sep 25 2012 Mark Wielaard <mjw@redhat.com>
 - Add valgrind-3.8.1-x86_amd64_features-avx.patch (KDE#307285)
 - Add valgrind-3.8.1-gdbserver_tests-syscall-template-source.patch (KDE#307155)
+- Add valgrind-3.8.1-overlap_memcpy_filter.patch (KDE#307290)
 
 * Fri Sep 20 2012 Mark Wielaard <mjw@redhat.com> 3.8.1-2
 - Add valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch