8 changed files with 606 additions and 235 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/valgrind-3.22.0.tar.bz2
+SOURCES/valgrind-3.19.0.tar.bz2
--- a/.valgrind.metadata
+++ b/.valgrind.metadata
@ -0,0 +1 @@
+294c341b421b4d9534e42e8125f509c148f48c17 SOURCES/valgrind-3.19.0.tar.bz2
--- a/SOURCES/valgrind-3.16.0-some-Wl-z-now.patch
+++ b/SOURCES/valgrind-3.16.0-some-Wl-z-now.patch
@ -35,6 +35,19 @@ index 1b7842b..e211eec 100644
 if HAVE_DLINFO_RTLD_DI_TLS_MODID
 getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
 endif
+diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
+index f572741..1c07e50 100644
+--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
+@@ -27,7 +27,7 @@ cg_merge_SOURCES = cg_merge.c
+ cg_merge_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
+ cg_merge_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
+ cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+-cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI)
+cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI) -Wl,-z,now
+ # If there is no secondary platform, and the platforms include x86-darwin,
+ # then the primary platform must be x86-darwin.  Hence:
+ if ! VGCONF_HAVE_PLATFORM_SEC
 diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
 index 3c73210..fb6b7bb 100644
 --- a/coregrind/Makefile.am
@ -48,8 +61,8 @@ index 3c73210..fb6b7bb 100644
 # If there is no secondary platform, and the platforms include x86-darwin,
 # then the primary platform must be x86-darwin.  Hence:
 if ! VGCONF_HAVE_PLATFORM_SEC
-@@ -104,7 +104,7 @@
- vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
+@@ -96,7 +96,7 @@ endif
+ vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
 vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
 vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
 -vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
--- a/SOURCES/valgrind-3.16.0-some-stack-protector.patch
+++ b/SOURCES/valgrind-3.16.0-some-stack-protector.patch
@ -35,6 +35,19 @@ index 56cc5ef..1b7842b 100644
 getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
 getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
 if HAVE_DLINFO_RTLD_DI_TLS_MODID
+diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
+index f8447a1..f572741 100644
+--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
+@@ -25,7 +25,7 @@ bin_PROGRAMS = cg_merge
+ 
+ cg_merge_SOURCES = cg_merge.c
+ cg_merge_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
+-cg_merge_CFLAGS    = $(AM_CFLAGS_PRI)
+cg_merge_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
+ cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+ cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI)
+ # If there is no secondary platform, and the platforms include x86-darwin,
 diff --git a/configure.ac b/configure.ac
 index f8c798b..ccc8f52 100755
 --- a/configure.ac
@ -94,10 +107,10 @@ index 94030fd..3c73210 100644
 valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
 valgrind_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
 # If there is no secondary platform, and the platforms include x86-darwin,
-@@ -102,7 +102,7 @@
+@@ -94,7 +94,7 @@ vgdb_SOURCES += vgdb-invoker-solaris.c
 endif
 
- vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
+ vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
 -vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
 +vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
 vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
