diff --git a/valgrind-3.10.1-mempcpy.patch b/valgrind-3.10.1-mempcpy.patch new file mode 100644 index 0000000..aff3d23 --- /dev/null +++ b/valgrind-3.10.1-mempcpy.patch @@ -0,0 +1,20 @@ +commit a7abe3d4ad8757a65b53230755a12b9ae5e79ffa +Author: mjw +Date: Tue Jan 13 16:10:20 2015 +0000 + + BZ #342795 Internal glibc __GI_mempcpy call should be intercepted. + + git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14866 a5019735-40e9-0310-863c-91ae7b9d1cf9 + +diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c +index 4ca652b..5203306 100644 +--- a/shared/vg_replace_strmem.c ++++ b/shared/vg_replace_strmem.c +@@ -1363,6 +1363,7 @@ static inline void my_exit ( int x ) + + #if defined(VGO_linux) + GLIBC25_MEMPCPY(VG_Z_LIBC_SONAME, mempcpy) ++ GLIBC25_MEMPCPY(VG_Z_LIBC_SONAME, __GI_mempcpy) + GLIBC25_MEMPCPY(VG_Z_LD_SO_1, mempcpy) /* ld.so.1 */ + GLIBC25_MEMPCPY(VG_Z_LD_LINUX_SO_3, mempcpy) /* ld-linux.so.3 */ + GLIBC25_MEMPCPY(VG_Z_LD_LINUX_X86_64_SO_2, mempcpy) /* ld-linux-x86-64.so.2 */ diff --git a/valgrind.spec b/valgrind.spec index b047ec3..ad733fe 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -3,7 +3,7 @@ Summary: Tool for finding memory management bugs in programs Name: %{?scl_prefix}valgrind Version: 3.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.valgrind.org/ @@ -58,6 +58,9 @@ Patch3: valgrind-3.9.0-stat_h.patch # Make ld.so supressions slightly less specific. Patch4: valgrind-3.9.0-ldso-supp.patch +# KDE#342795 Internal glibc __GI_mempcpy call should be intercepted +Patch5: valgrind-3.10.1-mempcpy.patch + %if %{build_multilib} # 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 @@ -160,6 +163,7 @@ Valgrind User Manual for details. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # We need to use the software collection compiler and binutils if available. @@ -308,6 +312,9 @@ echo ===============END TESTING=============== %endif %changelog +* Tue Jan 13 2015 Mark Wielaard - 3.10.1-2 +- Add valgrind-3.10.1-mempcpy.patch. + * Wed Nov 26 2014 Mark Wielaard - 3.10.1-1 - Upgrade to 3.10.1 final.