3.21.0-2 - Add valgrind-3.21.0-no-memcpy-replace-check.patch

valgrind-3.21.0-no-memcpy-replace-check.patch

@@ -0,0 +1,13 @@
+diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
+index b32f13f76..aa7f88ca2 100644
+--- a/shared/vg_replace_strmem.c
++++ b/shared/vg_replace_strmem.c
+@@ -1128,7 +1128,7 @@ static inline void my_exit ( int x )
+    MEMMOVE_OR_MEMCPY(20181, soname, fnname, 0)
+ 
+ #define MEMCPY(soname, fnname) \
+-   MEMMOVE_OR_MEMCPY(20180, soname, fnname, 1)
++   MEMMOVE_OR_MEMCPY(20180, soname, fnname, 0) /* See KDE bug #402833 */
+ 
+ #if defined(VGO_linux)
+  /* For older memcpy we have to use memmove-like semantics and skip

valgrind.spec

@@ -3,7 +3,7 @@
 Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
 Version: 3.21.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: https://www.valgrind.org/
@@ -83,6 +83,10 @@ Patch3: valgrind-3.16.0-some-stack-protector.patch
 # Add some -Wl,z,now.
 Patch4: valgrind-3.16.0-some-Wl-z-now.patch
 
+# Workaround https://bugs.kde.org/show_bug.cgi?id=402833
+# by disabling overlap checking for memcpy
+Patch5: valgrind-3.21.0-no-memcpy-replace-check.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -220,6 +224,8 @@ Valgrind User Manual for details.
 %patch4 -p1
 %endif
 
+%patch5 -p1
+
 %build
 # LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
 # configure time option, but that doesn't seem to help.
@@ -448,6 +454,9 @@ fi
 %endif
 
 %changelog
+* Fri May  5 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-2
+- Add valgrind-3.21.0-no-memcpy-replace-check.patch
+
 * Fri Apr 28 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-1
 - Upstream 3.21.0 final