--- a/SOURCES/valgrind-3.19.0-ld-so-strncmp.patch
+++ b/SOURCES/valgrind-3.19.0-ld-so-strncmp.patch
@ -0,0 +1,25 @@
+commit 947388eb043ea1c44b37df94046e1eee790ad776
+Author: Mike Crowe <mac@mcrowe.com>
+Date:   Mon Sep 9 14:16:16 2019 +0100
+
+    Intercept strncmp for glibc ld.so v2.28+
+    
+    In glibc 5aad5f617892e75d91d4c8fb7594ff35b610c042 (first released in
+    v2.28) a call to strncmp was added to dl-load.c:is_dst. This causes
+    valgrind to complain about glibc's highly-optimised strncmp performing
+    sixteen-byte reads on short strings in ld.so. Let's intercept strncmp in
+    ld.so too so we use valgrind's simple version to avoid this problem.
+
+diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
+index 3b42b3a87..5396e83be 100644
+--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
+@@ -710,6 +710,8 @@ static inline void my_exit ( int x )
+  STRNCMP(VG_Z_LIBC_SONAME, __GI_strncmp)
+  STRNCMP(VG_Z_LIBC_SONAME, __strncmp_sse2)
+  STRNCMP(VG_Z_LIBC_SONAME, __strncmp_sse42)
+ STRNCMP(VG_Z_LD_LINUX_SO_2, strncmp)
+ STRNCMP(VG_Z_LD_LINUX_X86_64_SO_2, strncmp)
+ 
+ #elif defined(VGO_freebsd)
+  STRNCMP(VG_Z_LIBC_SONAME, strncmp)
--- a/SOURCES/valgrind-3.19.0-s390x-memmem.patch
+++ b/SOURCES/valgrind-3.19.0-s390x-memmem.patch
@ -0,0 +1,231 @@
+From 42ca1c480a5bca408a54c6a24d2be2c081d121ac Mon Sep 17 00:00:00 2001
+From: Andreas Arnez <arnez@linux.ibm.com>
+Date: Thu, 19 May 2022 13:54:06 +0200
+Subject: [PATCH] Bug 454040 - Add intercept for memmem on s390x
+
+Since memcheck may report false positives in an optimized version of memmem on
+s390x, add an intercept for memmem on s390x platforms.
+---
+ shared/vg_replace_strmem.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
+index 5396e83be..d28e74206 100644
+--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
+@@ -103,6 +103,7 @@
+    20430 WMEMCHR
+    20440 WCSNLEN
+    20450 WSTRNCMP
+   20460 MEMMEM
+ */
+ 
+ #if defined(VGO_solaris)
+@@ -1785,6 +1786,41 @@ static inline void my_exit ( int x )
+ 
+ #endif
+ 
+/*---------------------- memmem ----------------------*/
+
+#define MEMMEM(soname, fnname) \
+   void* VG_REPLACE_FUNCTION_EZU(20460,soname,fnname) \
+         (const void* haystack, SizeT hlen, const void* needle, SizeT nlen); \
+   void* VG_REPLACE_FUNCTION_EZU(20460,soname,fnname) \
+         (const void* haystack, SizeT hlen, const void* needle, SizeT nlen) \
+   { \
+      const HChar* h = haystack; \
+      const HChar* n = needle; \
+      \
+      /* If the needle is the empty string, match immediately. */ \
+      if (nlen == 0) return CONST_CAST(void *,h); \
+      \
+      HChar n0 = n[0]; \
+      \
+      for (; hlen >= nlen; hlen--, h++) { \
+         if (h[0] != n0) continue; \
+         \
+         UWord i; \
+         for (i = 1; i < nlen; i++) { \
+            if (n[i] != h[i]) \
+               break; \
+         } \
+         if (i == nlen) \
+           return CONST_CAST(HChar *,h); \
+         \
+      } \
+      return NULL; \
+   }
+
+#if defined(VGP_s390x_linux)
+ MEMMEM(VG_Z_LIBC_SONAME,          memmem)
+#endif
+
+ 
+ /*---------------------- strpbrk ----------------------*/
+ 
+-- 
+2.31.1
+
+From 4d675f309bcd2d4e9e2b9e6f4aba30f85116bb9b Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Thu, 19 May 2022 18:08:40 -0400
+Subject: [PATCH] Add memmem memcheck tests
+
+---
+ memcheck/tests/Makefile.am       |  3 ++
+ memcheck/tests/filter_memmem     |  5 ++
+ memcheck/tests/memmem.c          | 81 ++++++++++++++++++++++++++++++++
+ memcheck/tests/memmem.stderr.exp |  2 +
+ memcheck/tests/memmem.vgtest     |  3 ++
+ 5 files changed, 94 insertions(+)
+ create mode 100755 memcheck/tests/filter_memmem
+ create mode 100644 memcheck/tests/memmem.c
+ create mode 100644 memcheck/tests/memmem.stderr.exp
+ create mode 100644 memcheck/tests/memmem.vgtest
+
+diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
+index eb9487272..4d181c1ac 100644
+--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
+@@ -79,6 +79,7 @@ dist_noinst_SCRIPTS = \
+ 	filter_strchr \
+ 	filter_varinfo3 \
+ 	filter_memcheck \
+	filter_memmem \
+ 	filter_overlaperror \
+ 	filter_malloc_free \
+         filter_sized_delete
+@@ -220,6 +221,7 @@ EXTRA_DIST = \
+ 	memalign2.stderr.exp memalign2.vgtest \
+ 	memcmptest.stderr.exp memcmptest.stderr.exp2 \
+ 	memcmptest.stdout.exp memcmptest.vgtest \
+	memmem.stderr.exp memmem.vgtest \
+ 	mempool.stderr.exp mempool.vgtest \
+ 	mempool2.stderr.exp mempool2.vgtest \
+ 	metadata.stderr.exp metadata.stdout.exp metadata.vgtest \
+@@ -417,6 +419,7 @@ check_PROGRAMS = \
+ 	malloc_usable malloc1 malloc2 malloc3 manuel1 manuel2 manuel3 \
+ 	match-overrun \
+ 	memalign_test memalign2 memcmptest mempool mempool2 mmaptest \
+	memmem \
+ 	mismatches new_override metadata \
+ 	nanoleak_supp nanoleak2 new_nothrow \
+ 	noisy_child \
+diff --git a/memcheck/tests/filter_memmem b/memcheck/tests/filter_memmem
+new file mode 100755
+index 000000000..f4a40b2d1
+--- /dev/null
+++ b/memcheck/tests/filter_memmem
+@@ -0,0 +1,5 @@
+#! /bin/sh
+
+# Too many memmem implementations and overrides.
+# So just keep the main file lines.
+./filter_stderr "$@" | grep " main (memmem.c:"
+diff --git a/memcheck/tests/memmem.c b/memcheck/tests/memmem.c
+new file mode 100644
+index 000000000..d627076e3
+--- /dev/null
+++ b/memcheck/tests/memmem.c
+@@ -0,0 +1,81 @@
+#define _GNU_SOURCE
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* mallocs an mem block and fills it with A. A needs to be a zero
+   terminated string. The A string chars, minus the terminating zero
+   are copied into the returned mem block.  */
+static void *
+create_mem (const char *a)
+{
+  size_t len = strlen (a);
+  void *mem = malloc (len);
+  memcpy (mem, a, len);
+  return mem;
+}
+
+int
+main ()
+{
+  char *haystack;
+  char *needle;
+
+  haystack = create_mem ("a");
+  needle = create_mem ("a");
+  assert (memmem (haystack, 0, needle, 0) == haystack);
+  assert (memmem (haystack, 1, needle, 0) == haystack);
+  assert (memmem (haystack, 0, needle, 1) == NULL);
+  assert (memmem (haystack, 1, needle, 1) == haystack);
+  free (haystack);
+  free (needle);
+
+  haystack = create_mem ("abc");
+  needle = create_mem ("bc");
+  assert (memmem (haystack, 3, needle, 0) == haystack);
+  assert (memmem (haystack, 3, needle, 2) == haystack + 1);
+  assert (memmem (haystack + 1, 2, needle, 2) == haystack + 1);
+  assert (memmem (haystack + 2, 1, needle, 2) == NULL);
+  free (haystack);
+  free (needle);
+
+  haystack = create_mem ("abcabcabc");
+  needle = create_mem ("bca");
+  assert (memmem (haystack, 9, needle, 3) == haystack + 1);
+  free (haystack);
+  free (needle);
+
+  haystack = create_mem ("abcabcabc");
+  needle = create_mem ("bcad");
+  assert (memmem (haystack, 9, needle, 4) == NULL);
+  free (haystack);
+  free (needle);
+
+  haystack = create_mem ("xxxxxxxxxxxxxxxxxABC");
+  needle = create_mem ("ABCD");
+  assert (memmem (haystack, 20, needle, 2) == haystack + 17);
+  assert (memmem (haystack + 3, 17, needle, 2) == haystack + 17);
+  assert (memmem (haystack + 15, 5, needle, 2) == haystack + 17);
+  assert (memmem (haystack, 20, needle, 3) == haystack + 17);
+  assert (memmem (haystack + 3, 17, needle, 3) == haystack + 17);
+  assert (memmem (haystack + 15, 5, needle, 3) == haystack + 17);
+  assert (memmem (haystack, 20, needle, 4) == NULL);
+  assert (memmem (haystack + 3, 5, needle, 4) == NULL);
+  assert (memmem (haystack + 15, 5, needle, 4) == NULL);
+  free (haystack);
+  free (needle);
+
+  haystack = malloc (1);
+  needle = create_mem ("a");
+  assert (memmem (haystack, 1, needle, 1) == NULL);
+  free (haystack);
+  free (needle);
+
+  haystack = create_mem ("A");
+  needle = malloc (1);
+  assert (memmem (haystack, 1, needle, 1) == NULL);
+  free (haystack);
+  free (needle);
+
+  return 0;
+}
+diff --git a/memcheck/tests/memmem.stderr.exp b/memcheck/tests/memmem.stderr.exp
+new file mode 100644
+index 000000000..b4612fbd4
+--- /dev/null
+++ b/memcheck/tests/memmem.stderr.exp
+@@ -0,0 +1,2 @@
+   by 0x........: main (memmem.c:70)
+   by 0x........: main (memmem.c:76)
+diff --git a/memcheck/tests/memmem.vgtest b/memcheck/tests/memmem.vgtest
+new file mode 100644
+index 000000000..6d12895df
+--- /dev/null
+++ b/memcheck/tests/memmem.vgtest
+@@ -0,0 +1,3 @@
+prog: memmem
+vgopts: -q
+stderr_filter: filter_memmem
+-- 
+2.18.4
+
--- a/SOURCES/valgrind-3.22.0-rodata.patch
+++ b/SOURCES/valgrind-3.22.0-rodata.patch
@ -1,122 +0,0 @@
-commit 1d00e5ce0fb069911c4b525ec38289fb5d9021b0
-Author: Paul Floyd <pjfloyd@wanadoo.fr>
-Date:   Sat Nov 18 08:49:34 2023 +0100
-
-    Bug 476548 - valgrind 3.22.0 fails on assertion when loading debuginfo file produced by mold
-    
-    (cherry picked from commit 9ea4ae66707a4dcc6f4328e11911652e4418c585)
-
-diff --git a/coregrind/m_debuginfo/image.c b/coregrind/m_debuginfo/image.c
-index 02e509071..445f95555 100644
--- a/coregrind/m_debuginfo/image.c
-+++ b/coregrind/m_debuginfo/image.c
-@@ -1221,6 +1221,20 @@ Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2)
-    }
- }
- 
-+Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n)
-+{
-+   ensure_valid(img, off1, 1, "ML_(img_strcmp_c)");
-+   while (n) {
-+      UChar c1 = get(img, off1);
-+      UChar c2 = *(const UChar*)str2;
-+      if (c1 < c2) return -1;
-+      if (c1 > c2) return 1;
-+      if (c1 == 0) return 0;
-+      off1++; str2++; --n;
-+   }
-+   return 0;
-+}
-+
- UChar ML_(img_get_UChar)(DiImage* img, DiOffT offset)
- {
-    ensure_valid(img, offset, 1, "ML_(img_get_UChar)");
-diff --git a/coregrind/m_debuginfo/priv_image.h b/coregrind/m_debuginfo/priv_image.h
-index a49846f14..c91e49f01 100644
--- a/coregrind/m_debuginfo/priv_image.h
-+++ b/coregrind/m_debuginfo/priv_image.h
-@@ -115,6 +115,10 @@ Int ML_(img_strcmp)(DiImage* img, DiOffT off1, DiOffT off2);
-    cast to HChar before comparison. */
- Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2);
- 
-+/* Do strncmp of a C string in the image vs a normal one.  Chars are
-+   cast to HChar before comparison. */
-+Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n);
-+
- /* Do strlen of a C string in the image. */
- SizeT ML_(img_strlen)(DiImage* img, DiOffT off);
- 
-diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
-index fb64ed976..46f8c8343 100644
--- a/coregrind/m_debuginfo/readelf.c
-+++ b/coregrind/m_debuginfo/readelf.c
-@@ -2501,8 +2501,7 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di )
-             di->rodata_avma += inrw1->bias;
-             di->rodata_bias = inrw1->bias;
-             di->rodata_debug_bias = inrw1->bias;
-         }
-         else {
-+         } else {
-             BAD(".rodata");  /* should not happen? */
-          }
-          di->rodata_present = True;
-@@ -2977,6 +2976,46 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di )
-    return retval;
- }
- 
-+static void find_rodata(Word i, Word shnum, DiImage* dimg, struct _DebugInfo* di, DiOffT shdr_dioff,
-+                        UWord shdr_dent_szB, DiOffT shdr_strtab_dioff, PtrdiffT rw_dbias)
-+{
-+   ElfXX_Shdr a_shdr;
-+   ElfXX_Shdr a_extra_shdr;
-+   ML_(img_get)(&a_shdr, dimg,
-+                INDEX_BIS(shdr_dioff, i, shdr_dent_szB),
-+                sizeof(a_shdr));
-+   if (di->rodata_present &&
-+       0 == ML_(img_strcmp_c)(dimg, shdr_strtab_dioff
-+                                    + a_shdr.sh_name, ".rodata")) {
-+      Word sh_size = a_shdr.sh_size;
-+      Word j;
-+      Word next_addr = a_shdr.sh_addr + a_shdr.sh_size;
-+      for (j = i  + 1; j < shnum; ++j) {
-+         ML_(img_get)(&a_extra_shdr, dimg,
-+                      INDEX_BIS(shdr_dioff, j, shdr_dent_szB),
-+                      sizeof(a_shdr));
-+         if (0 == ML_(img_strcmp_n)(dimg, shdr_strtab_dioff
-+                                             + a_extra_shdr.sh_name, ".rodata", 7)) {
-+            if (a_extra_shdr.sh_addr ==
-+                VG_ROUNDUP(next_addr, a_extra_shdr.sh_addralign)) {
-+               sh_size = VG_ROUNDUP(sh_size, a_extra_shdr.sh_addralign) + a_extra_shdr.sh_size;
-+            }
-+            next_addr = a_extra_shdr.sh_addr + a_extra_shdr.sh_size;
-+         } else {
-+            break;
-+         }
-+      }
-+      vg_assert(di->rodata_size == sh_size);
-+      vg_assert(di->rodata_avma +  a_shdr.sh_addr + rw_dbias);
-+      di->rodata_debug_svma = a_shdr.sh_addr;
-+      di->rodata_debug_bias = di->rodata_bias +
-+                             di->rodata_svma - di->rodata_debug_svma;
-+      TRACE_SYMTAB("acquiring .rodata  debug svma = %#lx .. %#lx\n",
-+                   di->rodata_debug_svma,
-+                   di->rodata_debug_svma + di->rodata_size - 1);
-+      TRACE_SYMTAB("acquiring .rodata debug bias = %#lx\n", (UWord)di->rodata_debug_bias);
-+   }
-+}
- Bool ML_(read_elf_debug) ( struct _DebugInfo* di )
- {
-    Word     i, j;
-@@ -3391,7 +3430,11 @@ Bool ML_(read_elf_debug) ( struct _DebugInfo* di )
-             FIND(text,   rx)
-             FIND(data,   rw)
-             FIND(sdata,  rw)
-            FIND(rodata, rw)
-+            // https://bugs.kde.org/show_bug.cgi?id=476548
-+            // special handling for rodata as adjacent
-+            // rodata sections may have been merged in ML_(read_elf_object)
-+            //FIND(rodata, rw)
-+            find_rodata(i, ehdr_dimg.e_shnum, dimg, di, shdr_dioff, shdr_dent_szB, shdr_strtab_dioff, rw_dbias);
-             FIND(bss,    rw)
-             FIND(sbss,   rw)
- 
--- a/SPECS/valgrind.spec
+++ b/SPECS/valgrind.spec
@ -2,12 +2,13 @@

 Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
-Version: 3.22.0
-Release: 2%{?dist}
+Version: 3.19.0
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: https://www.valgrind.org/
-Group: Development/Debuggers
+
+# Only necessary for RHEL, will be ignored on Fedora

 # Are we building for a Software Collection?
 %{?scl:%global is_scl 1}
@ -16,17 +17,12 @@ Group: Development/Debuggers
 # We never want the openmpi subpackage when building a software collecton.
 # We always want it for fedora.
 # We only want it for older rhel. But not s390x for too old rhel.
-# And on fedora > 39 i386 dropped openmpi.
 %if %{is_scl}
  %global build_openmpi 0
 %else
  %if 0%{?fedora}
-    %ifarch %{ix86}
-      %global build_openmpi (%{?fedora} < 40)
-    %else
    %global build_openmpi 1
  %endif
-  %endif
  %if 0%{?rhel}
    %if 0%{?rhel} > 7
      %global build_openmpi 0
@ -89,9 +85,11 @@ Patch3: valgrind-3.16.0-some-stack-protector.patch
 # Add some -Wl,z,now.
 Patch4: valgrind-3.16.0-some-Wl-z-now.patch

-# valgrind 3.22.0 fails on assertion when loading debuginfo
-# https://bugs.kde.org/show_bug.cgi?id=476548
-Patch5: valgrind-3.22.0-rodata.patch
+# KDE#434764 # iconv_open causes ld.so v2.28+ to execute optimised strncmp
+Patch5: valgrind-3.19.0-ld-so-strncmp.patch
+
+# KDE#454040 s390x: False-positive memcheck:cond in memmem on arch13 systems
+Patch6: valgrind-3.19.0-s390x-memmem.patch

 BuildRequires: make
 BuildRequires: glibc-devel
@ -125,16 +123,11 @@ BuildRequires: docbook-dtds

 # For testing debuginfod-find
 %if 0%{?fedora} > 29 || 0%{?rhel} > 7
-BuildRequires: elfutils-debuginfod
 BuildRequires: elfutils-debuginfod-client
 # For using debuginfod at runtime
 Recommends: elfutils-debuginfod-client
 %endif

-# Some of the python scripts require python 3.9+
-BuildRequires: python3.11
-BuildRequires: python3.11-rpm-macros
-
 %{?scl:Requires:%scl_runtime}

 # We need to fixup selinux file context when doing a scl build.
@ -197,7 +190,6 @@ profiler (callgrind), and a heap profiler (massif).

 %package devel
 Summary: Development files for valgrind aware programs
-Group: Development/Debuggers
 Requires: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release}

 %description devel
