Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

- Upstream 3.27.0-RC1
- Remove all VALGRIND_3_26_BRANCH and proposed upstream patches

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -31,3 +31,37 @@
 /valgrind-3.14.0.GIT.tar.bz2
 /valgrind-3.14.0.RC2.tar.bz2
 /valgrind-3.14.0.tar.bz2
+/valgrind-3.15.0.RC1.tar.bz2
+/valgrind-3.15.0.RC2.tar.bz2
+/valgrind-3.15.0.tar.bz2
+/valgrind-3.16.0.GIT.tar.bz2
+/valgrind-3.16.0.RC2.tar.bz2
+/valgrind-3.16.0.tar.bz2
+/valgrind-3.16.1.tar.bz2
+/valgrind-3.17.0.RC1.tar.bz2
+/valgrind-3.17.0.RC2.tar.bz2
+/valgrind-3.17.0.tar.bz2
+/valgrind-3.18.0.RC1.tar.bz2
+/valgrind-3.18.1.tar.bz2
+/valgrind-3.19.0.tar.bz2
+/valgrind-3.20.0.tar.bz2
+/valgrind-3.21.0.RC1.tar.bz2
+/valgrind-3.21.0.RC2.tar.bz2
+/valgrind-3.21.0.tar.bz2
+/valgrind-3.22.0.RC1.tar.bz2
+/valgrind-3.22.0.RC2.tar.bz2
+/valgrind-3.22.0.tar.bz2
+/valgrind-3.23.0.RC1.tar.bz2
+/valgrind-3.23.0.RC2.tar.bz2
+/valgrind-3.23.0.tar.bz2
+/valgrind-3.24.0.tar.bz2
+/valgrind-3.25.0.RC1.tar.bz2
+/valgrind-3.25.0.RC2.tar.bz2
+/valgrind-3.25.0.tar.bz2
+/valgrind-3.25.1.tar.bz2
+/valgrind-3.26.0.RC1.tar.bz2
+/valgrind-3.26.0.tar.bz2
+/valgrind-3.27.0.RC1.tar.bz2
+/valgrind-3.27.0.RC2.tar.bz2
+/valgrind-3.27.0.tar.bz2
+/valgrind-3.27.1.tar.bz2

gating.yaml

@@ -0,0 +1,20 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/ci.fmf

@@ -0,0 +1,6 @@
+summary: CI test plan, runs all tests from tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/valgrind
+execute:
+    how: tmt

rpminspect.yaml

