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

3.27.1-1 - Valgrind 3.27.1 final
3.27.0-1 - Valgrind 3.27.0 final
2026-07-17 08:21:24 +00:00 · 2026-05-20 15:17:12 +02:00 · 2026-04-21 01:01:18 +02:00 · 2026-04-18 03:40:19 +02:00 · 2026-04-14 03:45:16 +02:00 · 2026-01-29 12:59:20 +01:00
16 changed files with 247 additions and 1610 deletions
--- a/.gitignore
+++ b/.gitignore
@ -55,3 +55,13 @@
 /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
--- a/0001-Prepare-NEWS-for-branch-3.24-fixes.patch
+++ b/0001-Prepare-NEWS-for-branch-3.24-fixes.patch
@ -1,31 +0,0 @@
-From cc09f61e56e90c9d3a0e7231cc69b2a499d1205f Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sat, 23 Nov 2024 02:09:27 +0100
-Subject: [PATCH 01/11] Prepare NEWS for branch 3.24 fixes
-
---
- NEWS | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/NEWS b/NEWS
-index 49b4647d4295..8362e1d2df41 100644
--- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,14 @@
-+Branch 3.24
-+~~~~~~~~~~~
-+
-+* ==================== FIXED BUGS ====================
-+
-+The following bugs have been fixed or resolved on this branch.
-+
-+To see details of a given bug, visit
-+  https://bugs.kde.org/show_bug.cgi?id=XXXXXX
-+where XXXXXX is the bug number as listed above.
-+
- Release 3.24.0 (31 Oct 2024)
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 
-- 
-2.47.0
-
--- a/0002-vgdb.c-fork_and_exec_valgrind-Fix-off-by-one-error-w.patch
+++ b/0002-vgdb.c-fork_and_exec_valgrind-Fix-off-by-one-error-w.patch
@ -1,37 +0,0 @@
-From 2cb0bee2d7722b57956f66a0795b5b9106f88afc Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Tue, 12 Nov 2024 13:23:03 +0100
-Subject: [PATCH 02/11] vgdb.c (fork_and_exec_valgrind): Fix off-by-one error
- write
-
-commit 646978d9adc5 ("vgdb: Handle EINTR and EAGAIN more
-consistently") introduced an off-by-one issue trying to write back the
-error from child to parent.
-
-Instead of +1 it should have been +written (which initially is zero).
-
-This is in an "should never happen" path, so hopefully didn't really
-cause issues. But if it did happen the parent would have gotten the
-wrong error code.
-
-(cherry picked from commit f4fe5faf3d0f45b3824bbb9070232682df52a582)
---
- coregrind/vgdb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
-index 786ead160d34..112f23fe6ba1 100644
--- a/coregrind/vgdb.c
-+++ b/coregrind/vgdb.c
-@@ -1368,7 +1368,7 @@ int fork_and_exec_valgrind (int argc, char **argv, const char *working_dir,
-       // We try to write the result to the parent, but always exit.
-       size_t written = 0;
-       while (written < sizeof (int)) {
-         ssize_t nrw = write (pipefd[1], ((char *) &err) + 1,
-+         ssize_t nrw = write (pipefd[1], ((char *) &err) + written,
-                               sizeof (int) - written);
-          if (nrw == -1) {
-             if (errno == EINTR || errno == EAGAIN)
-- 
-2.47.0
-
--- a/0003-vgdb.c-fork_and_exec_valgrind-Fix-another-off-by-one.patch
+++ b/0003-vgdb.c-fork_and_exec_valgrind-Fix-another-off-by-one.patch
@ -1,36 +0,0 @@
-From 8b08da73cf3d72439c4f750c96ed2f088ef1bbec Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Tue, 12 Nov 2024 13:34:09 +0100
-Subject: [PATCH 03/11] vgdb.c (fork_and_exec_valgrind): Fix another off-by-one
- error write
-
-commit 646978d9adc5 ("vgdb: Handle EINTR and EAGAIN more
-consistently") introduced another off-by-one issue trying to write
-back the error from child to parent.
-
-Instead of +1 it should have been +written (which initially is zero).
-
-This is when the child needs to do a chdir and that chdir fails. If
-that happens the parent would have gotten the wrong error code.
-
-(cherry picked from commit 747ca4eb5fed5dd58a14391a997bb9e658e3b1c8)
---
- coregrind/vgdb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
-index 112f23fe6ba1..cc945c8dfafa 100644
--- a/coregrind/vgdb.c
-+++ b/coregrind/vgdb.c
-@@ -1289,7 +1289,7 @@ int fork_and_exec_valgrind (int argc, char **argv, const char *working_dir,
-             // We try to write the result to the parent, but always exit.
-             size_t written = 0;
-             while (written < sizeof (int)) {
-               int nrw = write (pipefd[1], ((char *)&err) + 1,
-+               int nrw = write (pipefd[1], ((char *)&err) + written,
-                                 sizeof (int) - written);
-                if (nrw == -1) {
-                   if (errno == EINTR || errno == EAGAIN)
-- 
-2.47.0
-
--- a/0004-regtest-add-a-fdleak-filter-for-write-on-write-on-li.patch
+++ b/0004-regtest-add-a-fdleak-filter-for-write-on-write-on-li.patch
@ -1,27 +0,0 @@
-From 7e79bb6e6b80eb43138cbbb64737433f9e036cd4 Mon Sep 17 00:00:00 2001
-From: Paul Floyd <pjfloyd@wanadoo.fr>
-Date: Thu, 21 Nov 2024 08:44:04 +0100
-Subject: [PATCH 04/11] regtest: add a fdleak filter for write on write on
- linux arm64
-
-(cherry picked from commit 9150b3c7cfad2fdbeb7cf707175c359ee12d8f75)
---
- none/tests/filter_fdleak | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
-index d26937bccd38..72923aa730c8 100755
--- a/none/tests/filter_fdleak
-+++ b/none/tests/filter_fdleak
-@@ -19,6 +19,8 @@ perl -p -e 's/socket\.c:[1-9][0-9]*/in \/...libc.../' |
- # arm systems substitute open for creat
- perl -p -e 's/open \(open64\.c:[1-9][0-9]*\)/creat (in \/...libc...)/' |
- perl -p -e "s/: open \(/: creat (/" |
-+# arm64 write resolved to file:line with debuginfo
-+perl -p -e "s/write\.c:[1-9][0-9]*/in \/...libc.../" |
- 
- # FreeBSD specific fdleak filters
- perl -p -e 's/ _close / close /;s/ _openat / creat /;s/internet/AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:.../' |
-- 
-2.47.0
-
--- a/0005-Add-exp-and-supp-patterns-for-missing-main-frame-for.patch
+++ b/0005-Add-exp-and-supp-patterns-for-missing-main-frame-for.patch
@ -1,491 +0,0 @@
-From ba15b8fe7d6fabfb73424a616de18a752a56430a Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sat, 23 Nov 2024 21:28:13 +0100
-Subject: [PATCH 05/11] Add exp and supp patterns for missing main frame for
- ppc64le
-
-In some cases on ppc64le we are missing the main frame.
-Add alternative .exp-ppc64le variants for socket_close_xml,
-fdleak_cmsg_xml and fdleak_ipv4_xml. And extra suppressions
-without a main frame for fdleak_cmsg_supp.
-
-See also commit 04d30049b "Filter away "main" differences in filter_fdleak"
-
-(cherry picked from commit e6960c2e41b103ab8d393cbe13dc6473fb89bffc)
---
- none/tests/fdleak_cmsg_supp.supp              |  47 ++++++
- none/tests/fdleak_cmsg_xml.stderr.exp-ppc64le | 147 ++++++++++++++++++
- none/tests/fdleak_ipv4_xml.stderr.exp-ppc64le | 139 +++++++++++++++++
- .../tests/socket_close_xml.stderr.exp-ppc64le |  98 ++++++++++++
- 4 files changed, 431 insertions(+)
- create mode 100644 none/tests/fdleak_cmsg_xml.stderr.exp-ppc64le
- create mode 100644 none/tests/fdleak_ipv4_xml.stderr.exp-ppc64le
- create mode 100644 none/tests/socket_close_xml.stderr.exp-ppc64le
-
-diff --git a/none/tests/fdleak_cmsg_supp.supp b/none/tests/fdleak_cmsg_supp.supp
-index 92fbacabdb78..a169fd888bcc 100644
--- a/none/tests/fdleak_cmsg_supp.supp
-+++ b/none/tests/fdleak_cmsg_supp.supp
-@@ -12,6 +12,13 @@
-    fun:server
-    fun:main
- }
-+{
-+   sup2-ppc64le
-+   CoreError:FdNotClosed
-+   fun:socket
-+   fun:server
-+   #fun:main
-+}
- {
-    sup3
-    CoreError:FdNotClosed
-@@ -42,3 +49,43 @@
-    fun:client
-    fun:main
- }
-+{
-+   sup6-ppc64le
-+   CoreError:FdNotClosed
-+   fun:socket
-+   fun:client
-+   #fun:main
-+}
-+{
-+   sup7
-+   CoreError:FdNotClosed
-+   fun:_so_socket
-+   fun:__xnet_socket
-+   fun:client
-+   fun:main
-+}
-+{
-+   sup8
-+   CoreError:FdNotClosed
-+   fun:__so_recvmsg
-+   fun:__xnet_recvmsg
-+   fun:client
-+   fun:main
-+}
-+{
-+   sup9
-+   CoreError:FdNotClosed
-+   fun:_so_socket
-+   fun:__xnet_socket
-+   fun:server
-+   fun:main
-+}
-+{
-+   sup10
-+   CoreError:FdNotClosed
-+   fun:__so_accept
-+   fun:accept
-+   fun:server
-+   fun:main
-+}
-+
-diff --git a/none/tests/fdleak_cmsg_xml.stderr.exp-ppc64le b/none/tests/fdleak_cmsg_xml.stderr.exp-ppc64le
-new file mode 100644
-index 000000000000..6294094eb92e
--- /dev/null
-+++ b/none/tests/fdleak_cmsg_xml.stderr.exp-ppc64le
-@@ -0,0 +1,147 @@
-+<?xml version="1.0"?>
-+
-+<valgrindoutput>
-+
-+<protocolversion>5</protocolversion>
-+<protocoltool>none</protocoltool>
-+
-+<preamble>
-+  <line>Nulgrind, the minimal Valgrind tool</line>
-+  <line>Copyright...</line>
-+  <line>Using Valgrind...</line>
-+  <line>Command: ./fdleak_cmsg</line>
-+</preamble>
-+
-+<pid>...</pid>
-+<ppid>...</ppid>
-+<tool>none</tool>
-+
-+<args>
-+  <vargv>
-+    <exe>...</exe>
-+    <arg>--command-line-only=yes</arg>
-+    <arg>--memcheck:leak-check=no</arg>
-+    <arg>--tool=none</arg>
-+    <arg>--track-fds=all</arg>
-+    <arg>--xml=yes</arg>
-+    <arg>--xml-fd=2</arg>
-+    <arg>--child-silent-after-fork=yes</arg>
-+  </vargv>
-+  <argv>
-+    <exe>...</exe>
-+  </argv>
-+</args>
-+
-+<status>
-+  <state>RUNNING</state>
-+  <time>...</time>
-+</status>
-+
-+
-+<status>
-+  <state>FINISHED</state>
-+  <time>...</time>
-+</status>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>5</fd>
-+  <path>...</path>
-+  <what>...</what>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_cmsg.c</file>
-+      <line>133</line>
-+    </frame>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>fdleak_cmsg.c</file>
-+      <line>174</line>
-+    </frame>
-+  </stack>
-+</error>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>4</fd>
-+  <path>...</path>
-+  <what>...</what>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_cmsg.c</file>
-+      <line>133</line>
-+    </frame>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>fdleak_cmsg.c</file>
-+      <line>174</line>
-+    </frame>
-+  </stack>
-+</error>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>3</fd>
-+  <what>...</what>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_cmsg.c</file>
-+      <line>112</line>
-+    </frame>
-+  </stack>
-+</error>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>2</fd>
-+  <path>...</path>
-+  <what>...</what>
-+</error>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>1</fd>
-+  <path>...</path>
-+  <what>...</what>
-+</error>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>0</fd>
-+  <path>...</path>
-+  <what>...</what>
-+</error>
-+
-+
-+</valgrindoutput>
-+
-diff --git a/none/tests/fdleak_ipv4_xml.stderr.exp-ppc64le b/none/tests/fdleak_ipv4_xml.stderr.exp-ppc64le
-new file mode 100644
-index 000000000000..df413b62895c
--- /dev/null
-+++ b/none/tests/fdleak_ipv4_xml.stderr.exp-ppc64le
-@@ -0,0 +1,139 @@
-+<?xml version="1.0"?>
-+
-+<valgrindoutput>
-+
-+<protocolversion>5</protocolversion>
-+<protocoltool>none</protocoltool>
-+
-+<preamble>
-+  <line>Nulgrind, the minimal Valgrind tool</line>
-+  <line>Copyright...</line>
-+  <line>Using Valgrind...</line>
-+  <line>Command: ./fdleak_ipv4</line>
-+</preamble>
-+
-+<pid>...</pid>
-+<ppid>...</ppid>
-+<tool>none</tool>
-+
-+<args>
-+  <vargv>
-+    <exe>...</exe>
-+    <arg>--command-line-only=yes</arg>
-+    <arg>--memcheck:leak-check=no</arg>
-+    <arg>--tool=none</arg>
-+    <arg>--track-fds=yes</arg>
-+    <arg>--xml=yes</arg>
-+    <arg>--xml-fd=2</arg>
-+    <arg>--child-silent-after-fork=yes</arg>
-+  </vargv>
-+  <argv>
-+    <exe>...</exe>
-+  </argv>
-+</args>
-+
-+<status>
-+  <state>RUNNING</state>
-+  <time>...</time>
-+</status>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdBadClose</kind>
-+  <fd>4</fd>
-+  <what>...</what>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>70</line>
-+    </frame>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>90</line>
-+    </frame>
-+  </stack>
-+  <auxwhat>Previously closed</auxwhat>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>69</line>
-+    </frame>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>90</line>
-+    </frame>
-+  </stack>
-+  <auxwhat>Originally opened</auxwhat>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>68</line>
-+    </frame>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>90</line>
-+    </frame>
-+  </stack>
-+</error>
-+
-+
-+<status>
-+  <state>FINISHED</state>
-+  <time>...</time>
-+</status>
-+
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdNotClosed</kind>
-+  <fd>3</fd>
-+  <what>...</what>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>client</fn>
-+      <dir>...</dir>
-+      <file>fdleak_ipv4.c</file>
-+      <line>51</line>
-+    </frame>
-+  </stack>
-+</error>
-+
-+<errorcounts>
-+  <pair>
-+    <count>1</count>
-+    <unique>0x........</unique>
-+  </pair>
-+</errorcounts>
-+
-+<suppcounts>
-+</suppcounts>
-+
-+</valgrindoutput>
-+
-diff --git a/none/tests/socket_close_xml.stderr.exp-ppc64le b/none/tests/socket_close_xml.stderr.exp-ppc64le
-new file mode 100644
-index 000000000000..2f2bc9831e79
--- /dev/null
-+++ b/none/tests/socket_close_xml.stderr.exp-ppc64le
-@@ -0,0 +1,98 @@
-+<?xml version="1.0"?>
-+
-+<valgrindoutput>
-+
-+<protocolversion>5</protocolversion>
-+<protocoltool>none</protocoltool>
-+
-+<preamble>
-+  <line>Nulgrind, the minimal Valgrind tool</line>
-+  <line>Copyright...</line>
-+  <line>Using Valgrind...</line>
-+  <line>Command: ./socket_close</line>
-+</preamble>
-+
-+<pid>...</pid>
-+<ppid>...</ppid>
-+<tool>none</tool>
-+
-+<args>
-+  <vargv>
-+    <exe>...</exe>
-+    <arg>--command-line-only=yes</arg>
-+    <arg>--memcheck:leak-check=no</arg>
-+    <arg>--tool=none</arg>
-+    <arg>-q</arg>
-+    <arg>--track-fds=yes</arg>
-+    <arg>--xml=yes</arg>
-+    <arg>--xml-fd=2</arg>
-+  </vargv>
-+  <argv>
-+    <exe>...</exe>
-+  </argv>
-+</args>
-+
-+<status>
-+  <state>RUNNING</state>
-+  <time>...</time>
-+</status>
-+
-+Open socket 3
-+close socket_fd 3
-+and close the socket again 3
-+<error>
-+  <unique>0x........</unique>
-+  <tid>...</tid>
-+  <kind>FdBadClose</kind>
-+  <fd>3</fd>
-+  <what>...</what>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>socket_close.c</file>
-+      <line>40</line>
-+    </frame>
-+  </stack>
-+  <auxwhat>Previously closed</auxwhat>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>main</fn>
-+      <dir>...</dir>
-+      <file>socket_close.c</file>
-+      <line>36</line>
-+    </frame>
-+  </stack>
-+  <auxwhat>Originally opened</auxwhat>
-+  <stack>
-+    <frame>
-+      <ip>0x........</ip>
-+      <obj>...</obj>
-+      <fn>open_socket</fn>
-+      <dir>...</dir>
-+      <file>socket_close.c</file>
-+      <line>17</line>
-+    </frame>
-+  </stack>
-+</error>
-+
-+
-+<status>
-+  <state>FINISHED</state>
-+  <time>...</time>
-+</status>
-+
-+<errorcounts>
-+  <pair>
-+    <count>1</count>
-+    <unique>0x........</unique>
-+  </pair>
-+</errorcounts>
-+
-+
-+</valgrindoutput>
-+
-- 
-2.47.0
-
--- a/0006-Add-additional-exp-ppc64le-files-to-EXTRA_DIST.patch
+++ b/0006-Add-additional-exp-ppc64le-files-to-EXTRA_DIST.patch
@ -1,41 +0,0 @@
-From 42f196574aebea451c7e4138b476e042ba302745 Mon Sep 17 00:00:00 2001
-From: Paul Floyd <pjfloyd@wanadoo.fr>
-Date: Sun, 24 Nov 2024 08:10:51 +0100
-Subject: [PATCH 06/11] Add additional exp-ppc64le files to EXTRA_DIST
-
-(cherry picked from commit 7241959ebb88a588eebe5a9fd35d1642db71474b)
---
- none/tests/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
-index 59be79e57920..53a6e1f6bc95 100644
--- a/none/tests/Makefile.am
-+++ b/none/tests/Makefile.am
-@@ -135,6 +135,7 @@ EXTRA_DIST = \
- 	faultstatus.vgtest faultstatus.stderr.exp faultstatus.stderr.exp-s390x \
- 	fcntl_setown.vgtest fcntl_setown.stdout.exp fcntl_setown.stderr.exp \
- 	fdleak_cmsg.stderr.exp fdleak_cmsg.vgtest \
-+	fdleak_cmsg_xml.stderr.exp-ppc64le \
- 	fdleak_cmsg_xml.stderr.exp fdleak_cmsg_xml.vgtest \
- 	fdleak_cmsg_supp.stderr.exp fdleak_cmsg_supp.supp \
- 	fdleak_cmsg_supp.vgtest \
-@@ -149,6 +150,7 @@ EXTRA_DIST = \
- 	fdleak_fcntl.stderr.exp fdleak_fcntl.vgtest \
- 	fdleak_fcntl_xml.stderr.exp fdleak_fcntl_xml.vgtest \
- 	fdleak_ipv4.stderr.exp fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \
-+	fdleak_ipv4_xml.stderr.exp-ppc64le \
- 	fdleak_ipv4_xml.stderr.exp fdleak_ipv4_xml.stdout.exp \
- 	fdleak_ipv4_xml.vgtest fdleak_ipv4_xml.stderr.exp-nomain \
- 	fdleak_open.stderr.exp fdleak_open.vgtest \
-@@ -248,6 +250,7 @@ EXTRA_DIST = \
- 	process_vm_readv_writev.stderr.exp process_vm_readv_writev.vgtest \
- 	sigprocmask.stderr.exp sigprocmask.vgtest \
- 	socket_close.stderr.exp socket_close.vgtest \
-+	socket_close_xml.stderr.exp-ppc64le \
- 	socket_close_xml.stderr.exp socket_close_xml.vgtest \
- 	file_dclose.stderr.exp file_dclose.vgtest \
- 	file_dclose_xml.stderr.exp file_dclose_xml.vgtest \
-- 
-2.47.0
-
--- a/0007-Add-support-for-landlock_create_ruleset-444-landlock.patch
+++ b/0007-Add-support-for-landlock_create_ruleset-444-landlock.patch
@ -1,358 +0,0 @@
-From 3d72dd780be97bd19331403da60908f295712fc7 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Mon, 8 Jul 2024 11:05:47 +0200
-Subject: [PATCH 07/11] Add support for landlock_create_ruleset (444),
- landlock_add_rule (445) and landlock_restrict_self (446) syscalls
-
- add support for landlock_create_ruleset (444) syscall
- add support for landlock_add_rule (445) syscall
- add support for landlock_restrict_self (446) syscall
-
-https://bugs.kde.org/show_bug.cgi?id=489913
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-
-(cherry picked from commit b1453546fe7396e7d4b4b2fc8ec7e64b71d18611)
---
- NEWS                                         |  2 +
- coregrind/m_syswrap/priv_syswrap-linux.h     |  5 ++
- coregrind/m_syswrap/syswrap-amd64-linux.c    |  4 ++
- coregrind/m_syswrap/syswrap-arm-linux.c      |  4 ++
- coregrind/m_syswrap/syswrap-arm64-linux.c    |  4 ++
- coregrind/m_syswrap/syswrap-linux.c          | 48 ++++++++++++++++++++
- coregrind/m_syswrap/syswrap-mips32-linux.c   |  4 ++
- coregrind/m_syswrap/syswrap-mips64-linux.c   |  5 +-
- coregrind/m_syswrap/syswrap-nanomips-linux.c |  3 ++
- coregrind/m_syswrap/syswrap-ppc32-linux.c    |  4 ++
- coregrind/m_syswrap/syswrap-ppc64-linux.c    |  4 ++
- coregrind/m_syswrap/syswrap-s390x-linux.c    |  4 ++
- coregrind/m_syswrap/syswrap-x86-linux.c      |  4 ++
- include/Makefile.am                          |  3 +-
- include/pub_tool_vki.h                       |  1 +
- include/vki/vki-linux-landlock.h             | 37 +++++++++++++++
- include/vki/vki-scnums-shared-linux.h        |  4 ++
- 17 files changed, 138 insertions(+), 2 deletions(-)
- create mode 100644 include/vki/vki-linux-landlock.h
-
-diff --git a/NEWS b/NEWS
-index 8362e1d2df41..68cd0c6fa603 100644
--- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,8 @@ Branch 3.24
- 
- The following bugs have been fixed or resolved on this branch.
- 
-+489913  WARNING: unhandled amd64-linux syscall: 444 (landlock_create_ruleset)
-+
- To see details of a given bug, visit
-   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
- where XXXXXX is the bug number as listed above.
-diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
-index d50cdcc981b9..221439a0ec33 100644
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
-+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
-@@ -328,6 +328,11 @@ DECL_TEMPLATE(linux, sys_pidfd_open);
- DECL_TEMPLATE(linux, sys_close_range);
- DECL_TEMPLATE(linux, sys_openat2);
- 
-+// Linux-specific (new in Linux 5.13)
-+DECL_TEMPLATE(linux, sys_landlock_create_ruleset)
-+DECL_TEMPLATE(linux, sys_landlock_add_rule)
-+DECL_TEMPLATE(linux, sys_landlock_restrict_self)
-+
- // Linux-specific (new in Linux 5.14)
- DECL_TEMPLATE(linux, sys_memfd_secret);
- 
-diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
-index 2230baf772b0..9488d3090e80 100644
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
-@@ -887,6 +887,10 @@ static SyscallTableEntry syscall_table[] = {
- 
-    LINXY(__NR_epoll_pwait2,      sys_epoll_pwait2),      // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINXY(__NR_memfd_secret,      sys_memfd_secret),      // 447
- 
-    LINX_(__NR_fchmodat2,         sys_fchmodat2),         // 452
-diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
-index d326fdb9eeda..65f64af99bb7 100644
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
-+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
-@@ -1062,6 +1062,10 @@ static SyscallTableEntry syscall_main_table[] = {
- 
-    LINXY(__NR_epoll_pwait2,      sys_epoll_pwait2),      // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINX_(__NR_fchmodat2,         sys_fchmodat2),         // 452
- };
- 
-diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
-index 05e0e421fa6c..151ae0640b10 100644
--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
-@@ -840,6 +840,10 @@ static SyscallTableEntry syscall_main_table[] = {
- 
-    LINXY(__NR_epoll_pwait2,      sys_epoll_pwait2),      // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINXY(__NR_memfd_secret,      sys_memfd_secret),      // 447
- 
-    LINX_(__NR_fchmodat2,         sys_fchmodat2),         // 452
-diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
-index eec8388224ba..70ae837a9454 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
-+++ b/coregrind/m_syswrap/syswrap-linux.c
-@@ -4163,6 +4163,54 @@ POST(sys_memfd_create)
-    }
- }
- 
-+PRE(sys_landlock_create_ruleset)
-+{
-+   PRINT("sys_landlock_create_ruleset ( %#" FMT_REGWORD "x, %lu, %lu )",
-+         ARG1, ARG2, ARG3);
-+   PRE_REG_READ3(long, "landlock_create_ruleset",
-+                 const struct vki_landlock_ruleset_attr*, attr,
-+                 vki_size_t, size, vki_uint32_t, flags);
-+   PRE_MEM_READ( "landlock_create_ruleset(value)", ARG1, ARG2 );
-+
-+   /* XXX Alternatively we could always fail with EOPNOTSUPP
-+      since the rules might interfere with valgrind itself.  */
-+}
-+
-+POST(sys_landlock_create_ruleset)
-+{
-+   /* Returns either the abi version or a file descriptor.  */
-+   if (ARG3 != VKI_LANDLOCK_CREATE_RULESET_VERSION) {
-+      if (!ML_(fd_allowed)(RES, "landlock_create_ruleset", tid, True)) {
-+         VG_(close)(RES);
-+         SET_STATUS_Failure( VKI_EMFILE );
-+      } else {
-+         if (VG_(clo_track_fds))
-+            ML_(record_fd_open_nameless)(tid, RES);
-+      }
-+   }
-+}
-+
-+PRE(sys_landlock_add_rule)
-+{
-+   PRINT("sys_landlock_add_rule ( %ld, %lu, %#" FMT_REGWORD "x, %lu )",
-+         SARG1, ARG2, ARG3, ARG4);
-+   PRE_REG_READ4(long, "landlock_add_rule",
-+                 int, ruleset_fd, enum vki_landlock_rule_type, rule_type,
-+                 const void*, rule_attr, vki_uint32_t, flags);
-+   if (!ML_(fd_allowed)(ARG1, "landlock_add_rule", tid, False))
-+      SET_STATUS_Failure(VKI_EBADF);
-+   /* XXX Depending on rule_type we should also check the given rule_attr.  */
-+}
-+
-+PRE(sys_landlock_restrict_self)
-+{
-+   PRINT("sys_landlock_restrict_self ( %ld, %lu )", SARG1, ARG2);
-+   PRE_REG_READ2(long, "landlock_create_ruleset",
-+                 int, ruleset_fd, vki_uint32_t, flags);
-+   if (!ML_(fd_allowed)(ARG1, "landlock_restrict_self", tid, False))
-+      SET_STATUS_Failure(VKI_EBADF);
-+}
-+
- PRE(sys_memfd_secret)
- {
-    PRINT("sys_memfd_secret ( %#" FMT_REGWORD "x )", ARG1);
-diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c
-index 421344213676..757b637ba986 100644
--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
-+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
-@@ -1147,6 +1147,10 @@ static SyscallTableEntry syscall_main_table[] = {
- 
-    LINXY(__NR_epoll_pwait2,      sys_epoll_pwait2),      // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINX_(__NR_fchmodat2,               sys_fchmodat2),               // 452
- };
- 
-diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c
-index e9bb5c54c59c..f0c5f7e04f4e 100644
--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
-@@ -824,7 +824,10 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY (__NR_openat2, sys_openat2),
-    LINXY (__NR_pidfd_getfd, sys_pidfd_getfd),
-    LINX_ (__NR_faccessat2, sys_faccessat2),
-   LINXY(__NR_epoll_pwait2, sys_epoll_pwait2),
-+   LINXY (__NR_epoll_pwait2, sys_epoll_pwait2),
-+   LINXY (__NR_landlock_create_ruleset, sys_landlock_create_ruleset),
-+   LINX_ (__NR_landlock_add_rule, sys_landlock_add_rule),
-+   LINX_ (__NR_landlock_restrict_self, sys_landlock_restrict_self),
-    LINX_ (__NR_fchmodat2, sys_fchmodat2),
- };
- 
-diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c
-index 36a5c0ca002d..f466aca147e0 100644
--- a/coregrind/m_syswrap/syswrap-nanomips-linux.c
-+++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c
-@@ -831,6 +831,9 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY(__NR_pidfd_getfd,             sys_pidfd_getfd),
-    LINX_ (__NR_faccessat2,             sys_faccessat2),
-    LINXY (__NR_epoll_pwait2,           sys_epoll_pwait2),
-+   LINXY (__NR_landlock_create_ruleset,sys_landlock_create_ruleset),
-+   LINX_ (__NR_landlock_add_rule,      sys_landlock_add_rule),
-+   LINX_ (__NR_landlock_restrict_self, sys_landlock_restrict_self),
-    LINX_ (__NR_fchmodat2,              sys_fchmodat2),
- };
- 
-diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
-index f7a90c753060..634f288ce0d1 100644
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
-+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
-@@ -1069,6 +1069,10 @@ static SyscallTableEntry syscall_table[] = {
- 
-    LINXY (__NR_epoll_pwait2,     sys_epoll_pwait2),      // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINX_ (__NR_fchmodat2,        sys_fchmodat2),         // 452
- };
- 
-diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
-index 8de95624fa7c..2c2def330ad7 100644
--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
-@@ -1035,6 +1035,10 @@ static SyscallTableEntry syscall_table[] = {
- 
-    LINXY (__NR_epoll_pwait2,     sys_epoll_pwait2),      // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINX_ (__NR_fchmodat2,        sys_fchmodat2),         // 452
- };
- 
-diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c
-index 8a1be8cbef54..ca571f0f1a7c 100644
--- a/coregrind/m_syswrap/syswrap-s390x-linux.c
-+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c
-@@ -875,6 +875,10 @@ static SyscallTableEntry syscall_table[] = {
- 
-    LINXY(__NR_epoll_pwait2, sys_epoll_pwait2),                        // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset),  // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),        // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),   // 446
-+
-    LINXY(__NR_memfd_secret, sys_memfd_secret),                        // 447
- 
-    LINX_ (__NR_fchmodat2, sys_fchmodat2),                             // 452
-diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
-index 31243a0db373..a23743743abe 100644
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
-+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
-@@ -1656,6 +1656,10 @@ static SyscallTableEntry syscall_table[] = {
- 
-    LINXY(__NR_epoll_pwait2,      sys_epoll_pwait2),     // 441
- 
-+   LINXY(__NR_landlock_create_ruleset, sys_landlock_create_ruleset), // 444
-+   LINX_(__NR_landlock_add_rule,       sys_landlock_add_rule),       // 445
-+   LINX_(__NR_landlock_restrict_self,  sys_landlock_restrict_self),  // 446
-+
-    LINXY(__NR_memfd_secret,      sys_memfd_secret),      // 447
- 
-    LINX_(__NR_fchmodat2,         sys_fchmodat2),         // 452
-diff --git a/include/Makefile.am b/include/Makefile.am
-index 8012d73749b3..5d5162a46eb6 100644
--- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -107,4 +107,5 @@ nobase_pkginclude_HEADERS = \
- 	vki/vki-xen-xsm.h		\
- 	vki/vki-xen-x86.h		\
- 	vki/vki-linux-drm.h		\
-	vki/vki-linux-io_uring.h
-+	vki/vki-linux-io_uring.h	\
-+	vki/vki-linux-landlock.h
-diff --git a/include/pub_tool_vki.h b/include/pub_tool_vki.h
-index 24f99cc09f16..7b6e71e11eb4 100644
--- a/include/pub_tool_vki.h
-+++ b/include/pub_tool_vki.h
-@@ -47,6 +47,7 @@
- #  include "vki/vki-linux.h"
- #  include "vki/vki-linux-drm.h"
- #  include "vki/vki-linux-io_uring.h"
-+#  include "vki/vki-linux-landlock.h"
- #elif defined(VGO_darwin)
- #  include "vki/vki-darwin.h"
- #elif defined(VGO_solaris)
-diff --git a/include/vki/vki-linux-landlock.h b/include/vki/vki-linux-landlock.h
-new file mode 100644
-index 000000000000..e549ae93eff9
--- /dev/null
-+++ b/include/vki/vki-linux-landlock.h
-@@ -0,0 +1,37 @@
-+/*
-+   This file is part of Valgrind, a dynamic binary instrumentation framework.
-+
-+   Copyright (C) 2024 Peter Seiderer <ps.report@gmx.net>
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+
-+   The GNU General Public License is contained in the file COPYING.
-+*/
-+#ifndef __VKI_LANDLOCK_H
-+#define __VKI_LANDLOCK_H
-+
-+// Derived from linux-6.9.7/include/uapi/linux/landlock.h
-+struct vki_landlock_ruleset_attr {
-+	__vki_u64 handled_access_fs;
-+	__vki_u64 handled_access_net;
-+};
-+
-+enum vki_landlock_rule_type {
-+	VKI_LANDLOCK_RULE_PATH_BENEATH = 1,
-+	VKI_LANDLOCK_RULE_NET_PORT,
-+};
-+
-+#define VKI_LANDLOCK_CREATE_RULESET_VERSION 1
-+
-+#endif
-diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h
-index 068a2cd12bd6..20346ca71678 100644
--- a/include/vki/vki-scnums-shared-linux.h
-+++ b/include/vki/vki-scnums-shared-linux.h
-@@ -48,6 +48,10 @@
- 
- #define __NR_epoll_pwait2		441
- 
-+#define __NR_landlock_create_ruleset	444
-+#define __NR_landlock_add_rule		445
-+#define __NR_landlock_restrict_self	446
-+
- #define __NR_memfd_secret		447
- 
- #define __NR_fchmodat2		452
-- 
-2.47.0
-
--- a/0008-helgrind-tests-tc17_sembar.c-Remove-bool-typedef.patch
+++ b/0008-helgrind-tests-tc17_sembar.c-Remove-bool-typedef.patch
@ -1,35 +0,0 @@
-From 459fa5b82df0d07cf871fc7359a060410052b82e Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sat, 23 Nov 2024 22:37:14 +0100
-Subject: [PATCH 08/11] helgrind/tests/tc17_sembar.c: Remove bool typedef
-
-Since C23 bool is a keyword. Also bool wasn't actually used.
-
-tc17_sembar.c:45:14: error: both 'long' and '_Bool' in declaration specifiers
-   45 | typedef long bool;
-      |              ^~~~
-tc17_sembar.c:45:1: warning: useless type name in empty declaration
-   45 | typedef long bool;
-      | ^~~~~~~
-
-(cherry picked from commit 932bf2c027579c8d933b57ed80bb5842b390bdb3)
---
- helgrind/tests/tc17_sembar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/helgrind/tests/tc17_sembar.c b/helgrind/tests/tc17_sembar.c
-index 36412a07e206..ee40160b082d 100644
--- a/helgrind/tests/tc17_sembar.c
-+++ b/helgrind/tests/tc17_sembar.c
-@@ -42,7 +42,7 @@ typedef struct
-   sem_t* xxx;
- } gomp_barrier_t;
- 
-typedef long bool;
-+
- 
- void
- gomp_barrier_init (gomp_barrier_t *bar, unsigned count)
-- 
-2.47.0
-
--- a/0009-drd-tests-swapcontext.c-Rename-typedef-struct-thread.patch
+++ b/0009-drd-tests-swapcontext.c-Rename-typedef-struct-thread.patch
@ -1,38 +0,0 @@
-From c08e155fdf6641a569053b3a70c52bfae09dd34c Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sat, 23 Nov 2024 22:48:03 +0100
-Subject: [PATCH 09/11] drd/tests/swapcontext.c: Rename typedef struct
- thread_local to threadlocal
-
-Since C23 thread_local is a keyword (thread storage duration).
-
-swapcontext.c:23:16: error: expected '{' before 'thread_local'
-   23 | typedef struct thread_local {
-      |                ^~~~~~~~~~~~
-swapcontext.c:23:16: warning: 'thread_local' is not at beginning of declaration [-Wold-style-declaration]
-swapcontext.c:23:16: error: 'thread_local' used with 'typedef'
-swapcontext.c:26:3: warning: data definition has no type or storage class
-   26 | } thread_local_t;
-      |   ^~~~~~~~~~~~~~
-
-(cherry picked from commit 907b985725805f1537396a6d76539bf490cc6c7e)
---
- drd/tests/swapcontext.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drd/tests/swapcontext.c b/drd/tests/swapcontext.c
-index 2cb969a5eafa..ec191968cab1 100644
--- a/drd/tests/swapcontext.c
-+++ b/drd/tests/swapcontext.c
-@@ -20,7 +20,7 @@
- 
- #define STACKSIZE (PTHREAD_STACK_MIN + 4096)
- 
-typedef struct thread_local {
-+typedef struct threadlocal {
-   ucontext_t uc[3];
-   size_t nrsw;
- } thread_local_t;
-- 
-2.47.0
-
--- a/0010-none-tests-bug234814.c-sa_handler-take-an-int-as-arg.patch
+++ b/0010-none-tests-bug234814.c-sa_handler-take-an-int-as-arg.patch
@ -1,34 +0,0 @@
-From 53d667789d369042b1fe45f72102ecb5c16e5d12 Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sat, 23 Nov 2024 22:59:21 +0100
-Subject: [PATCH 10/11] none/tests/bug234814.c: sa_handler take an int as
- argument
-
-GCC15 will turn this warning into an error:
-
-bug234814.c: In function 'main':
-bug234814.c:20:18: error: assignment to '__sighandler_t' {aka 'void (*)(int)'} from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
-   20 |    sa.sa_handler = mysigbus;
-      |                  ^
-
-(cherry picked from commit 8f6cef269b91739f6a2e7f3b4b1e0a429db3e748)
---
- none/tests/bug234814.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/none/tests/bug234814.c b/none/tests/bug234814.c
-index 16b561fde6b0..11e0f6779162 100644
--- a/none/tests/bug234814.c
-+++ b/none/tests/bug234814.c
-@@ -9,7 +9,7 @@ const char kSigbus[] = "I caught the SIGBUS signal!\n";
- 
- int GLOB = 3;
- 
-void mysigbus() {
-+void mysigbus(int signum) {
-    write(1, kSigbus, sizeof(kSigbus)-1);
-    GLOB--;
-    return;
-- 
-2.47.0
-
--- a/0011-Add-open_tree-move_mount-fsopen-fsconfig-fsmount-fsp.patch
+++ b/0011-Add-open_tree-move_mount-fsopen-fsconfig-fsmount-fsp.patch
@ -1,398 +0,0 @@
-From 349b57d3a8c8d2df23128d4b03eca91b629629e1 Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Tue, 26 Nov 2024 19:00:34 +0100
-Subject: [PATCH 11/11] Add open_tree, move_mount, fsopen, fsconfig, fsmount,
- fspick linux syswraps
-
-Shared linux syscalls implementing various file system mount tasks.
-Since linux kernel version 5.2.
-
-Check arguments and track file descriptors.
-
-https://bugs.kde.org/show_bug.cgi?id=494246
-
-(cherry picked from commit 4044bcea0427853fc44a3d02a0fc0b2a81935452)
---
- NEWS                                         |   1 +
- coregrind/m_syswrap/priv_syswrap-linux.h     |   8 +
- coregrind/m_syswrap/syswrap-amd64-linux.c    |   6 +
- coregrind/m_syswrap/syswrap-arm-linux.c      |   7 +-
- coregrind/m_syswrap/syswrap-arm64-linux.c    |   7 +-
- coregrind/m_syswrap/syswrap-linux.c          | 146 +++++++++++++++++++
- coregrind/m_syswrap/syswrap-mips32-linux.c   |   7 +-
- coregrind/m_syswrap/syswrap-mips64-linux.c   |   6 +
- coregrind/m_syswrap/syswrap-nanomips-linux.c |   6 +
- coregrind/m_syswrap/syswrap-ppc32-linux.c    |   7 +-
- coregrind/m_syswrap/syswrap-ppc64-linux.c    |   7 +-
- coregrind/m_syswrap/syswrap-s390x-linux.c    |   7 +-
- coregrind/m_syswrap/syswrap-x86-linux.c      |   7 +-
- 13 files changed, 215 insertions(+), 7 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 68cd0c6fa603..7f1334aa0f07 100644
--- a/NEWS
-+++ b/NEWS
-@@ -6,6 +6,7 @@ Branch 3.24
- The following bugs have been fixed or resolved on this branch.
- 
- 489913  WARNING: unhandled amd64-linux syscall: 444 (landlock_create_ruleset)
-+494246  syscall fsopen not wrapped
- 
- To see details of a given bug, visit
-   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
-diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
-index 221439a0ec33..1bdd9a94ec19 100644
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
-+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
-@@ -321,6 +321,14 @@ DECL_TEMPLATE(linux, sys_io_uring_setup);
- DECL_TEMPLATE(linux, sys_io_uring_enter);
- DECL_TEMPLATE(linux, sys_io_uring_register);
- 
-+// open_tree and friends (shared linux syscalls)
-+DECL_TEMPLATE(linux, sys_open_tree);
-+DECL_TEMPLATE(linux, sys_move_mount);
-+DECL_TEMPLATE(linux, sys_fsopen);
-+DECL_TEMPLATE(linux, sys_fsconfig);
-+DECL_TEMPLATE(linux, sys_fsmount);
-+DECL_TEMPLATE(linux, sys_fspick);
-+
- // Linux-specific (new in Linux 5.3)
- DECL_TEMPLATE(linux, sys_pidfd_open);
- 
-diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
-index 9488d3090e80..bdba41826ad8 100644
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
-@@ -877,6 +877,12 @@ static SyscallTableEntry syscall_table[] = {
-    LINXY(__NR_io_uring_setup,    sys_io_uring_setup),    // 425
-    LINXY(__NR_io_uring_enter,    sys_io_uring_enter),    // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
-+   LINXY(__NR_open_tree,         sys_open_tree),         // 428
-+   LINX_(__NR_move_mount,        sys_move_mount),        // 429
-+   LINXY(__NR_fsopen,            sys_fsopen),            // 430
-+   LINX_(__NR_fsconfig,          sys_fsconfig),          // 431
-+   LINXY(__NR_fsmount,           sys_fsmount),           // 432
-+   LINXY(__NR_fspick,            sys_fspick),            // 433
- 
-    LINXY(__NR_pidfd_open,        sys_pidfd_open),        // 434
-    GENX_(__NR_clone3,            sys_ni_syscall),        // 435
-diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
-index 65f64af99bb7..108e1f91e5e9 100644
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
-+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
-@@ -1052,7 +1052,12 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY(__NR_io_uring_setup,    sys_io_uring_setup),    // 425
-    LINXY(__NR_io_uring_enter,    sys_io_uring_enter),    // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
-
-+   LINXY(__NR_open_tree,         sys_open_tree),         // 428
-+   LINX_(__NR_move_mount,        sys_move_mount),        // 429
-+   LINXY(__NR_fsopen,            sys_fsopen),            // 430
-+   LINX_(__NR_fsconfig,          sys_fsconfig),          // 431
-+   LINXY(__NR_fsmount,           sys_fsmount),           // 432
-+   LINXY(__NR_fspick,            sys_fspick),            // 433
-    LINXY(__NR_pidfd_open,        sys_pidfd_open),        // 434
-    GENX_(__NR_clone3,            sys_ni_syscall),        // 435
-    LINXY(__NR_close_range,       sys_close_range),       // 436
-diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
-index 151ae0640b10..23b0b6b51c10 100644
--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
-@@ -830,7 +830,12 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY(__NR_io_uring_setup,    sys_io_uring_setup),    // 425
-    LINXY(__NR_io_uring_enter,    sys_io_uring_enter),    // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
-
-+   LINXY(__NR_open_tree,         sys_open_tree),         // 428
-+   LINX_(__NR_move_mount,        sys_move_mount),        // 429
-+   LINXY(__NR_fsopen,            sys_fsopen),            // 430
-+   LINX_(__NR_fsconfig,          sys_fsconfig),          // 431
-+   LINXY(__NR_fsmount,           sys_fsmount),           // 432
-+   LINXY(__NR_fspick,            sys_fspick),            // 433
-    LINXY(__NR_pidfd_open,        sys_pidfd_open),        // 434
-    GENX_(__NR_clone3,            sys_ni_syscall),        // 435
-    LINXY(__NR_close_range,       sys_close_range),       // 436
-diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
-index 70ae837a9454..57672f167126 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
-+++ b/coregrind/m_syswrap/syswrap-linux.c
-@@ -13836,6 +13836,152 @@ POST(sys_pidfd_getfd)
-    }
- }
- 
-+/* int open_tree (int dfd, const char *filename, unsigned int flags)  */
-+PRE(sys_open_tree)
-+{
-+   PRINT("sys_open_tree ( %ld, %#" FMT_REGWORD "x(%s), %ld",
-+         SARG1, ARG2, (HChar*)(Addr)ARG2, SARG3);
-+   PRE_REG_READ3(long, "open_tree",
-+                 int, dfd, const char *, filename, int, flags);
-+   PRE_MEM_RASCIIZ( "open_tree(filename)", ARG2);
-+   /* For absolute filenames, dfd is ignored.  If dfd is AT_FDCWD,
-+      filename is relative to cwd.  When comparing dfd against AT_FDCWD,
-+      be sure only to compare the bottom 32 bits. */
-+   if (ML_(safe_to_deref)( (void*)(Addr)ARG2, 1 )
-+       && *(Char *)(Addr)ARG2 != '/'
-+       && ((Int)ARG1) != ((Int)VKI_AT_FDCWD)
-+       && !ML_(fd_allowed)(ARG1, "open_tree", tid, False))
-+      SET_STATUS_Failure( VKI_EBADF );
-+}
-+
-+POST(sys_open_tree)
-+{
-+   if (!ML_(fd_allowed)(RES, "open_tree", tid, True)) {
-+      VG_(close)(RES);
-+      SET_STATUS_Failure( VKI_EMFILE );
-+   } else {
-+      if (VG_(clo_track_fds))
-+         ML_(record_fd_open_with_given_name)(tid, RES, (HChar*)(Addr)ARG2);
-+   }
-+}
-+
-+/* int move_mount (int from_dfd, const char *from_pathname,
-+                   int to_dfd, const char *to_pathname,
-+                   unsigned int flags)  */
-+PRE(sys_move_mount)
-+{
-+   PRINT("sys_move_mount ( %ld, %#" FMT_REGWORD "x(%s), "
-+         "%ld, %#" FMT_REGWORD "x(%s), %ld",
-+         SARG1, ARG2, (HChar*)(Addr)ARG2,
-+         SARG3, ARG4, (HChar*)(Addr)ARG4, SARG5);
-+   PRE_REG_READ5(long, "mount_move",
-+                 int, from_dfd, const char *, from_pathname,
-+                 int, to_dfd, const char*, to_pathname, int, flags);
-+   PRE_MEM_RASCIIZ( "mount_move(from_pathname)", ARG2);
-+   /* For absolute filenames, from_dfd is ignored.  If from_dfd is AT_FDCWD,
-+      from_pathname is relative to cwd.  When comparing from_dfd against
-+      AT_FDCWD, be sure only to compare the bottom 32 bits. */
-+   if (ML_(safe_to_deref)( (void*)(Addr)ARG2, 1 )
-+       && *(Char *)(Addr)ARG2 != '/'
-+       && ((Int)ARG1) != ((Int)VKI_AT_FDCWD)
-+       && !ML_(fd_allowed)(ARG1, "mount_move", tid, False))
-+      SET_STATUS_Failure( VKI_EBADF );
-+   PRE_MEM_RASCIIZ( "mount_move(from_pathname)", ARG4);
-+   /* For absolute filenames, to_dfd is ignored.  If to_dfd is AT_FDCWD,
-+      to_pathname is relative to cwd.  When comparing to_dfd against
-+      AT_FDCWD, be sure only to compare the bottom 32 bits. */
-+   if (ML_(safe_to_deref)( (void*)(Addr)ARG4, 1 )
-+       && *(Char *)(Addr)ARG4 != '/'
-+       && ((Int)ARG4) != ((Int)VKI_AT_FDCWD)
-+       && !ML_(fd_allowed)(ARG3, "mount_move", tid, False))
-+      SET_STATUS_Failure( VKI_EBADF );
-+}
-+
-+/* int fsopen (const char *fs_name, unsigned int flags)  */
-+PRE(sys_fsopen)
-+{
-+   PRINT("sys_fsopen ( %#" FMT_REGWORD "x(%s), %ld",
-+         ARG1, (HChar*)(Addr)ARG1, SARG2);
-+   PRE_REG_READ2(long, "fsopen", const char *, fs_name, int, flags);
-+   PRE_MEM_RASCIIZ( "fsopen(filename)", ARG1);
-+}
-+
-+POST(sys_fsopen)
-+{
-+   if (!ML_(fd_allowed)(RES, "fsopen", tid, True)) {
-+      VG_(close)(RES);
-+      SET_STATUS_Failure( VKI_EMFILE );
-+   } else {
-+      if (VG_(clo_track_fds))
-+         ML_(record_fd_open_with_given_name)(tid, RES, (HChar*)(Addr)ARG1);
-+   }
-+}
-+
-+/* int fsmount (int fd, unsigned int flags, unsigned int ms_flags)  */
-+PRE(sys_fsmount)
-+{
-+   PRINT("sys_fsmount ( %ld, %ld, %ld", SARG1, SARG2, SARG3);
-+   PRE_REG_READ3(long, "fsmount", int, fd, int, flags, int, ms_flags);
-+   if (!ML_(fd_allowed)(ARG1, "fsmount", tid, False))
-+      SET_STATUS_Failure( VKI_EBADF );
-+}
-+
-+POST(sys_fsmount)
-+{
-+   if (!ML_(fd_allowed)(RES, "fsmount", tid, True)) {
-+      VG_(close)(RES);
-+      SET_STATUS_Failure( VKI_EMFILE );
-+   } else {
-+      if (VG_(clo_track_fds))
-+         ML_(record_fd_open_nameless)(tid, RES);
-+   }
-+}
-+
-+/* int fsconfig (int fd, unsigned int cmd, const char *key,
-+                 const void *value, int aux)  */
-+PRE(sys_fsconfig)
-+{
-+   PRINT("sys_fsconfig ( %ld, %ld, %#" FMT_REGWORD "x(%s), "
-+         "%#" FMT_REGWORD "x, %ld )",
-+         SARG1, SARG2, ARG3, (HChar*)(Addr)ARG3, ARG4, SARG6);
-+   PRE_REG_READ5(long, "fsconfig", int, fd, int, cmd,
-+                 const char *, key, const void *, value, int, aux);
-+   if (ARG3)
-+      PRE_MEM_RASCIIZ( "fsconfig(key)", ARG3);
-+   if (!ML_(fd_allowed)(ARG1, "fsconfig", tid, False))
-+      SET_STATUS_Failure( VKI_EBADF );
-+   /* XXX we could also check the value based on the cmd FSCONFIG_...  */
-+}
-+
-+/* int fspick (int dfd, const char *path, unsigned int flags)  */
-+PRE(sys_fspick)
-+{
-+   PRINT("sys_fspick ( %ld, %#" FMT_REGWORD "x(%s), %ld",
-+         SARG1, ARG2, (HChar*)(Addr)ARG2, SARG3);
-+   PRE_REG_READ3(long, "fspick",
-+                 int, dfd, const char *, filename, int, flags);
-+   PRE_MEM_RASCIIZ( "fspick(path)", ARG2);
-+   /* For absolute filenames, dfd is ignored.  If dfd is AT_FDCWD,
-+      path is relative to cwd.  When comparing dfd against AT_FDCWD,
-+      be sure only to compare the bottom 32 bits. */
-+   if (ML_(safe_to_deref)( (void*)(Addr)ARG2, 1 )
-+       && *(Char *)(Addr)ARG2 != '/'
-+       && ((Int)ARG1) != ((Int)VKI_AT_FDCWD)
-+       && !ML_(fd_allowed)(ARG1, "fspick", tid, False))
-+      SET_STATUS_Failure( VKI_EBADF );
-+}
-+
-+POST(sys_fspick)
-+{
-+   if (!ML_(fd_allowed)(RES, "fspick", tid, True)) {
-+      VG_(close)(RES);
-+      SET_STATUS_Failure( VKI_EMFILE );
-+   } else {
-+      if (VG_(clo_track_fds))
-+         ML_(record_fd_open_with_given_name)(tid, RES, (HChar*)(Addr)ARG2);
-+   }
-+}
-+
- #undef PRE
- #undef POST
- 
-diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c
-index 757b637ba986..39ba911aa5e4 100644
--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
-+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
-@@ -1137,7 +1137,12 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY(__NR_io_uring_setup,          sys_io_uring_setup),          // 425
-    LINXY(__NR_io_uring_enter,          sys_io_uring_enter),          // 426
-    LINXY(__NR_io_uring_register,       sys_io_uring_register),       // 427
-
-+   LINXY(__NR_open_tree,               sys_open_tree),               // 428
-+   LINX_(__NR_move_mount,              sys_move_mount),              // 429
-+   LINXY(__NR_fsopen,                  sys_fsopen),                  // 430
-+   LINX_(__NR_fsconfig,                sys_fsconfig),                // 431
-+   LINXY(__NR_fsmount,                 sys_fsmount),                 // 432
-+   LINXY(__NR_fspick,                  sys_fspick),                  // 433
-    LINXY(__NR_pidfd_open,              sys_pidfd_open),              // 434
-    GENX_(__NR_clone3,                  sys_ni_syscall),              // 435
-    LINXY(__NR_close_range,       sys_close_range),       // 436
-diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c
-index f0c5f7e04f4e..d603924c5566 100644
--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
-@@ -818,6 +818,12 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY (__NR_io_uring_setup, sys_io_uring_setup),
-    LINXY (__NR_io_uring_enter, sys_io_uring_enter),
-    LINXY (__NR_io_uring_register, sys_io_uring_register),
-+   LINXY (__NR_open_tree, sys_open_tree),
-+   LINX_ (__NR_move_mount, sys_move_mount),
-+   LINXY (__NR_fsopen, sys_fsopen),
-+   LINX_ (__NR_fsconfig, sys_fsconfig),
-+   LINXY (__NR_fsmount, sys_fsmount),
-+   LINXY (__NR_fspick, sys_fspick),
-    LINXY (__NR_pidfd_open, sys_pidfd_open),
-    GENX_ (__NR_clone3, sys_ni_syscall),
-    LINXY (__NR_close_range, sys_close_range),
-diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c
-index f466aca147e0..853495e981b1 100644
--- a/coregrind/m_syswrap/syswrap-nanomips-linux.c
-+++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c
-@@ -824,6 +824,12 @@ static SyscallTableEntry syscall_main_table[] = {
-    LINXY (__NR_io_uring_setup,         sys_io_uring_setup),
-    LINXY (__NR_io_uring_enter,         sys_io_uring_enter),
-    LINXY (__NR_io_uring_register,      sys_io_uring_register),
-+   LINXY (__NR_open_tree,              sys_open_tree),
-+   LINX_ (__NR_move_mount,             sys_move_mount),
-+   LINXY (__NR_fsopen,                 sys_fsopen),
-+   LINX_ (__NR_fsconfig,               sys_fsconfig),
-+   LINXY (__NR_fsmount,                sys_fsmount),
-+   LINXY (__NR_fspick,                 sys_fspick),
-    LINXY (__NR_pidfd_open,             sys_pidfd_open),
-    GENX_ (__NR_clone3,                 sys_ni_syscall),
-    LINXY (__NR_close_range,            sys_close_range),
-diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
-index 634f288ce0d1..24d8eb213190 100644
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
-+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
-@@ -1059,7 +1059,12 @@ static SyscallTableEntry syscall_table[] = {
-    LINXY(__NR_io_uring_setup,    sys_io_uring_setup),    // 425
-    LINXY(__NR_io_uring_enter,    sys_io_uring_enter),    // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
-
-+   LINXY(__NR_open_tree,         sys_open_tree),         // 428
-+   LINX_(__NR_move_mount,        sys_move_mount),        // 429
-+   LINXY(__NR_fsopen,            sys_fsopen),            // 430
-+   LINX_(__NR_fsconfig,          sys_fsconfig),          // 431
-+   LINXY(__NR_fsmount,           sys_fsmount),           // 432
-+   LINXY(__NR_fspick,            sys_fspick),            // 433
-    LINXY(__NR_pidfd_open,        sys_pidfd_open),        // 434
-    GENX_(__NR_clone3,            sys_ni_syscall),        // 435
-    LINXY(__NR_close_range,       sys_close_range),       // 436
-diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
-index 2c2def330ad7..2a3ed8b92481 100644
--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
-@@ -1025,7 +1025,12 @@ static SyscallTableEntry syscall_table[] = {
-    LINXY(__NR_io_uring_setup,    sys_io_uring_setup),    // 425
-    LINXY(__NR_io_uring_enter,    sys_io_uring_enter),    // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
-
-+   LINXY(__NR_open_tree,         sys_open_tree),         // 428
-+   LINX_(__NR_move_mount,        sys_move_mount),        // 429
-+   LINXY(__NR_fsopen,            sys_fsopen),            // 430
-+   LINX_(__NR_fsconfig,          sys_fsconfig),          // 431
-+   LINXY(__NR_fsmount,           sys_fsmount),           // 432
-+   LINXY(__NR_fspick,            sys_fspick),            // 433
-    LINXY(__NR_pidfd_open,        sys_pidfd_open),        // 434
-    GENX_(__NR_clone3,            sys_ni_syscall),        // 435
-    LINXY(__NR_close_range,       sys_close_range),       // 436
-diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c
-index ca571f0f1a7c..893306bbdae3 100644
--- a/coregrind/m_syswrap/syswrap-s390x-linux.c
-+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c
-@@ -865,7 +865,12 @@ static SyscallTableEntry syscall_table[] = {
-    LINXY(__NR_io_uring_setup, sys_io_uring_setup),                    // 425
-    LINXY(__NR_io_uring_enter, sys_io_uring_enter),                    // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register),              // 427
-
-+   LINXY(__NR_open_tree, sys_open_tree),                              // 428
-+   LINX_(__NR_move_mount, sys_move_mount),                            // 429
-+   LINXY(__NR_fsopen, sys_fsopen),                                    // 430
-+   LINX_(__NR_fsconfig, sys_fsconfig),                                // 431
-+   LINXY(__NR_fsmount, sys_fsmount),                                  // 432
-+   LINXY(__NR_fspick, sys_fspick),                                    // 433
-    LINXY(__NR_pidfd_open, sys_pidfd_open),                            // 434
-    GENX_(__NR_clone3, sys_ni_syscall),                                // 435
-    LINXY(__NR_close_range, sys_close_range),                          // 436
-diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
-index a23743743abe..50384817dbe5 100644
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
-+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
-@@ -1646,7 +1646,12 @@ static SyscallTableEntry syscall_table[] = {
-    LINXY(__NR_io_uring_setup,    sys_io_uring_setup),   // 425
-    LINXY(__NR_io_uring_enter,    sys_io_uring_enter),   // 426
-    LINXY(__NR_io_uring_register, sys_io_uring_register),// 427
-
-+   LINXY(__NR_open_tree,         sys_open_tree),        // 428
-+   LINX_(__NR_move_mount,        sys_move_mount),       // 429
-+   LINXY(__NR_fsopen,            sys_fsopen),           // 430
-+   LINX_(__NR_fsconfig,          sys_fsconfig),         // 431
-+   LINXY(__NR_fsmount,           sys_fsmount),          // 432
-+   LINXY(__NR_fspick,            sys_fspick),           // 433
-    LINXY(__NR_pidfd_open,        sys_pidfd_open),       // 434
-    GENX_(__NR_clone3,            sys_ni_syscall),       // 435
-    LINXY(__NR_close_range,       sys_close_range),      // 436
-- 
-2.47.0
-
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (valgrind-3.24.0.tar.bz2) = 6c131ff93d1f432d8362a47285cc377cba224ebca4f18e922c6156f7736d43020ece14d8fd16913498ab00fd18c85e2042a7d5351c3901e80413c584ebb406f3
+SHA512 (valgrind-3.27.1.tar.bz2) = 4522e345fe31bc10478f21ab261cf7b3e509d80fe98fd0c7c9778ac9a9f90e1d8fa6e54a37c2e23114c01c95131035103fc1e78661710d7f45f5d564a31c1015
--- a/valgrind-3.26.0-some-Wl-z-now.patch
+++ b/valgrind-3.26.0-some-Wl-z-now.patch
@ -1,34 +1,28 @@
-commit d3c977726064ba09fed6dfc7daf22b16824c97b4
-Author: Mark Wielaard <mark@klomp.org>
-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 1b7842b..e211eec 100644
+index 2b8703cf1a63..8cb828b85c57 100644
 --- a/auxprogs/Makefile.am
 +++ b/auxprogs/Makefile.am
-@@ -32,7 +32,7 @@ valgrind_listener_SOURCES = valgrind-listener.c
+@@ -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) -fstack-protector-strong
+ 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
-@@ -51,7 +51,7 @@ valgrind_di_server_SOURCES   = valgrind-di-server.c
+@@ -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) -fstack-protector-strong
+ 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
-@@ -86,7 +86,7 @@ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES   = getoff.c
+@@ -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@) -fstack-protector-strong
+ 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
@ -36,21 +30,21 @@ index 1b7842b..e211eec 100644
 getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
 endif
 diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
-index 3c73210..fb6b7bb 100644
+index 0bcb4a4f423f..59fc48052e50 100644
 --- a/coregrind/Makefile.am
 +++ b/coregrind/Makefile.am
-@@ -57,7 +57,7 @@ RANLIB = ${LTO_RANLIB}
+@@ -64,7 +64,7 @@ RANLIB = ${LTO_RANLIB}
 valgrind_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
- valgrind_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
+ 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
-@@ -104,7 +104,7 @@
+@@ -106,7 +106,7 @@ endif
 vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
- vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
+ 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
--- a/valgrind-3.26.0-some-stack-protector.patch
+++ b/valgrind-3.26.0-some-stack-protector.patch
@ -1,46 +1,49 @@
-commit b73fb7a614e1b5d60af23fb0752b5cead995e02e
-Author: Mark Wielaard <mark@klomp.org>
-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 56cc5ef..1b7842b 100644
+index d96e7fd0a968..2b8703cf1a63 100644
 --- a/auxprogs/Makefile.am
 +++ b/auxprogs/Makefile.am
-@@ -30,7 +30,7 @@ bin_PROGRAMS = valgrind-listener valgrind-di-server
+@@ -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)
-+valgrind_listener_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
+-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
-@@ -49,7 +49,7 @@ endif
+@@ -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)
-+valgrind_di_server_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
+-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
-@@ -84,7 +84,7 @@ endif
+@@ -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@)
-+getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS    = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fstack-protector-strong
+-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 f8c798b..ccc8f52 100755
+index 90fafaf1c557..84a3d22c5bff 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2352,24 +2352,24 @@
- AM_CONDITIONAL([HAVE_ALIGNED_CXX_ALLOC], [test x$ac_have_aligned_cxx_alloc = xyes])
+@@ -3004,24 +3004,24 @@
+ fi
 
 # does this compiler support -fno-stack-protector ?
 -AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
@ -82,24 +85,24 @@ index f8c798b..ccc8f52 100755
 
 # does this compiler support -finline-functions ?
 diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
-index 94030fd..3c73210 100644
+index 4ead1542b0c7..0bcb4a4f423f 100644
 --- a/coregrind/Makefile.am
 +++ b/coregrind/Makefile.am
-@@ -55,7 +55,7 @@ AR = ${LTO_AR}
+@@ -62,7 +62,7 @@ AR = ${LTO_AR}
 RANLIB = ${LTO_RANLIB}
 
 valgrind_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
-valgrind_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
-+valgrind_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
+-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,
-@@ -102,7 +102,7 @@
+@@ -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)
-+vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
+-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
--- a/valgrind.spec
+++ b/valgrind.spec
@ -2,7 +2,7 @@

 Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
-Version: 3.24.0
+Version: 3.27.1
 Release: 2%{?dist}
 Epoch: 1

@ -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-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
+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
 URL: https://www.valgrind.org/

 # Are we building for a Software Collection?
@ -80,23 +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.16.0-some-stack-protector.patch
+Patch3: valgrind-3.26.0-some-stack-protector.patch

 # Add some -Wl,z,now.
-Patch4: valgrind-3.16.0-some-Wl-z-now.patch
-
-# VALGRIND_3_24_BRANCH patches
-Patch5: 0001-Prepare-NEWS-for-branch-3.24-fixes.patch
-Patch6: 0002-vgdb.c-fork_and_exec_valgrind-Fix-off-by-one-error-w.patch
-Patch7: 0003-vgdb.c-fork_and_exec_valgrind-Fix-another-off-by-one.patch
-Patch8: 0004-regtest-add-a-fdleak-filter-for-write-on-write-on-li.patch
-Patch9: 0005-Add-exp-and-supp-patterns-for-missing-main-frame-for.patch
-Patch10: 0006-Add-additional-exp-ppc64le-files-to-EXTRA_DIST.patch
-Patch11: 0007-Add-support-for-landlock_create_ruleset-444-landlock.patch
-Patch12: 0008-helgrind-tests-tc17_sembar.c-Remove-bool-typedef.patch
-Patch13: 0009-drd-tests-swapcontext.c-Rename-typedef-struct-thread.patch
-Patch14: 0010-none-tests-bug234814.c-sa_handler-take-an-int-as-arg.patch
-Patch15: 0011-Add-open_tree-move_mount-fsopen-fsconfig-fsmount-fsp.patch
+Patch4: valgrind-3.26.0-some-Wl-z-now.patch

 BuildRequires: make
 BuildRequires: glibc-devel
@ -136,6 +123,11 @@ BuildRequires: elfutils-debuginfod-client
 Recommends: elfutils-debuginfod-client
 %endif

+# Optional subpackages
+Recommends: %{?scl_prefix}valgrind-docs = %{epoch}:%{version}-%{release}
+Recommends: %{?scl_prefix}valgrind-scripts = %{epoch}:%{version}-%{release}
+Recommends: %{?scl_prefix}valgrind-gdb = %{epoch}:%{version}-%{release}
+
 # For running the testsuite.
 # Some of the python scripts require python 3.9+
 BuildRequires: python3-devel
@ -145,7 +137,7 @@ BuildRequires: python3-devel
 # We could use %%valgrind_arches as defined in redhat-rpm-config
 # But that is really for programs using valgrind, it defines the
 # set of architectures that valgrind works correctly on.
-ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 riscv64

 # Define valarch, the architecture name that valgrind uses
 # And only_arch, the configure option to only build for that arch.
@ -181,6 +173,10 @@ ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
 %define valarch arm64
 %define only_arch --enable-only64bit
 %endif
+%ifarch riscv64
+%define valarch riscv64
+%define only_arch --enable-only64bit
+%endif

 %description
 Valgrind is an instrumentation framework for building dynamic analysis
@ -200,11 +196,43 @@ Summary: Development files for valgrind aware programs
 # But that doesnt have a SPDX identifier yet
 # https://gitlab.com/fedora/legal/fedora-license-data/-/issues/422
 License: bzip2-1.0.6
-Requires: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release}
+# These are just the header files, so strictly speaking you don't
+# need valgrind itself unless you are testing your builds. This used
+# to be a Requires, so people might depend on the package pulling in
+# the core valgrind package, so make it at least a weak dependency.
+Recommends: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release}

 %description devel
 Header files and libraries for development of valgrind aware programs.

+%package docs
+Summary: Documentation for valgrind tools, scripts and gdb integration
+License: GFDL-1.2-or-later
+
+%description docs
+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)
+# 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}
+
+%description scripts
+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
+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.
+Recommends: gdb
+
+%description gdb
+Tools and support files for integrating valgrind and gdb.
+
 %if %{build_tools_devel}
 %package tools-devel
 Summary: Development files for building valgrind tools.
@ -236,18 +264,6 @@ Valgrind User Manual for details.
 %patch -P3 -p1
 %patch -P4 -p1

-%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
-%patch -P10 -p1
-%patch -P11 -p1
-%patch -P12 -p1
-%patch -P13 -p1
-%patch -P14 -p1
-%patch -P15 -p1
-
 %build
 # LTO triggers undefined symbols in valgrind.  But valgrind has a
 # --enable-lto configure time option that we will use instead.
@ -418,18 +434,42 @@ echo ===============END TESTING===============
 %{!?_licensedir:%global license %%doc}

 %files
-%license COPYING COPYING.DOCS
-%doc NEWS README_*
-%doc docs/installed/html docs/installed/*.pdf
-%{_bindir}/*
+%license COPYING
+%{_bindir}/valgrind
 %dir %{_libexecdir}/valgrind
-# Install everything in the libdir except the .so.
-# The vgpreload so files might need file mode adjustment.
-%{_libexecdir}/valgrind/*[^o]
+# Install just the core tools, default suppression and vgpreload libraries.
+%{_libexecdir}/valgrind/default.supp
+%{_libexecdir}/valgrind/*-*-linux
 # Turn on executable bit again for vgpreload libraries.
 # Was disabled in %%install to prevent debuginfo stripping.
-%attr(0755,root,root) %{_libexecdir}/valgrind/vgpreload*-%{valarch}-*so
+%attr(0755,root,root) %{_libexecdir}/valgrind/vgpreload_*-%{valarch}-linux.so
+
+%files docs
+%license COPYING.DOCS
+%doc NEWS README_*
+%doc docs/installed/html docs/installed/*.pdf
 %{_mandir}/man1/*
+
+%files scripts
+%license COPYING
+%{_bindir}/callgrind_annotate
+%{_bindir}/callgrind_control
+%{_bindir}/cg_annotate
+%{_bindir}/cg_diff
+%{_bindir}/cg_merge
+%{_bindir}/ms_print
+%{_libexecdir}/valgrind/dh_view.css
+%{_libexecdir}/valgrind/dh_view.html
+%{_libexecdir}/valgrind/dh_view.js
+
+%files gdb
+%license COPYING
+%{_bindir}/valgrind-di-server
+%{_bindir}/valgrind-listener
+%{_bindir}/vgdb
+%{_bindir}/vgstack
+# gdb register descriptions
+%{_libexecdir}/valgrind/*.xml
 %{_datadir}/gdb/auto-load/valgrind-monitor.py
 %{_datadir}/gdb/auto-load/valgrind-monitor-def.py

@ -463,6 +503,122 @@ echo ===============END TESTING===============
 %endif

 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.27.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Wed May 20 2026 Mark Wielaard <mjw@fedoraproject.org> - 3.27.1-1
+- Valgrind 3.27.1 final
+
+* Mon Apr 20 2026 Mark Wielaard <mjw@fedoraproject.org> - 3.27.0-1
+- Valgrind 3.27.0 final
+
+* Fri Apr 17 2026 Mark Wielaard <mjw@fedoraproject.org> - 3.27.0-0.1.RC2
+- Upstream 3.27.0-RC2
+
+* Mon Apr 13 2026 Mark Wielaard <mjw@fedoraproject.org> - 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 <mjw@fedoraproject.org> - 3.26.0-5
+  - Add 0001-Refix-still_reachable-xml-closing-tag-and-add-testca.patch
+
+* Mon Jan 26 2026 Mark Wielaard <mjw@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1:3.26.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Thu Jan  8 2026 Mark Wielaard <mjw@fedoraproject.org> - 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 <mjw@fedoraproject.org> - 3.26.0-1
+- Valgrind 3.26.0 final
+- Clarify License of valgrind-scripts.
+
+* Sat Oct 18 2025 Mark Wielaard <mjw@fedoraproject.org> - 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 <mjw@fedoraproject.org> - 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 <mjw@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1:3.25.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue May 20 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.25.1-1
+- Valgrind 3.25.1 final
+
+* Fri May 16 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.25.0-3
+- Add 2 more VALGRIND_3_25_BRANCH patches
+
+* Fri May  9 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.25.0-2
+- Add VALGRIND_3_25_BRANCH patches
+
+* Fri Apr 25 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.25.0-1
+- Valgrind 3.25.0 final
+
+* Wed Apr 23 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.25.0-0.1.RC2
+- Upstream 3.25.0-RC2
+
+* Fri Apr 18 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.25.0-0.1.RC1
+- Upstream 3.25.0-RC1
+- Remove all VALGRIND_3_24_BRANCH patches
+- Enable riscv64 arch support
+
+* Sun Mar 30 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-8
+- Add new VALGRIND_3_24_BRANCH patches
+  - 0019-filter_gdb.in-__syscall_cancel_arch-is-just-in-a-sys.patch
+  - 0020-Bug-501893-Missing-suppression-for-__wcscat_avx2-str.patch
+  - 0021-filter_gdb.in-filter-out-__libc_do_syscall.patch
+  - 0022-Handle-top-__syscall_cancel-frames-when-getting-stac.patch
+- Remove valgrind-3.24.0-syscall-cancel.patch (replaced by 0022).
+
+* Fri Mar 28 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-7
+- Add valgrind-3.24.0-syscall-cancel.patch
+
+* Wed Mar 12 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-6
+- More VALGRIND_3_24_BRANCH patches
+  0016-syswrap-generic-Emit-pp_ExeContext-after-the-file-de.patch
+  0017-add_hardwired_spec-for-ld-linux-x86-64.so.2-memcmp.patch
+  0018-gdbserver_tests-filter-out-new-Missing-rpms-message.patch
+
+* Fri Jan 17 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-5
+- valgrind-devel now Recommends, instead of Requires, valgrind.
+- valgrind-gdb now Requires valgrind, instead of valgrind-devel.
+- valgrind-scripts now Recommends valgrind-gdb
+- valgrind-gdb now Recommends gdb
+
+* Wed Jan 15 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-4
+- Add 0015-ppc-test_dfp2-build-fix-for-GCC-15.patch
+
+* Tue Jan 14 2025 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-3
+- Add more VALGRIND_3_24_BRANCH patches
+  0012-Recognize-new-DWARF5-DW_LANG-constants.patch
+  0013-Bug-498317-FdBadUse-is-not-a-valid-CoreError-type-in.patch
+  0014-linux-support-EVIOCGRAB-ioctl.patch
+- Split main valgrind package into several subpackages:
+  - valgrind now contains just the core tools.
+  - valgrind-scripts contains the post-processing scripts for callgrind,
+    cachegrind, massif and dhat which depend on perl and python.
+  - valgrind-gdb contains the debuginfo client/server and (v)gdb support.
+  - valgrind-docs contains the man pages, html and pdf manual.
 * Tue Nov 26 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-2
 - Add VALGRIND_3_24_BRANCH patches
  0001-Prepare-NEWS-for-branch-3.24-fixes.patch
Author	SHA1	Message	Date
Fedora Release Engineering	a44e0e250a	Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild	2026-07-17 08:21:24 +00:00
Mark Wielaard	8c75266e08	3.27.1-1 - Valgrind 3.27.1 final	2026-05-20 15:17:12 +02:00
Mark Wielaard	8ecc39bb1a	3.27.0-1 - Valgrind 3.27.0 final	2026-04-21 01:01:18 +02:00
Mark Wielaard	aee12d025e	3.27.0-0.1.RC2 - Upstream 3.27.0-RC2	2026-04-18 03:40:19 +02:00
Mark Wielaard	e0da26d095	3.27.0-0.1.RC1 - Upstream 3.27.0-RC1 - Remove all VALGRIND_3_26_BRANCH and proposed upstream patches	2026-04-14 03:45:16 +02:00
Mark Wielaard	c84b5d90fd	3.26.0-5 - Add 0001-Refix-still_reachable-xml-closing-tag-and-add-testca.patch	2026-01-29 12:59:20 +01:00
Mark Wielaard	bfbac831c1	3.26.0-4	2026-01-26 19:15:57 +01:00
Mark Wielaard	108613b011	3.26.0-3 - 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	2026-01-26 19:03:32 +01:00
Fedora Release Engineering	338731caea	Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild	2026-01-17 19:46:40 +00:00
Mark Wielaard	45259a9e71	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	2026-01-08 14:54:35 +01:00
Mark Wielaard	fae4a52249	3.26.0-1 - Valgrind 3.26.0 final	2025-10-24 23:45:58 +02:00
Mark Wielaard	be14de47f6	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	2025-10-18 23:37:34 +02:00
Mark Wielaard	76937a654e	3.25.1-4 - Add 0003-Add-several-missing-syscall-hooks-to-ppc64-linux.patch	2025-08-12 03:44:53 +02:00
Mark Wielaard	17943405ed	Add ppc64-strcmp-ld.patch	2025-08-12 03:07:30 +02:00
Mark Wielaard	6adf1117a3	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	2025-08-06 00:08:54 +02:00
Fedora Release Engineering	7246749fd7	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-25 19:57:25 +00:00
Mark Wielaard	247872ecdc	Valgrind 3.25.1 final	2025-05-20 13:27:24 +02:00
Mark Wielaard	9fafb70210	3.25.0-3 - Add 2 more VALGRIND_3_25_BRANCH patches	2025-05-16 15:23:46 +02:00
Mark Wielaard	821c1d5c3f	Add VALGRIND_3_25_BRANCH patches	2025-05-10 02:06:15 +02:00
Mark Wielaard	5d0c2c856b	3.25.0-2 - Add VALGRIND_3_25_BRANCH patches	2025-05-10 01:55:19 +02:00
Mark Wielaard	6bfb3b55aa	Valgrind 3.25.0 final	2025-04-25 14:58:03 +02:00
Mark Wielaard	5aabba389f	3.25.0-0.1.RC2	2025-04-24 04:08:55 +02:00
Mark Wielaard	4a3e341785	3.25.0-0.1.RC1 - Upstream 3.25.0-RC1 - Remove all VALGRIND_3_24_BRANCH patches - Enable riscv64 arch support	2025-04-18 15:33:14 +02:00
Mark Wielaard	f62b81aaa2	3.24.0-8 - Add new VALGRIND_3_24_BRANCH patches - 0019-filter_gdb.in-__syscall_cancel_arch-is-just-in-a-sys.patch - 0020-Bug-501893-Missing-suppression-for-__wcscat_avx2-str.patch - 0021-filter_gdb.in-filter-out-__libc_do_syscall.patch - 0022-Handle-top-__syscall_cancel-frames-when-getting-stac.patch - Remove valgrind-3.24.0-syscall-cancel.patch (replaced by 0022)	2025-03-30 22:11:59 +02:00
Mark Wielaard	e9491d178b	3.24.0-7 - Add valgrind-3.24.0-syscall-cancel.patch	2025-03-28 16:56:29 +01:00
Mark Wielaard	121dff8e1f	3.24.0-6 - More VALGRIND_3_24_BRANCH patches - 0016-syswrap-generic-Emit-pp_ExeContext-after-the-file-de.patch - 0017-add_hardwired_spec-for-ld-linux-x86-64.so.2-memcmp.patch - 0018-gdbserver_tests-filter-out-new-Missing-rpms-message.patch	2025-03-12 14:51:18 +01:00
Mark Wielaard	f8e8a8e29d	3.24.0-5 - update split package Recommends/Requires - valgrind-devel now Recommends, instead of Requires, valgrind. - valgrind-gdb now Requires valgrind, instead of valgrind-devel. - valgrind-scripts Recommends valgrind-gdb - valgrind-gdb Recommends gdb	2025-01-17 18:15:17 +01:00
Mark Wielaard	601fe6b14d	3.24.0-4 - Add 0015-ppc-test_dfp2-build-fix-for-GCC-15.patch	2025-01-15 17:58:46 +01:00
Mark Wielaard	ed1a9528e3	3.24.0-3 split valgrind in subpackages valgrind-{scripts,gdb,docs} - valgrind now contains just the core tools. - valgrind-scripts contains the post-processing scripts for callgrind, cachegrind, massif and dhat which depend on perl and python. - valgrind-gdb contains the debuginfo client/server and (v)gdb support. - valgrind-docs contains the man pages, html and pdf manual.	2025-01-15 00:02:55 +01:00
Mark Wielaard	ebe46e89ad	Add more VALGRIND_3_24_BRANCH patches - 0012-Recognize-new-DWARF5-DW_LANG-constants.patch - 0013-Bug-498317-FdBadUse-is-not-a-valid-CoreError-type-in.patch - 0014-linux-support-EVIOCGRAB-ioctl.patch	2025-01-14 23:55:13 +01:00