@ -206,7 +198,6 @@ Header files and libraries for development of valgrind aware programs.
 %if %{build_tools_devel}
 %package tools-devel
 Summary: Development files for building valgrind tools.
-Group: Development/Debuggers
 Requires: %{?scl_prefix}valgrind-devel = %{epoch}:%{version}-%{release}
 Provides: %{name}-static = %{epoch}:%{version}-%{release}

@ -217,7 +208,6 @@ Header files and libraries for development of valgrind tools.
 %if %{build_openmpi}
 %package openmpi
 Summary: OpenMPI support for valgrind
-Group: Development/Debuggers
 Requires: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release}

 %description openmpi
@ -229,18 +219,23 @@ Valgrind User Manual for details.
 %prep
 %setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}

-%patch -P1 -p1
-%patch -P2 -p1
+%patch1 -p1
+%patch2 -p1

 # Old rhel gcc doesn't have -fstack-protector-strong.
 %if 0%{?fedora} || 0%{?rhel} >= 7
-%patch -P3 -p1
-%patch -P4 -p1
+%patch3 -p1
+%patch4 -p1
 %endif

-%patch -P5 -p1
+%patch5 -p1
+%patch6 -p1

 %build
+# LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
+# configure time option, but that doesn't seem to help.
+# Disable LTO for now.
+%define _lto_cflags %{nil}

 # Some patches (might) touch Makefile.am or configure.ac files.
 # Just always autoreconf so we don't need patches to prebuild files.