@@ -0,0 +1,52 @@
+---
+inspections:
+  # xml files shipped are GDB register set descriptions which can only be
+  # verified with gdb/features/gdb-target.dtd, provided in GDB sources.
+  xml: off
+
+annocheck:
+  # Currently lto is disabled globally for valgrind, it should be able
+  # to be enabled through upstream configure --enable-lto in the future.
+  # Note that all (default hardened) flags need to be repeated here, if
+  # you override some config flags it will completely overwrite the
+  # defaults (--ignore-unknown --verbose).
+  jobs:
+    - hardened: --ignore-unknown --verbose --skip-lto
+  # Ignore files built specially without hardening flags
+  ignore:
+    # Valgrind tools themselves (memcheck, cachegrind, massif, etc) are
+    # statically linked and need to be built without PIE to be loaded at
+    # a fixed address in the program's address space.
+    # Also need to be built without stack protection so the generated
+    # code (valgrind VEX jit) interacts correctly with their own static code.
+    - /usr/libexec/valgrind/*-*-linux
+    # Wrappers for various string and mem functions such as memcpy, strlen, etc
+    # that valgrind uses to keep track of memory usage. Hardening settings such
+    # as optimizations need to be disabled so they don't interfere or break
+    # the checks that valgrind does internally.
+    - /usr/libexec/valgrind/vgpreload*so
+    # libmpiwrap is special since it is a LD_PRELOAD wrapper used by valgrind
+    # memcheck for MPI using programs, the wrapper is against a specific MPI
+    # implementation though, in our case openmpi. We don't want to have a hard
+    # dependency on openmpi however, so a user can use the wrapper without
+    # explicitly pulling in openmpi unless the program explicitly uses it.
+    - /usr/lib*/openmpi/valgrind/libmpiwrap-*-linux.so
+    # These static archives (to create custom valgrind tools) are only
+    # distributed in valgrind-tools-devel and don't have hardening flags
+    # for the same reason as the standard tools (see above).
+    - /usr/lib*/valgrind/*-*linux.a
+
+debuginfo:
+  ignore:
+    # We add the debuginfo to vgpreload libraries because we want to show the
+    # user exactly where the issue is, which we cannot without always having
+    # the symtab around. The vgpreload libraries are really tiny, so it doesn't
+    # have a big impact on the package size.
+    - /usr/libexec/valgrind/vgpreload*.so
+
+runpath:
+  allowed_paths:
+    # As described above, libmpiwrap is a wrapper against openmpi
+    # so we set DT_RUNPATH to openmpi libs path
+    - /usr/lib/openmpi/lib
+    - /usr/lib64/openmpi/lib

sources

@@ -1 +1 @@
-SHA512 (valgrind-3.14.0.tar.bz2) = 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
+SHA512 (valgrind-3.27.1.tar.bz2) = 4522e345fe31bc10478f21ab261cf7b3e509d80fe98fd0c7c9778ac9a9f90e1d8fa6e54a37c2e23114c01c95131035103fc1e78661710d7f45f5d564a31c1015

valgrind-3.26.0-some-Wl-z-now.patch

@@ -0,0 +1,53 @@
+diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
+index 2b8703cf1a63..8cb828b85c57 100644
+--- a/auxprogs/Makefile.am
++++ b/auxprogs/Makefile.am
+@@ -50,7 +50,7 @@ valgrind_listener_SOURCES = valgrind-listener.c
+ valgrind_listener_CPPFLAGS  = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
+ valgrind_listener_CFLAGS    = $(AM_CFLAGS_PRI) -fhosted -fstack-protector-strong
+ valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+-valgrind_listener_LDFLAGS   = $(AM_CFLAGS_PRI)
++valgrind_listener_LDFLAGS   = $(AM_CFLAGS_PRI) -Wl,-z,now
+ if VGCONF_PLATVARIANT_IS_ANDROID
+ valgrind_listener_CFLAGS    += -static
+ endif
+@@ -69,7 +69,7 @@ valgrind_di_server_SOURCES   = valgrind-di-server.c
+ valgrind_di_server_CPPFLAGS  = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
+ valgrind_di_server_CFLAGS    = $(AM_CFLAGS_PRI) -fhosted -fstack-protector-strong
+ valgrind_di_server_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+-valgrind_di_server_LDFLAGS   = $(AM_CFLAGS_PRI)
++valgrind_di_server_LDFLAGS   = $(AM_CFLAGS_PRI) -Wl,-z,now
+ if VGCONF_PLATVARIANT_IS_ANDROID
+ valgrind_di_server_CFLAGS    += -static
+ endif
+@@ -104,7 +104,7 @@ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES   = getoff.c
+ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS  = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
+ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS    = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fhosted -fstack-protector-strong
+ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+-getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
++getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
+ if HAVE_DLINFO_RTLD_DI_TLS_MODID
+ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
+ endif
+diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
+index 0bcb4a4f423f..59fc48052e50 100644
+--- a/coregrind/Makefile.am
++++ b/coregrind/Makefile.am
+@@ -64,7 +64,7 @@ RANLIB = ${LTO_RANLIB}
+ valgrind_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
+ valgrind_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong
+ valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+-valgrind_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
++valgrind_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -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
+@@ -106,7 +106,7 @@ endif
+ vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
+ vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong
+ vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+-vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
++vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
+ if VGCONF_PLATVARIANT_IS_ANDROID
+ vgdb_CFLAGS    += -static
+ endif

valgrind-3.26.0-some-stack-protector.patch

@@ -0,0 +1,108 @@
+diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
+index d96e7fd0a968..2b8703cf1a63 100644
+--- a/auxprogs/Makefile.am
++++ b/auxprogs/Makefile.am
+@@ -48,7 +48,7 @@ bin_PROGRAMS = valgrind-listener valgrind-di-server
+ 
+ valgrind_listener_SOURCES = valgrind-listener.c
+ valgrind_listener_CPPFLAGS  = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
+-valgrind_listener_CFLAGS    = $(AM_CFLAGS_PRI) -fhosted
++valgrind_listener_CFLAGS    = $(AM_CFLAGS_PRI) -fhosted -fstack-protector-strong
+ valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+ valgrind_listener_LDFLAGS   = $(AM_CFLAGS_PRI)
+ if VGCONF_PLATVARIANT_IS_ANDROID
+@@ -67,7 +67,7 @@ endif
+ 
+ valgrind_di_server_SOURCES   = valgrind-di-server.c
+ valgrind_di_server_CPPFLAGS  = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
+-valgrind_di_server_CFLAGS    = $(AM_CFLAGS_PRI) -fhosted
++valgrind_di_server_CFLAGS    = $(AM_CFLAGS_PRI) -fhosted -fstack-protector-strong
+ valgrind_di_server_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+ valgrind_di_server_LDFLAGS   = $(AM_CFLAGS_PRI)
+ if VGCONF_PLATVARIANT_IS_ANDROID
+@@ -102,7 +102,7 @@ endif
+ 
+ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES   = getoff.c
+ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS  = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
+-getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS    = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fhosted
++getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS    = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fhosted -fstack-protector-strong
+ 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
+@@ -119,7 +119,7 @@ endif
+ if VGCONF_HAVE_PLATFORM_SEC
+ getoff_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES   = getoff.c
+ getoff_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS  = $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
+-getoff_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS    = $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -fhosted
++getoff_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS    = $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -fhosted -fstack-protector-strong
+ getoff_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_SEC)
+ getoff_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS   = $(AM_CFLAGS_SEC)
+ if HAVE_DLINFO_RTLD_DI_TLS_MODID
+diff --git a/configure.ac b/configure.ac
+index 90fafaf1c557..84a3d22c5bff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3004,24 +3004,24 @@
+ fi
+ 
+ # does this compiler support -fno-stack-protector ?
+-AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
+-
+-safe_CFLAGS=$CFLAGS
+-CFLAGS="-fno-stack-protector -Werror"
+-
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+-  return 0;
+-]])], [
+-no_stack_protector=yes
+-FLAG_FNO_STACK_PROTECTOR="-fno-stack-protector"
+-AC_MSG_RESULT([yes])
+-], [
+-no_stack_protector=no
++#AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
++#
++#safe_CFLAGS=$CFLAGS
++#CFLAGS="-fno-stack-protector -Werror"
++#
++#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
++#  return 0;
++#]])], [
++#no_stack_protector=yes
++#FLAG_FNO_STACK_PROTECTOR="-fno-stack-protector"
++#AC_MSG_RESULT([yes])
++#], [
++#no_stack_protector=no
+ FLAG_FNO_STACK_PROTECTOR=""
+-AC_MSG_RESULT([no])
+-])
+-CFLAGS=$safe_CFLAGS
+-
++#AC_MSG_RESULT([no])
++#])
++#CFLAGS=$safe_CFLAGS
++#
+ AC_SUBST(FLAG_FNO_STACK_PROTECTOR)
+ 
+ # does this compiler support -finline-functions ?
+diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
+index 4ead1542b0c7..0bcb4a4f423f 100644
+--- a/coregrind/Makefile.am
++++ b/coregrind/Makefile.am
+@@ -62,7 +62,7 @@ AR = ${LTO_AR}
+ RANLIB = ${LTO_RANLIB}
+ 
+ valgrind_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
+-valgrind_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted
++valgrind_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong
+ valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+ valgrind_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
+ # If there is no secondary platform, and the platforms include x86-darwin,
+@@ -104,7 +104,7 @@ vgdb_SOURCES += vgdb-invoker-freebsd.c
+ endif
+ 
+ vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
+-vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted
++vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong
+ vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+ vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
+ if VGCONF_PLATVARIANT_IS_ANDROID

valgrind-3.9.0-helgrind-race-supp.patch

@@ -1,15 +0,0 @@
---- valgrind/glibc-2.34567-NPTL-helgrind.supp.jj	2009-08-19 15:37:48.000000000 +0200
-+++ valgrind/glibc-2.34567-NPTL-helgrind.supp	2009-10-21 16:46:31.000000000 +0200
-@@ -88,6 +88,12 @@
-    obj:*/lib*/libpthread-2.*so*
- }
- {
-+   helgrind-glibc2X-102a
-+   Helgrind:Race
-+   fun:mythread_wrapper
-+   obj:*vgpreload_helgrind*.so
-+}
-+{
-    helgrind-glibc2X-103
-    Helgrind:Race
-    fun:pthread_cond_*@@GLIBC_2.*