diff --git a/.gitignore b/.gitignore index 1b94371..d89612b 100644 --- a/.gitignore +++ b/.gitignore @@ -59,9 +59,3 @@ /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 diff --git a/sources b/sources index f885857..074653a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (valgrind-3.27.1.tar.bz2) = 4522e345fe31bc10478f21ab261cf7b3e509d80fe98fd0c7c9778ac9a9f90e1d8fa6e54a37c2e23114c01c95131035103fc1e78661710d7f45f5d564a31c1015 +SHA512 (valgrind-3.25.1.tar.bz2) = 6a474d58730274c57d6ca012ffd3226d393d6507cd57bf46c3b26c87a0cba84e3c8cfc84c8c76e50041861e98baba7b9613490faef4212d082845581d08af351 diff --git a/valgrind-3.26.0-some-Wl-z-now.patch b/valgrind-3.16.0-some-Wl-z-now.patch similarity index 70% rename from valgrind-3.26.0-some-Wl-z-now.patch rename to valgrind-3.16.0-some-Wl-z-now.patch index ccf867b..f6001d2 100644 --- a/valgrind-3.26.0-some-Wl-z-now.patch +++ b/valgrind-3.16.0-some-Wl-z-now.patch @@ -1,28 +1,34 @@ +commit d3c977726064ba09fed6dfc7daf22b16824c97b4 +Author: Mark Wielaard +Date: Fri May 24 18:24:56 2019 +0200 + + Add -Wl,-z,now to some binaries. + diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am -index 2b8703cf1a63..8cb828b85c57 100644 +index 1b7842b..e211eec 100644 --- a/auxprogs/Makefile.am +++ b/auxprogs/Makefile.am -@@ -50,7 +50,7 @@ valgrind_listener_SOURCES = valgrind-listener.c +@@ -32,7 +32,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_CFLAGS = $(AM_CFLAGS_PRI) -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 +@@ -51,7 +51,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_CFLAGS = $(AM_CFLAGS_PRI) -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 +@@ -86,7 +86,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@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -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 @@ -30,21 +36,21 @@ index 2b8703cf1a63..8cb828b85c57 100644 getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl endif diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am -index 0bcb4a4f423f..59fc48052e50 100644 +index 3c73210..fb6b7bb 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am -@@ -64,7 +64,7 @@ RANLIB = ${LTO_RANLIB} +@@ -57,7 +57,7 @@ RANLIB = ${LTO_RANLIB} valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) - valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong + valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -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 +@@ -104,7 +104,7 @@ vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR) - vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong + vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -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 diff --git a/valgrind-3.26.0-some-stack-protector.patch b/valgrind-3.16.0-some-stack-protector.patch similarity index 61% rename from valgrind-3.26.0-some-stack-protector.patch rename to valgrind-3.16.0-some-stack-protector.patch index ca00eac..751cf39 100644 --- a/valgrind-3.26.0-some-stack-protector.patch +++ b/valgrind-3.16.0-some-stack-protector.patch @@ -1,49 +1,46 @@ +commit b73fb7a614e1b5d60af23fb0752b5cead995e02e +Author: Mark Wielaard +Date: Sun Apr 14 00:30:05 2019 +0200 + + Remove no-stack-protector, add stack-protector-strong to some. + diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am -index d96e7fd0a968..2b8703cf1a63 100644 +index 56cc5ef..1b7842b 100644 --- a/auxprogs/Makefile.am +++ b/auxprogs/Makefile.am -@@ -48,7 +48,7 @@ bin_PROGRAMS = valgrind-listener valgrind-di-server +@@ -30,7 +30,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_CFLAGS = $(AM_CFLAGS_PRI) ++valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) -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 +@@ -49,7 +49,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_CFLAGS = $(AM_CFLAGS_PRI) ++valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI) -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 +@@ -84,7 +84,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@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -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 +index f8c798b..ccc8f52 100755 --- a/configure.ac +++ b/configure.ac -@@ -3004,24 +3004,24 @@ - fi +@@ -2352,24 +2352,24 @@ + AM_CONDITIONAL([HAVE_ALIGNED_CXX_ALLOC], [test x$ac_have_aligned_cxx_alloc = xyes]) # does this compiler support -fno-stack-protector ? -AC_MSG_CHECKING([if gcc accepts -fno-stack-protector]) @@ -85,24 +82,24 @@ index 90fafaf1c557..84a3d22c5bff 100644 # does this compiler support -finline-functions ? diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am -index 4ead1542b0c7..0bcb4a4f423f 100644 +index 94030fd..3c73210 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am -@@ -62,7 +62,7 @@ AR = ${LTO_AR} +@@ -55,7 +55,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_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) ++valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -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 +@@ -102,7 +102,7 @@ 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_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) ++vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI) vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ if VGCONF_PLATVARIANT_IS_ANDROID diff --git a/valgrind.spec b/valgrind.spec index f620ab3..114f220 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -2,8 +2,8 @@ Summary: Dynamic analysis tools to detect memory or thread bugs and profile Name: %{?scl_prefix}valgrind -Version: 3.27.1 -Release: 2%{?dist} +Version: 3.25.1 +Release: 1%{?dist} Epoch: 1 # This ignores licenses that are only found in the test or perf sources @@ -12,7 +12,7 @@ Epoch: 1 # a license specifier is in coregrind/m_main.c for some Hacker's Delight # public domain code, which is only compiled into Darwin binaries, which # we don't create. Also some subpackages have their own license tags. -License: GPL-3.0-or-later AND bzip2-1.0.6 AND (GPL-3.0-or-later AND LGPL-2.0-or-later) AND (GPL-3.0-or-later AND ISC) AND (GPL-3.0-or-later AND Unlicense) AND (GPL-3.0-or-later AND Zlib) AND (GPL-3.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-3.0-or-later AND BSD-3-Clause) AND (GPL-3.0-or-later AND (MIT OR NCSA)) AND CMU-Mach AND (GPL-3.0-or-later AND X11 AND BSD-3-Clause) AND X11 AND (GPL-3.0-or-later AND LGPL-2.0-or-later) AND (GPL-2.0-or-later WITH Autoconf-exception-generic) AND (GPL-3.0-or-later WITH Autoconf-exception-generic-3.0) AND FSFULLR AND FSFAP AND FSFUL AND FSFULLRWD +License: GPL-2.0-or-later AND bzip2-1.0.6 AND GFDL-1.2-or-later AND (GPL-2.0-or-later AND LGPL-2.0-or-later) AND (GPL-2.0-or-later AND ISC) AND (GPL-2.0-or-later AND Unlicense) AND (GPL-2.0-or-later AND Zlib) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later AND BSD-3-Clause) AND (GPL-2.0-or-later AND (MIT OR NCSA)) AND CMU-Mach AND (GPL-2.0-or-later AND X11 AND BSD-3-Clause) AND X11 AND (GPL-2.0-or-later AND LGPL-2.0-or-later) AND (GPL-2.0-or-later AND (GPL-2.0-or-later OR MPL-2.0)) AND (GPL-2.0-or-later WITH Autoconf-exception-generic) AND (GPL-3.0-or-later WITH Autoconf-exception-generic-3.0) AND FSFULLR AND FSFAP AND FSFUL AND FSFULLRWD URL: https://www.valgrind.org/ # Are we building for a Software Collection? @@ -80,10 +80,10 @@ Patch1: valgrind-3.9.0-cachegrind-improvements.patch Patch2: valgrind-3.9.0-ldso-supp.patch # Add some stack-protector -Patch3: valgrind-3.26.0-some-stack-protector.patch +Patch3: valgrind-3.16.0-some-stack-protector.patch # Add some -Wl,z,now. -Patch4: valgrind-3.26.0-some-Wl-z-now.patch +Patch4: valgrind-3.16.0-some-Wl-z-now.patch BuildRequires: make BuildRequires: glibc-devel @@ -214,7 +214,7 @@ Documentation in html and pdf, plus man pages for valgrind tools and scripts. %package scripts Summary: Scripts for post-processing valgrind tool output -License: GPL-3.0-or-later AND (GPL-3.0-or-later OR MPL-2.0) +License: GPL-2.0-or-later # Most scripts can be used as is for post-processing a valgrind tool run. # But callgrind_control uses vgdb. Recommends: %{?scl_prefix}valgrind-gdb = %{epoch}:%{version}-%{release} @@ -224,7 +224,7 @@ Perl and Python scripts for post-processing valgrind tool output. %package gdb Summary: Tools for integrating valgrind and gdb -License: GPL-3.0-or-later +License: GPL-2.0-or-later Requires: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release} # vgdb can be used without gdb, just to control valgrind. # But normally you use it together with both valgrind and gdb. @@ -467,7 +467,6 @@ echo ===============END TESTING=============== %{_bindir}/valgrind-di-server %{_bindir}/valgrind-listener %{_bindir}/vgdb -%{_bindir}/vgstack # gdb register descriptions %{_libexecdir}/valgrind/*.xml %{_datadir}/gdb/auto-load/valgrind-monitor.py @@ -503,65 +502,6 @@ echo ===============END TESTING=============== %endif %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1:3.27.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Wed May 20 2026 Mark Wielaard - 3.27.1-1 -- Valgrind 3.27.1 final - -* Mon Apr 20 2026 Mark Wielaard - 3.27.0-1 -- Valgrind 3.27.0 final - -* Fri Apr 17 2026 Mark Wielaard - 3.27.0-0.1.RC2 -- Upstream 3.27.0-RC2 - -* Mon Apr 13 2026 Mark Wielaard - 3.27.0-0.1.RC1 -- Upstream 3.27.0-RC1 -- Remove all VALGRIND_3_26_BRANCH and proposed upstream patches - -* Thu Jan 29 2026 Mark Wielaard - 3.26.0-5 - - Add 0001-Refix-still_reachable-xml-closing-tag-and-add-testca.patch - -* Mon Jan 26 2026 Mark Wielaard - 3.26.0-4 - - Add more VALGRIND_3_26_BRANCH patches - - 0007-Bug-514613-Unclosed-leak_summary-still_reachable-tag.patch - - 0008-Bug-514206-Assertion-sr_isError-sr-failed-mmap-fd-po.patch - -* Sat Jan 17 2026 Fedora Release Engineering - 1:3.26.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Jan 8 2026 Mark Wielaard - 3.26.0-2 - - Add VALGRIND_3_26_BRANCH patches - - 0001-Prepare-NEWS-for-branch-3.26-fixes.patch - - 0002-Bug-511972-valgrind-3.26.0-tests-fail-to-build-on-up.patch - - 0003-readlink-proc-self-exe-overwrites-buffer-beyond-its-.patch - - 0004-Linux-DRD-suppression-add-an-entry-for-__is_decorate.patch - - 0005-Linux-Helgrind-add-a-suppression-for-_dl_allocate_tl.patch - - 0006-Disable-linux-madvise-MADV_GUARD_INSTALL.patch - -* Fri Oct 24 2025 Mark Wielaard - 3.26.0-1 -- Valgrind 3.26.0 final -- Clarify License of valgrind-scripts. - -* Sat Oct 18 2025 Mark Wielaard - 3.26.0-0.1.RC1 -- Upstream 3.26.0-RC1 -- Remove all VALGRIND_3_25_BRANCH and proposed upstream patches -- Refresh some-stack-protector and some-Wl-z-now patches. -- Add vgstack to valgrind-gdb. -- Update License to GPL-3.0-or-later - -* Mon Aug 11 2025 Mark Wielaard - 3.25.1-4 -- Add ppc64-strcmp-ld.patch -- Add 0003-Add-several-missing-syscall-hooks-to-ppc64-linux.patch - -* Tue Aug 5 2025 Mark Wielaard - 3.25.1-3 -- Add VALGRIND_3_25_BRANCH patches - - 0001-Prepare-NEWS-for-branch-3.25.x-fixes.patch - - 0002-Bug-503241-s390x-Support-z17-changes-to-the-NNPA-ins.patch - -* Fri Jul 25 2025 Fedora Release Engineering - 1:3.25.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - * Tue May 20 2025 Mark Wielaard - 3.25.1-1 - Valgrind 3.25.1 final