@ -304,14 +299,13 @@ export LDFLAGS
 %configure \
  --with-mpicc=%{mpiccpath} \
  %{only_arch} \
-  GDB=%{_bindir}/gdb \
-  --without-gdbscripts-dir
+  GDB=%{_bindir}/gdb

-make %{?_smp_mflags}
+%make_build

 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 mkdir docs/installed
 mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs/installed/
 rm -f docs/installed/*.ps
@ -373,7 +367,7 @@ cat /proc/cpuinfo
 %{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
 # Make sure no extra CFLAGS, CXXFLAGS or LDFLAGS leak through,
 # the testsuite sets all flags necessary. See also configure above.
-make %{?_smp_mflags} CFLAGS="" CXXFLAGS="" LDFLAGS="" check
+%make_build CFLAGS="" CXXFLAGS="" LDFLAGS="" check

 # Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1434601
 # for gdbserver tests.
@ -427,7 +421,6 @@ echo ===============END TESTING===============
 %files devel
 %dir %{_includedir}/valgrind
 %{_includedir}/valgrind/valgrind.h
-%{_includedir}/valgrind/cachegrind.h
 %{_includedir}/valgrind/callgrind.h
 %{_includedir}/valgrind/drd.h
 %{_includedir}/valgrind/helgrind.h
@ -466,44 +459,23 @@ fi
 %endif

 %changelog
-* Wed Dec  6 2023 Mark Wielaard <mjw@redhat.com> - 3.22.0-2
- Add valgrind-3.22.0-rodata.patch
-
-* Fri Nov  3 2023 Mark Wielaard <mjw@redhat.com> - 3.22.0-1
- Upstream 3.22.0 final
- BuildRequires elfutils-debuginfod for testing
- Remove all upstreamed patches
- Adjust valgrind-3.16.0-some-stack-protector.patch
- Adjust valgrind-3.16.0-some-Wl-z-now.patch
- Add cachegrind.h to valgrind-devel package
- Use %%patch -Pn instead of deprecated %%patchn
-
-* Tue Jun 27 2023 Mark Wielaard <mjw@redhat.com> - 3.21.0-8
- BuildRequire python3.11
-
-* Fri Jun 23 2023 Mark Wielaard <mjw@redhat.com> - 3.21.0-7
- Add valgrind-3.21.0-callgrind_control-no-strict.patch
- Add valgrind-3.21.0-realloc-again.patch
- Update valgrind-3.21.0-no-memcpy-replace-check.patch (memcpy_chk)
- Add valgrind-3.21.0-vgm.patch and valgrind-3.21.0-vgm-tests.patch
- Add valgrind-3.21.0-pgste.patch
-
-* Tue May 16 2023 Alexandra Hájková <ahajkova@redhat.com> - 3.21.0-3
- Add valgrind-3.21.0-Add-with-gdbscripts-dir.patch
-
-* Fri May  5 2023 Mark Wielaard <mjw@redhat.com> - 3.21.0-2
- Upgrade to upstream 3.21.0
- Remove upstreamed patches
- Add valgrind-3.21.0-no-memcpy-replace-check.patch
+* Wed May 25 2022 Mark Wielaard <mjw@redhat.com> - 3.19.0-3
+- Add valgrind-3.19.0-s390x-memmem.patch
+- Add valgrind-3.19.0-ld-so-strncmp.patch

 * Tue Apr 19 2022 Mark Wielaard <mjw@redhat.com> - 3.19.0-1
 - Upgrade to valgrind 3.19.0. Drop old patches.

-* Thu Feb 10 2022 Mark Wielaard <mjw@redhat.com> - 3.18.1-7
+* Thu Feb 10 2022 Mark Wielaard <mjw@redhat.com> - 3.18.1-9
 - Add valgrind-3.18.1-arm64-atomics-rdm.patch

-* Tue Nov 30 2021 Mark Wielaard <mjw@redhat.com> - 3.18.1-6
- Rebuild against fresh toolchain
+* Thu Jan 13 2022 Mark Wielaard <mjw@redhat.com> - 3.18.1-8
+- Add valgrind-3.18.1-ppc-hwcaps.patch
+- Add valgrind-3.18.1-s390x-wflrx.patch
+
+* Tue Dec 14 2021 Mark Wielaard <mjw@redhat.com> - 3.18.1-6
+- Add valgrind-3.18.1-rseq-enosys.patch
+- Add valgrind-3.18.1-s390x-vdso.patch

 * Wed Nov 24 2021 Mark Wielaard <mjw@redhat.com> - 3.18.1-5
 - Add valgrind-3.18.1-dhat-tests-copy.patch
@ -520,52 +492,204 @@ fi
 - Add valgrind-3.18.1-condvar.patch
 - Add valgrind-3.18.1-demangle-namespace.patch

-* Wed Oct 20 2021 Mark Wielaard <mjw@redhat.com> - 3.18.1-1
+* Thu Oct 21 2021 Mark Wielaard <mjw@redhat.com> - 3.18.1-1
 - Update to upstream 3.18.1 final

-* Thu Jun 24 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-5
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.17.0-12
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Aug  6 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-11
+- Add valgrind-3.17.0-ppc64-statfs64.patch
+
+* Tue Aug  3 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-10
+- Add valgrind-3.17.0_start.patch
+
+* Wed Jul 21 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-9
+- Add valgrind-3.17.0-clone3.patch
+
+* Sat Jul 17 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-8
+- Add gdbserver_tests-update-filters-for-newer-glibc-gdb.patch
+- Add helgrind-and-drd-suppression-libc-and-libpthread.patch
+- Remove valgrind-3.9.0-helgrind-race-supp.patch
+- Enable run_full_regtest.
+
+* Thu Jun 24 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-6
 - Add valgrind-3.17.0-s390-prep.patch
 - Add valgrind-3.17.0-s390-z15.patch
 - Add valgrind-3.17.0-s390-z13-vec-fix.patch

+* Mon Jun  7 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-5
+- Disable run_full_regtest.
+
 * Thu Jun  3 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-4
- Update to upstream 3.17.0 final.
- Add valgrind-3.17.0-ppc64-isa-3.1{,tests}.patch
 - Add valgrind-3.17.0-s390_insn_as_string.patch
 - Add valgrind-3.17.0-debuginfod.patch
 - Add valgrind-3.17.0-clone-parent-res.patch
+- Add valgrind-3.17.0-s390x-tests-z14-workaround.patch

-* Fri Dec  4 2020 Mark Wielaard <mjw@redhat.com> - 3.16.0-4
+* Tue May  4 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.17.0-3
+- Add valgrind-3.17.0-ppc64-isa-3.1{,tests}.patch
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.17.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 22 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.17.0-1
+- Update to upstream 3.17.0 final.
+
+* Wed Mar 17 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.17.0-0.1.RC2
+- Update to upstream 3.17.0-RC2
+
+* Mon Mar 15 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.17.0-0.1.RC1
+- Update to upstream 3.17.0-RC1
+- Drop all upstreamed patches
+
+* Wed Mar  3 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-20
+- Add valgrind-3.16.1-arm64_sp_lr_fp_DwReg.patch
+
+* Sun Feb 21 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-19
+- Add valgrind-3.16.1-readdwarf-line.patch
+
+* Sat Feb  6 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-18
+- Update valgrind-3.16.1-open-proc-self-exe.patch to handle openat
+
+* Sat Feb  6 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-17
+- Add valgrind-3.16.1-open-proc-self-exe.patch
+
+* Wed Feb  3 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-16
+- Add valgrind-3.16.0-shmctl.patch
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.16.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 25 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-14
+- Add valgrind-3.16.1-dwarf5.patch
+
+* Fri Jan  8 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-13
+- Add valgrind-3.16.1-ppc64-scv-hwcap.patch
+
+* Sun Dec 20 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-12
+- Add valgrind-3.16.1-ficlone.patch
+- Add valgrind-3.16.1-arm64-expensive-cmp.patch
+
+* Thu Dec 17 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-11
+- Update valgrind-3.16.1-arm64-fma.patch
+
+* Tue Dec 15 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-10
+- Add valgrind-3.16.1-arm64-fma.patch
+
+* Sun Dec 13 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-9
+- Add valgrind-3.16.1-stxsibx-stxsihx.patch
+
+* Thu Dec  3 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-8
+- Update valgrind-3.16.1-s390x-z14-vector.patch
+
+* Thu Dec  3 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-7
+- Add valgrind-3.16.1-pthread-intercept.patch
 - Add valgrind-3.16.1-s390_emit_load_mem.patch
 - Add valgrind-3.16.1-s390x-z14-vector.patch

-* Tue Oct 20 2020 Mark Wielaard <mjw@redhat.com> - 3.16.0-3
+* Mon Nov  9 2020 Mark Wielaard <mjw@fedoraproject.org>
+- Add BuildRequires which (#1895773)
+
+* Fri Oct 16 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-6
+- Add valgrind-3.16.1-faccessat2.patch
+- Add valgrind-3.16.1-gdbserver_nlcontrolc.patch
+- Add valgrind-3.16.1-PPC64BE-lsw.patch
+
+* Tue Aug 18 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-5
+- Update valgrind-3.16.1-epoll.patch
+
+* Mon Jul 27 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-4
 - Add valgrind-3.16.1-REX-prefix-JMP.patch
 - Add valgrind-3.16.1-epoll.patch
 - Add valgrind-3.16.1-sched_getsetattr.patch
 - Add valgrind-3.16.1-dl_runtime_resolve.patch

-* Wed Jun 24 2020 Mark Wielaard <mjw@redhat.com> - 3.16.0-2
- Add valgrind-3.16.0-ppc-L-field.patch
- Add valgrind-3.16.0-387-float.patch
+* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 3.16.1-3
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

-* Thu May 28 2020 Mark Wielaard <mjw@redhat.com> - 3.16.0-1
+* Wed Jul  8 2020 Jeff Law <law@redhat.org> - 3.16.1-2
+- Disable LTO
+
+* Tue Jun 23 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-1
+- Update to upstream valgrind 3.16.1.
+
+* Fri Jun 19 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-3
+- Add valgrind-3.16.0-ppc-L-field.patch
+
+* Wed May 27 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-2
+- Apply stack-protector and -Wl,z,now patches.
+
+* Wed May 27 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-1
 - Update to upstream valgrind 3.16.0 final.

-* Fri Feb 14 2020 Mark Wielaard <mjw@redhat.com> - 3.15.0-11
+* Tue May 19 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-0.4.RC2
+- Add docbook-dtds to BuildRequires.
+
+* Tue May 19 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-0.3.RC2
+- Update to upstream 3.16.0 RC2
+
+* Fri May  1 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-0.2.GIT
+- Update to upstream 3.16.0 branch point (commit 55cdb7c4e)
+
+* Fri Apr 17 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.0-0.1.GIT
+- Update to upstream 3.16.0-GIT (commit 52d02fe23)
+  - Drop all streamed patches.
+
+* Wed Mar  4 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-20
+- Add valgrind-3.15.0-z15.patch
+
+* Fri Feb 28 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-19
+- Add valgrind-3.15.0-time64.patch
+- Add valgrind-3.15.0-arm-preadv2-pwritev2.patch
+- Add valgrind-3.15.0-avx_estimate_insn-test.patch
+- Add valgrind-3.15.0-gcc-10-x86-amd64-asm-test.patch
+
+* Fri Feb 14 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-18
+- Add valgrind-3.15.0-ppc64-sigframe.patch
+
+* Thu Feb 13 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-17
+- Add valgrind-3.15.0-glibc-dtv-supp.patch
+
+* Wed Jan 29 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-16
 - Add valgrind-3.15.0-s390x-HRcVec128.patch

-* Mon Aug  5 2019 Mark Wielaard <mjw@redhat.com> - 3.15.0-10
- Add valgrind-3.15.0-preadv2-pwritev2.patch
+* Wed Jan 29 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-15
+- Don't use valgrind-3.15.0-ptrace-siginfo.patch on ppc64[le]
+- Add valgrind-3.15.0-s390x-compare-and-signal.patch

-* Wed May 29 2019 Mark Wielaard <mjw@redhat.com> - 3.15.0-9
+* Fri Jan 24 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-14
+- Add valgrind-3.15.0-gcc-10-i686-asm-test.patch
+- Add valgrind-3.15.0-gcc10-ppc64-asm-constraints.patch
+
+* Thu Jan 23 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-13
+- Add valgrind-3.15.0-gcc-10-typedef-enum.patch
+
+* Mon Sep 23 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-12
+- Add valgrind-3.15.0-ptrace-siginfo.patch
+
+* Mon Aug  5 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-11
+- Add valgrind-3.15.0-preadv2-pwritev2.patch
+- Add valgrind-3.15.0-arm-membarrier.patch
+- Add valgrind-3.15.0-z14-misc.patch
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.15.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed May 29 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-9
 - Add valgrind-3.15.0-pkey.patch
+
+* Tue May 28 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-8
+- Update valgrind-3.15.0-copy_file_range.patch.
 - Add valgrind-3.15.0-avx-rdrand-f16c.patch.

-* Fri May 24 2019 Mark Wielaard <mjw@redhat.com> - 3.15.0-6
- Update valgrind-3.15.0-copy_file_range.patch.
+* Fri May 24 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-7
 - Update valgrind-3.15.0-some-stack-protector.patch to include getoff.
 - Add valgrind-3.15.0-some-Wl-z-now.patch
+
+* Fri May 24 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-6
 - Add valgrind-3.15.0-s390x-wrap-drd.patch

 * Mon May 20 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-5
@ -573,32 +697,115 @@ fi
 - Add valgrind-3.15.0-scalar-arm64.patch
 - Add valgrind-3.15.0-scalar-x86.patch

-* Wed May  8 2019 Mark Wielaard <mjw@redhat.com> - 3.15.0-4
- Add valgrind-3.15.0-copy_file_range.patch
+* Tue May  7 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-4
 - Add valgrind-3.15.0-arm64-ld-stpcpy.patch

-* Tue May  7 2019 Mark Wielaard <mjw@redhat.com> - 3.15.0-2
+* Sun May  5 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-3
+- Add valgrind-3.15.0-copy_file_range.patch
+
+* Thu Apr 25 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-2
+- gdb has been fixed on fedora, run full regtests again.
+- Add valgrind-3.15.0-ppc64-filter_gdb.patch
+
+* Tue Apr 16 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-1
+- On ppc64[be] -fexceptions is troublesome.
 - valgrind-3.15.0 final
- clean up build flags
+  Remove upstreamed patches
+  - valgrind-3.15.0-arm64-Ity_F16.patch
+  - valgrind-3.15.0-filter-libc-futex.patch
+  - valgrind-3.15.0-mmap-32bit.patch

-* Wed Apr 17 2019 Mark Wielaard <mjw@redhat.com> - 3.14.0-11
- Rebuilt with s390x-vec-facility-bit for 8.1.0 (#1669234)
+* Sun Apr 14 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.8.RC2
+- Adding of stack-protector flag should only be done with newer gcc.
+- Older rpm macros didn't provide build_ldflags.
+- Add valgrind-3.15.0-arm64-Ity_F16.patch

-* Thu Jan 24 2019 Mark Wielaard <mjw@redhat.com> - 3.14.0-10
+* Sun Apr 14 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.7.RC2
+- Add valgrind-3.15.0-some-stack-protector.patch
+
+* Sat Apr 13 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.6.RC2
+- Pass through most (hardening) flags, except -O2, -fstack-protector
+  and -Wl,-z,now.
+
+* Fri Apr 12 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.5.RC2
+- No openmpi support on old s390x rhel.
+- Disable s390x z13 support on rhel6 (too old binutils).
+- Use an explicit ExclusiveArch, don't rely on %%valgrind_arches.
+- Drop close_fds, it is no longer needed.
+- Include any gdbserver_tests diffs for failing regtest.
+
+* Thu Apr 11 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.4.RC2
+- Update to 3.15.0.RC2.
+- Drop upstreamed patches:
+  - valgrind-3.15.0-s390x-get-startregs-constraint.patch
+  - valgrind-3.15.0-missing-a-c.patch
+  - valgrind-3.15.0-libstdc++-supp.patch
+  - valgrind-3.15.0-dhat-x86.patch
+  - valgrind-3.15.0-gdb-output1.patch
+  - valgrind-3.15.0-gdb-output2.patch
+- Update valgrind-3.15.0-mmap-32bit.patch to upstream version.
+- gdb on f30 and rawhide is currently broken, don't run_full_regtest.
+- Any glibc-devel version is.
+- Drop rhel5 special case for tools-devel.
+- Use /bin/true --help as sanity test.
+
+* Wed Apr 10 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.3.RC1
+- Enable full regtest on all fedora arches.
+- Make sure that patched a.c is not newer than cgout-test.
+- Update valgrind-3.15.0-gdb-output1.patch to upstream version.
+- Add valgrind-3.15.0-filter-libc-futex.patch.
+- Add valgrind-3.15.0-mmap-32bit.patch.
+
+* Tue Apr  9 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.2.RC1
+- Add valgrind-3.15.0-s390x-get-startregs-constraint.patch
+- Add valgrind-3.15.0-missing-a-c.patch
+- Add valgrind-3.15.0-libstdc++-supp.patch
+- Add valgrind-3.15.0-dhat-x86.patch
+- Add valgrind-3.15.0-gdb-output1.patch
+- Add valgrind-3.15.0-gdb-output2.patch
+
+* Mon Apr  8 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.1.RC1
+- Remove patches to prebuild files and always ./autogen.sh.
+- Only ever build primary arch. Put tools under libexec.
+- Update to upstream 3.15.0-RC1.
+- Drop all upstreamed patches.
+
+* Mon Mar  4 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-16
+- Add valgrind-3.14.0-gettid.patch
+
+* Mon Mar  4 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-15
+- Add valgrind-3.14.0-ppc64-quotactl.patch
+
+* Thu Feb 21 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-14
+- Add valgrind-3.14.0-ppc-subfe.patch
+
+* Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 1:3.14.0-13
+- Rebuild for openmpi 3.1.3
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.14.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 24 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-11
 - Add valgrind-3.14.0-s390x-vec-facility-bit.patch.

-* Mon Jan  7 2019 Mark Wielaard <mjw@redhat.com> - 3.14.0-9
+* Wed Jan  9 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-10
+- Add valgrind-3.14.0-rsp-clobber.patch
+- Add valgrind-3.14.0-subrange_type-count.patch
+
+* Mon Dec 31 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-9
+- Add valgrind-3.14.0-vbit-test-sec.patch
+- Add valgrind-3.14.0-x86-Iop_Sar64.patch
 - Add valgrind-3.14.0-power9-addex.patch

-* Thu Dec 20 2018 Mark Wielaard <mjw@redhat.com> - 3.14.0-8
- Update valgrind-3.14.0-jm-vmx-constraints.patch for ppc64. (#1658680)
+* Thu Dec 20 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-8
+- Update valgrind-3.14.0-jm-vmx-constraints.patch for ppc64.
 - Show all diff files in check, not just the main/default one.

-* Mon Dec 17 2018 Mark Wielaard <mjw@redhat.com> - 3.14.0-7
+* Fri Dec 14 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-7
 - Add valgrind-3.14.0-arm64-ptrace-traceme.patch
 - Add valgrind-3.14.0-mc_translate-vecret.patch

-* Wed Dec 12 2018 Mark Wielaard <mjw@redhat.com> - 3.14.0-6
+* Wed Dec 12 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-6
 - Add valgrind-3.14.0-final_tidyup.patch
 - Add valgrind-3.14.0-ppc64-ldbrx.patch
 - Add valgrind-3.14.0-ppc64-unaligned-words.patch
@ -611,42 +818,45 @@ fi
 - Add valgrind-3.14.0-sigkill.patch
 - Add valgrind-3.14.0-ppc64-ptrace.patch

-* Tue Dec  4 2018 Mark Wielaard <mjw@redhat.com>
- Add valgrind-3.14.0-wcsncmp.patch (#1655642)
-
+* Sat Dec  1 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-5
+- Add valgrind-3.14.0-wcsncmp.patch (#1645971)
 - Replace valgrind-3.14.0-s390x-vec-float-point-{code,test}.patch
-  with upstream versions. (#1525405)
+  with upstream versions.

-* Fri Nov 23 2018 Mark Wielaard  <mjw@redhat.com> - 3.14.0-4
+* Fri Nov 23 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.14.0-4
 - Add valgrind-3.14.0-get_otrack_shadow_offset_wrk-ppc.patch,
  valgrind-3.14.0-new-strlen-IROps.patch,
  valgrind-3.14.0-ppc-instr-new-IROps.patch,
  valgrind-3.14.0-memcheck-new-IROps.patch,
  valgrind-3.14.0-ppc-frontend-new-IROps.patch,
  valgrind-3.14.0-transform-popcount64-ctznat64.patch and
-  valgrind-3.14.0-enable-ppc-Iop_Sar_Shr8.patch (#1532205)
+  valgrind-3.14.0-enable-ppc-Iop_Sar_Shr8.patch (#1652926)

-* Wed Nov 21 2018 Mark Wielaard  <mjw@redhat.com> - 3.14.0-3
+* Wed Nov 21 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.14.0-3
 - Add valgrind-3.14.0-s390z-more-z13-fixes.patch.

-* Tue Nov 20 2018 Mark Wielaard  <mjw@redhat.com> - 3.14.0-2
+* Tue Nov 20 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.14.0-2
 - Add valgrind-3.14.0-s390x-fix-reg-alloc-vr-vs-fpr.patch.
 - Add valgrind-3.14.0-s390x-sign-extend-lochi.patch.
 - Add valgrind-3.14.0-s390x-vec-reg-vgdb.patch.
 - Add valgrind-3.14.0-s390x-vec-float-point-code.patch
  and valgrind-3.14.0-s390x-vec-float-point-tests.patch
- Only run full regtests on x86_64 on fedora or latest rhel.
+- Disable full regtests on fedora everywhere.

-* Tue Oct  9 2018 Mark Wielaard  <mjw@redhat.com> - 3.14.0-1
- valgrind 3.14.0 (#1569600).
- Enable s390x again.
+* Tue Oct  9 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.14.0-1
+- valgrind 3.14.0 final.

-* Fri Aug 10 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.13.0-29
+* Thu Oct  4 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.14.0-0.2.RC2
+- Upgrade to RC2.
+- Drop valgrind-3.14.0-add-vector-h.patch.
+
+* Fri Sep 14 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.14.0-0.1.GIT
+- New upstream (pre-)release.
+- Add valgrind-3.14.0-add-vector-h.patch.
+
+* Fri Aug 10 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.13.0-28
 - Add valgrind-3.13.0-utime.patch

-* Thu Aug  9 2018 Florian Weimer <fweimer@redhat.com> - 1:3.13.0-28
- Rebuild to remove s390x packages due to lack of z13 support (#1525405)
-
 * Fri Aug  3 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.13.0-27
 - Add valgrind-3.13.0-ppc64-xsmaxcdp.patch

@ -657,7 +867,7 @@ fi
 * Tue Jul 31 2018 Mark Wielaard  <mjw@fedoraproject.org> - 3.13.0-25
 - Add valgrind-3.13.0-x86-arch_prctl.patch (#1610304)

-* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 3.13.0-24
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 3.13.0-24
 - Rebuild with fixed binutils

 * Fri Jul 27 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-23
				`@ -0,0 +1 @@`
				`294c341b421b4d9534e42e8125f509c148f48c17 SOURCES/valgrind-3.19.0.tar.bz2`