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

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

.gitignore

@@ -43,3 +43,25 @@
 /valgrind-3.17.0.tar.bz2
 /valgrind-3.18.0.RC1.tar.bz2
 /valgrind-3.18.1.tar.bz2
+/valgrind-3.19.0.tar.bz2
+/valgrind-3.20.0.tar.bz2
+/valgrind-3.21.0.RC1.tar.bz2
+/valgrind-3.21.0.RC2.tar.bz2
+/valgrind-3.21.0.tar.bz2
+/valgrind-3.22.0.RC1.tar.bz2
+/valgrind-3.22.0.RC2.tar.bz2
+/valgrind-3.22.0.tar.bz2
+/valgrind-3.23.0.RC1.tar.bz2
+/valgrind-3.23.0.RC2.tar.bz2
+/valgrind-3.23.0.tar.bz2
+/valgrind-3.24.0.tar.bz2
+/valgrind-3.25.0.RC1.tar.bz2
+/valgrind-3.25.0.RC2.tar.bz2
+/valgrind-3.25.0.tar.bz2
+/valgrind-3.25.1.tar.bz2
+/valgrind-3.26.0.RC1.tar.bz2
+/valgrind-3.26.0.tar.bz2
+/valgrind-3.27.0.RC1.tar.bz2
+/valgrind-3.27.0.RC2.tar.bz2
+/valgrind-3.27.0.tar.bz2
+/valgrind-3.27.1.tar.bz2

gating.yaml

@@ -5,6 +5,7 @@ decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
 --- !Policy
 product_versions:
   - rhel-8

plans/ci.fmf

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

rpminspect.yaml

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

sources

@@ -1 +1 @@
-SHA512 (valgrind-3.18.1.tar.bz2) = a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b
+SHA512 (valgrind-3.27.1.tar.bz2) = 4522e345fe31bc10478f21ab261cf7b3e509d80fe98fd0c7c9778ac9a9f90e1d8fa6e54a37c2e23114c01c95131035103fc1e78661710d7f45f5d564a31c1015

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/Makefile

@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/valgrind/Sanity/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through
-#   Description: Test for BZ#672959 ([RFE] Integrate valgrind with gdb possibly through)
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/valgrind/Sanity/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE something.c error.gdb noerror.gdb
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Miroslav Franc <mfranc@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for BZ#672959 ([RFE] Integrate valgrind with gdb possibly through)" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        30m" >> $(METADATA)
-	@echo "RunFor:          valgrind" >> $(METADATA)
-	@echo "Requires:        valgrind gcc gdb glibc-debuginfo" >> $(METADATA)
-	@echo "Requires:        glibc-devel" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             672959" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/PURPOSE

@@ -1,7 +0,0 @@
-PURPOSE of /tools/valgrind/Sanity/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through
-Description: Test for BZ#672959 ([RFE] Integrate valgrind with gdb possibly through)
-Author: Miroslav Franc <mfranc@redhat.com>
-Bug summary: [RFE] Integrate valgrind with gdb possibly through gdbserver.
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=672959
-
-This is small sanity test to make sure gdb works with valgrind gdb server.

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/error.gdb

@@ -1,5 +0,0 @@
-target remote | vgdb
-c
-p var
-c
-q

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/main.fmf

@@ -1,20 +0,0 @@
-summary: Test for BZ#672959 ([RFE] Integrate valgrind with gdb possibly through)
-description: |
-    Bug summary: [RFE] Integrate valgrind with gdb possibly through gdbserver.
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=672959
-
-    This is small sanity test to make sure gdb works with valgrind gdb server.
-contact: Miroslav Franc <mfranc@redhat.com>
-component:
-- valgrind
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- valgrind
-- gcc
-- gdb
-- glibc-debuginfo
-- glibc-devel
-duration: 30m
-extra-summary: /tools/valgrind/Sanity/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through
-extra-task: /tools/valgrind/Sanity/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/noerror.gdb

@@ -1,6 +0,0 @@
-target remote | vgdb
-b something.c:10
-c
-set (a=5)
-c
-q

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/runtest.sh

@@ -1,116 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/valgrind/Sanity/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through
-#   Description: Test for BZ#672959 ([RFE] Integrate valgrind with gdb possibly through)
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE=$(rpm --qf "%{name}\n" -qf $(which valgrind) | head -1)
-PACKAGES=(valgrind gcc gdb)
-
-# Expect 1th argument as a path to binary to test with
-_test_routine()
-{
-    local binary=$1
-
-    rlPhaseStartTest "$binary error"
-    rlAssertExists "$binary"
-        rlLog "valgrind gdb server..."
-        valgrind --vex-iropt-register-updates=allregs-at-mem-access --vgdb-error=0 ./$binary > vloge 2>&1 &
-        vpid=$!
-        sleep 5
-        rlRun "gdb -x error.gdb ./$binary > gloge 2>&1"
-        [[ -d /proc/$vpid ]] && { kill -9 $vpid; rlFail "oops: valgrind still running..."; }
-        rlRun "wait $vpid"
-        rlAssertGrep '19.*if(x)' gloge
-        rlAssertGrep '$1 = 42' gloge
-        # there should be exactly one error
-        rlAssertGrep 'ERROR SUMMARY: 1 errors from 1 contexts' vloge
-        rlLog "> gdb output <"
-        rlLog "$(<gloge)"
-        rlLog "> valgrind output <"
-        rlLog "$(<vloge)"
-    rlPhaseEnd
-
-    rlPhaseStartTest "$binary noerror"
-    rlAssertExists "$binary"
-        rlLog "valgrind gdb server..."
-        valgrind --vex-iropt-register-updates=allregs-at-mem-access --vgdb-error=0 ./$binary > vlogn 2>&1 &
-        vpid=$!
-        sleep 5
-        rlRun "gdb -x noerror.gdb ./$binary > glogn 2>&1"
-        [[ -d /proc/$vpid ]] && { kill -9 $vpid; rlFail "oops: valgrind still running..."; }
-        rlRun "wait $vpid"
-        rlAssertGrep '10.*f(a);' glogn
-        # this time, no errors
-        rlAssertGrep 'ERROR SUMMARY: 0 errors from 0 contexts' vlogn
-        rlAssertGrep 'hello, world' vlogn
-        rlLog "> gdb output <"
-        rlLog "$(<glogn)"
-        rlLog "> valgrind output <"
-        rlLog "$(<vlogn)"
-    rlPhaseEnd
-}
-
-rlJournalStart
-    rlPhaseStartSetup
-        which valgrind | grep "/devtoolset"
-        if [ $? -eq 0 ]; then
-            rpm_prefix="$(which valgrind | grep -o 'devtoolset[^/]*')-"
-        fi
-
-        for p in "${PACKAGES[@]}"; do
-            rlAssertRpm "${rpm_prefix}${p}"
-        done; unset p
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp something.c error.gdb noerror.gdb $TmpDir"
-        rlRun "pushd $TmpDir"
-        rlRun "gcc -g something.c -o basic.out"
-
-        which dwz
-        if [ $? -eq 0 ]; then
-            rlRun "cp basic.out dwz.out"
-            rlRun "dwz dwz.out"
-            rlRun "dwz_binary_size=$(du -b dwz.out | awk '{ print $1}')"
-            rlRun "basic_binary_size=$(du -b basic.out | awk '{ print $1}')"
-            [ "$dwz_binary_size" = "$basic_binary_size" ] && rlFail "Size of dwz binary should differs"
-            run_for=(basic.out dwz.out)
-        else
-            run_for=(basic.out)
-        fi
-    rlPhaseEnd
-
-    for p in "${run_for[@]}"; do
-        _test_routine "$p"
-    done; unset p
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/bz672959-RFE-Integrate-valgrind-with-gdb-possibly-through/something.c

@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-void f (int x);
-
-int
-main (int argc, char *argv[])
-{
-  int a;
-
-  f(a);
-
-  return 0;
-}
-
-void
-f (int x)
-{
-  static int var __attribute__ ((used)) = 42;
-  if(x)
-    puts("hello, world");
-}

tests/does-Image-Magick-works-under-valgrind/Makefile

@@ -1,69 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/valgrind/Sanity/does-Image-Magick-works-under-valgrind
-#   Description: Testing sanity of valgrind by comparing outputs of ImageMagick utilities with/without valgrind.
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2 or later.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-#   The image munich.jpg used in this test is from:
-#   https://en.wikipedia.org/wiki/File:Frauenkirche_and_Neues_Rathaus_Munich_March_2013.JPG.
-#   munich.jpg file is distributed under the Creative Commons
-#   Attribution-Share Alike 3.0 Unported license
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/valgrind/Sanity/does-Image-Magick-works-under-valgrind
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE munich.jpg
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Miroslav Franc <mfranc@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Testing sanity of valgrind by comparing outputs of ImageMagick utilities with/without valgrind." >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        3h" >> $(METADATA)
-	@echo "RunFor:          valgrind" >> $(METADATA)
-	@echo "Requires:        valgrind ImageMagick" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        RHEL6 RHEL7" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/does-Image-Magick-works-under-valgrind/PURPOSE

@@ -1,3 +0,0 @@
-PURPOSE of /tools/valgrind/Sanity/does-Image-Magick-works-under-valgrind
-Description: Testing sanity of valgrind by comparing outputs of ImageMagick utilities with/without valgrind.
-Author: Miroslav Franc <mfranc@redhat.com>

tests/does-Image-Magick-works-under-valgrind/main.fmf

@@ -1,14 +0,0 @@
-summary: Testing sanity of valgrind by comparing outputs of ImageMagick utilities
-    with/without valgrind.
-description: ''
-contact: Alexandra Hajkova <ahajkova@redhat.com>
-component:
-- valgrind
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- valgrind
-- ImageMagick
-duration: 3h
-extra-summary: /tools/valgrind/Sanity/does-Image-Magick-works-under-valgrind
-extra-task: /tools/valgrind/Sanity/does-Image-Magick-works-under-valgrind

tests/does-Image-Magick-works-under-valgrind/runtest.sh

@@ -1,97 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/valgrind/Sanity/does-Image-Magick-works-under-valgrind
-#   Description: Testing sanity of valgrind by comparing outputs of ImageMagick utilities with/without valgrind.
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2 or later.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-#   The image munich.jpg used in this test is from:
-#   https://en.wikipedia.org/wiki/File:Frauenkirche_and_Neues_Rathaus_Munich_March_2013.JPG.
-#   munich.jpg file is distributed under the Creative Commons
-#   Attribution-Share Alike 3.0 Unported license
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-VALGRIND="${VALGRIND:-$(which valgrind)}"
-PACKAGES="${PACKAGES:-$(rpm --qf '%{name}\n' -qf $(which $VALGRIND) | head -1)}"
-REQUIRES="${REQUIRES:-ImageMagick}"
-
-Picture="munich.jpg"
-Formats=(jpg gif)
-Options=(-flop
-         -flip
-         -resize\ 160x100
-         -resize\ 50\\\%
-         -sharpen\ 5x5
-         -equalize
-         -motion-blur\ 20x5
-         -paint\ 3x3
-         -radial-blur\ 5
-         -posterize\ 10
-        )
-
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "VALGRIND=$VALGRIND"
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "REQUIRES=$REQUIRES"
-        rlLogInfo "COLLECTIONS=$COLLECTIONS"
-        rlLogInfo "$(type valgrind)"
-
-        rlAssertRpm --all
-
-        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
-        rlRun "cp $Picture $TmpDir" 0 "Copying $Picture to $TmpDir"
-        rlRun "pushd $TmpDir"
-        rlRun "mkdir out" 0 "Creating out directory"
-    rlPhaseEnd
-
-    for f in "${Formats[@]}"; do
-        for o in "${Options[@]}"; do
-            rlPhaseStartTest "convert $o $Picture out/0${Picture%jpg}$f"
-                rlRun "convert $o $Picture out/0${Picture%jpg}$f" 0 "Converting $Picture to out/0${Picture%jpg}$f with ($o)"
-                rlLog "convert $o $Picture out/0${Picture%jpg}$f"
-                rlRun "valgrind convert $o $Picture out/1${Picture%jpg}$f" 0 "Converting $Picture to out/1${Picture%jpg}$f with ($o) [valgrind]"
-                rlLog "valgrind convert $o $Picture out/1${Picture%jpg}$f"
-                [[ $(arch) = i686 ]] || rlRun "echo \`md5sum out/[01]${Picture%jpg}$f\` | while read with nic without nic; do test \"\$with\" = \"\$without\";done" 0 "Output is the same with/without valgrind"
-                md5sum out/[01]${Picture%jpg}$f
-            rlPhaseEnd
-            rlPhaseStartCleanup "Cleaning for $f with $o"
-                rlRun "mkdir -p \"out-$o\""
-                rlRun "cp -r out/* \"out-$o/\""
-                rlRun "rm -f out/*" 0 "Removing the old pictures"
-            rlPhaseEnd
-        done
-    done
-
-    rlPhaseStartCleanup
-        rlRun "rm -rf out"
-        rlRun "tar czf out.tgz $TmpDir/*"
-        rlFileSubmit "out.tgz"
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/does-hunspell-works-under-valgrind/Makefile

@@ -1,57 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2 or later.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Miroslav Franc <mfranc@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Testing sanity of valgrind by comparing outputs of hunspell with/without valgrind." >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        20m" >> $(METADATA)
-	@echo "RunFor:          valgrind" >> $(METADATA)
-	@echo "Requires:        valgrind hunspell" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/does-hunspell-works-under-valgrind/main.fmf

@@ -1,17 +0,0 @@
-summary: Testing sanity of valgrind by comparing outputs of hunspell with/without valgrind.
-description: |
-    This test is simplified version of the older RHEL does-aspell-works-under-valgrind test.
-
-    The test collects README files and try to run spellchecker on them with and without valgrind. The output should be the same.
-
-contact: Alexandra Petlanova <ahajkova@redhat.com>
-component:
-- valgrind
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- valgrind
-- hunspell
-duration: 5m
-extra-summary: /tools/valgrind/Sanity/does-hunspell-works-under-valgrind
-extra-task: /tools/valgrind/Sanity/does-hunspell-works-under-valgrind

tests/does-hunspell-works-under-valgrind/runtest.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Description: Testing sanity of valgrind by comparing outputs of hunspell with/without valgrind.
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2 or later.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-SPELL_CHECKER="${SPELL_CHECKER:-hunspell}"
-
-VALGRIND="${VALGRIND:-$(which valgrind)}"
-PACKAGES="${PACKAGES:-$(rpm --qf '%{name}\n' -qf $(which $VALGRIND) | head -1)}"
-REQUIRES="${REQUIRES:-$SPELL_CHECKER}"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "VALGRIND=$VALGRIND"
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "REQUIRES=$REQUIRES"
-        rlLogInfo "SPELL_CHECKER=$SPELL_CHECKER"
-        rlLogInfo "$(type valgrind)"
-
-        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-
-    rlRun "echo \"NEWSX\"|hunspell -a;echo -e '#include <time.h>\nclock_t clock(void) { return 0; }'|gcc -o libclock.so -Wall -g -shared -fPIC -x c -;echo "NEWSX"|LD_PRELOAD=./libclock.so hunspell -a > out"
-
-    rlRun "echo \"NEWSX\"|hunspell -a;echo -e '#include <time.h>\nclock_t clock(void) { return 0; }'|gcc -o libclock.so -Wall -g -shared -fPIC -x c -;echo \"NEWSX\"|LD_PRELOAD=./libclock.so valgrind -q hunspell -a > valgrind_out"
-
-    # Remove dictionary to avoid possibility of different results with
-    # already present dictionary. After this all commands start with
-    # the clean sheet.
-    rlRun "rm -f $HOME/.hunspell_en_US"
-
-    rlAssertNotDiffer "out" "valgrind_out"
-    [ "$?" -ne 0 ] && rlLogWarning "$(diff out valgrind_out)"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd" # $TmpDir
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/quick-valgrind-sanity/Makefile

@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/valgrind/Sanity/quick-valgrind-sanity
-#   Description: Very fast check that valgrind is working
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/valgrind/Sanity/quick-valgrind-sanity
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE unitialized.c rv.c alloc.c
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Miroslav Franc <mfranc@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Very fast check that valgrind is working" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          valgrind" >> $(METADATA)
-	@echo "Requires:        gcc valgrind-devel" >> $(METADATA)
-	@echo "Requires:        glibc-devel glibc-devel.ppc glibc-devel.s390 glibc-devel.i686" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/quick-valgrind-sanity/PURPOSE

@@ -1,3 +0,0 @@
-PURPOSE of /tools/valgrind/Sanity/quick-valgrind-sanity
-Description: Very fast check that valgrind is working
-Author: Miroslav Franc <mfranc@redhat.com>

tests/quick-valgrind-sanity/alloc.c

@@ -1,10 +0,0 @@
-#include <stdlib.h>
-#include <valgrind/memcheck.h>
-
-int main(int argc, char *argv[])
-{
-    void *buffer = malloc(atoi(argv[1])); 
-    VALGRIND_DO_LEAK_CHECK;
-    free(buffer);
-    return 0; 
-}

tests/quick-valgrind-sanity/main.fmf

@@ -1,16 +0,0 @@
-summary: Basic smoke test.
-description: 'Very fast check that valgrind is working'
-contact:
-- Alexandra Petlanova Hajkova <ahajkova@redhat.com>
-component:
-- valgrind
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- valgrind
-- valgrind-devel
-- gcc
-- make
-duration: 15m
-extra-summary: /tools/valgrind/Sanity/quick-valgrind-sanity
-extra-task: /tools/valgrind/Sanity/quick-valgrind-sanity

tests/quick-valgrind-sanity/runtest.sh

@@ -1,104 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/valgrind/Sanity/quick-valgrind-sanity
-#   Description: Very fast check that valgrind is working
-#   Author: Miroslav Franc <mfranc@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   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, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-VALGRIND="${VALGRIND:-$(which valgrind)}"
-PACKAGES="${PACKAGES:-$(rpm --qf '%{name}\n' -qf $(which $VALGRIND) | head -1)}"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "VALGRIND=$VALGRIND"
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "REQUIRES=$REQUIRES"
-        rlLogInfo "$(type valgrind)"
-        rlLogInfo "$(type gcc)"
-
-        rlLogInfo "SKIP_COLLECTION_METAPACKAGE_CHECK=$SKIP_COLLECTION_METAPACKAGE_CHECK"
-
-                # We optionally need to skip checking for the presence of the metapackage
-                # because that would pull in all the dependent toolset subrpms.  We do not
-                # always want that, especially in CI.
-                _COLLECTIONS="$COLLECTIONS"
-                if ! test -z $SKIP_COLLECTION_METAPACKAGE_CHECK; then
-                    for c in $SKIP_COLLECTION_METAPACKAGE_CHECK; do
-                        rlLogInfo "ignoring metapackage check for collection $c"
-                        export COLLECTIONS=$(shopt -s extglob && echo ${COLLECTIONS//$c/})
-                    done
-                fi
-
-                rlLogInfo "(without skipped) COLLECTIONS=$COLLECTIONS"
-
-                rlAssertRpm --all
-
-                export COLLECTIONS="$_COLLECTIONS"
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp unitialized.c rv.c alloc.c $TmpDir"
-        rlRun "pushd $TmpDir"
-        rlRun "gcc -g unitialized.c -o unitialized"
-    rlPhaseEnd
-
-    rlPhaseStartTest "good"
-        rlRun "valgrind --log-file=./log0 ./unitialized 0" 42
-        rlAssertNotGrep 'contains uninitialised byte' ./log0
-        rlAssertGrep 'ERROR SUMMARY: 0' ./log0
-        rlLog "$(<log0)"
-    rlPhaseEnd
-
-    rlPhaseStartTest "bad"
-        rlRun "valgrind --log-file=./log2 ./unitialized 2" 0-41,43-255
-        rlAssertGrep 'contains uninitialised byte' ./log2
-        rlAssertGrep 'ERROR SUMMARY: 1' ./log2
-        rlLog "$(<log2)"
-    rlPhaseEnd
-
-    rlPhaseStartTest "client request"
-        rlRun "gcc -g rv.c -o rv"
-        rlRun "valgrind ./rv > with-valgrind"
-        rlAssertGrep "I'm running on valgrind" with-valgrind
-        rlLog "$(<with-valgrind)"
-        rlRun "./rv > without-valgrind"
-        rlAssertGrep "I'm not running on valgrind" without-valgrind
-        rlLog "$(<without-valgrind)"
-    rlPhaseEnd
-
-    rlPhaseStartTest "client request with leak checking"
-        rlRun "gcc -g alloc.c -o alloc"
-        rlRun "valgrind --log-file=./log ./alloc 42"
-        rlAssertGrep 'still reachable: 42 bytes in 1 blocks' log
-        rlLog "$(<log)"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd" # $TmpDir
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/quick-valgrind-sanity/rv.c

@@ -1,12 +0,0 @@
-#include <valgrind/valgrind.h>
-#include <stdio.h>
-
-int main()
-{
-    if(RUNNING_ON_VALGRIND)
-        puts("I'm running on valgrind \\o/");
-    else
-        puts("I'm not running on valgrind /o\\");
-
-    return 0;
-}

tests/quick-valgrind-sanity/unitialized.c

@@ -1,30 +0,0 @@
-/* valgrind ./a.out 0 ~> no error */
-/* valgrind ./a.out 1 ~> error */
-
-#include <stdlib.h>
-
-struct something {
-    char c;
-    int x;
-};
-/* === 8 bytes ===
- * 42
- * garbage
- * garbage
- * garbage
- * 42
- * 42
- * 42
- * 42
- */
-
-
-int main(int argc, char *argv[])
-{
-    struct something st = { 0x2A, 0x2A2A2A2A };
-
-    struct something st_copy = st;
-
-    return (int) *(&(st_copy.c)+atoi(argv[1]));
-}
-/* error generated after main returns */

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

@@ -1,69 +1,50 @@
-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
  if HAVE_DLINFO_RTLD_DI_TLS_MODID
  getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
  endif
-diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
-index f572741..1c07e50 100644
---- a/cachegrind/Makefile.am
-+++ b/cachegrind/Makefile.am
-@@ -27,7 +27,7 @@ cg_merge_SOURCES = cg_merge.c
- cg_merge_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
- cg_merge_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
- cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
--cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI)
-+cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI) -Wl,-z,now
- # If there is no secondary platform, and the platforms include x86-darwin,
- # then the primary platform must be x86-darwin.  Hence:
- if ! VGCONF_HAVE_PLATFORM_SEC
 diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
-index 3c73210..fb6b7bb 100644
+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
-@@ -96,7 +96,7 @@ endif
- vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
- vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
+@@ -106,7 +106,7 @@ endif
+ vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
+ vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong
  vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
 -vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
 +vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now

valgrind-3.26.0-some-stack-protector.patch

@@ -1,59 +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
-diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
-index f8447a1..f572741 100644
---- a/cachegrind/Makefile.am
-+++ b/cachegrind/Makefile.am
-@@ -25,7 +25,7 @@ bin_PROGRAMS = cg_merge
- 
- cg_merge_SOURCES = cg_merge.c
- cg_merge_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
--cg_merge_CFLAGS    = $(AM_CFLAGS_PRI)
-+cg_merge_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
- cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
- cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI)
- # If there is no secondary platform, and the platforms include x86-darwin,
+@@ -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])
@@ -95,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,
-@@ -94,7 +94,7 @@ vgdb_SOURCES += vgdb-invoker-solaris.c
+@@ -104,7 +104,7 @@ vgdb_SOURCES += vgdb-invoker-freebsd.c
  endif
  
- vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
--vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
-+vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
+ vgdb_CPPFLAGS  = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR)
+-vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted
++vgdb_CFLAGS    = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fhosted -fstack-protector-strong
  vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
  vgdb_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
  if VGCONF_PLATVARIANT_IS_ANDROID

valgrind.spec

@@ -1,14 +1,19 @@
 %{?scl:%scl_package valgrind}
 
-Summary: Tool for finding memory management bugs in programs
+Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
-Version: 3.18.1
-Release: 1%{?dist}
+Version: 3.27.1
+Release: 2%{?dist}
 Epoch: 1
-License: GPLv2+
-URL: http://www.valgrind.org/
 
-# Only necessary for RHEL, will be ignored on Fedora
+# This ignores licenses that are only found in the test or perf sources
+# we only care about those license statements found in sources that end
+# up in the binary packages. One piece of code for which we don't have
+# 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
+URL: https://www.valgrind.org/
 
 # Are we building for a Software Collection?
 %{?scl:%global is_scl 1}
@@ -16,22 +21,23 @@ URL: http://www.valgrind.org/
 
 # We never want the openmpi subpackage when building a software collecton.
 # We always want it for fedora.
-# We only want it for older rhel. But not s390x for too old rhel.
+# We only want it for older rhel.
+# And on fedora > 39 i386 dropped openmpi.
 %if %{is_scl}
   %global build_openmpi 0
 %else
   %if 0%{?fedora}
-    %global build_openmpi 1
+    %ifarch %{ix86}
+      %global build_openmpi (%{?fedora} < 40)
+    %else
+      %global build_openmpi 1
+    %endif
   %endif
   %if 0%{?rhel}
     %if 0%{?rhel} > 7
       %global build_openmpi 0
     %else
-      %ifarch s390x
-	%global build_openmpi (%{?rhel} > 6)
-      %else
-	%global build_openmpi 1
-      %endif
+      %global build_openmpi 1
     %endif
   %endif
 %endif
@@ -51,17 +57,11 @@ URL: http://www.valgrind.org/
 # Whether to run the full regtest or only a limited set
 # The full regtest includes gdb_server integration tests
 # and experimental tools.
-# Only run full regtests on fedora, but not on older rhel
-# or when creating scl, the gdb_server tests might hang.
+# Don't run them when creating scl, the gdb_server tests might hang.
 %if %{is_scl}
   %global run_full_regtest 0
 %else
-  %if 0%{?fedora}
-    %global run_full_regtest 1
-  %endif
-  %if 0%{?rhel}
-    %global run_full_regtest (%rhel >= 7)
-  %endif
+  %global run_full_regtest 1
 %endif
 
 # Generating minisymtabs doesn't really work for the staticly linked
@@ -77,13 +77,13 @@ Source0: https://sourceware.org/pub/valgrind/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.9.0-cachegrind-improvements.patch
 
 # Make ld.so supressions slightly less specific.
-Patch3: valgrind-3.9.0-ldso-supp.patch
+Patch2: valgrind-3.9.0-ldso-supp.patch
 
 # Add some stack-protector
-Patch4: valgrind-3.16.0-some-stack-protector.patch
+Patch3: valgrind-3.26.0-some-stack-protector.patch
 
 # Add some -Wl,z,now.
-Patch5: valgrind-3.16.0-some-Wl-z-now.patch
+Patch4: valgrind-3.26.0-some-Wl-z-now.patch
 
 BuildRequires: make
 BuildRequires: glibc-devel
@@ -117,24 +117,27 @@ BuildRequires: docbook-dtds
 
 # For testing debuginfod-find
 %if 0%{?fedora} > 29 || 0%{?rhel} > 7
+BuildRequires: elfutils-debuginfod
 BuildRequires: elfutils-debuginfod-client
-%endif
 # For using debuginfod at runtime
 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
 
 %{?scl:Requires:%scl_runtime}
 
-# We need to fixup selinux file context when doing a scl build.
-# In RHEL6 we might need to fix up the labels even though the
-# meta package sets up a fs equivalence. See post.
-%if 0%{?rhel} == 6
-%{?scl:Requires(post): /sbin/restorecon}
-%endif
-
 # 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.
@@ -170,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
@@ -184,11 +191,48 @@ profiler (callgrind), and a heap profiler (massif).
 
 %package devel
 Summary: Development files for valgrind aware programs
-Requires: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release}
+# This is really Hybrid-BSD
+# https://fedoraproject.org/wiki/Licensing:BSD#Hybrid_BSD_(half_BSD,_half_zlib)
+# But that doesnt have a SPDX identifier yet
+# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/422
+License: bzip2-1.0.6
+# 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.
@@ -202,6 +246,8 @@ Header files and libraries for development of valgrind tools.
 %if %{build_openmpi}
 %package openmpi
 Summary: OpenMPI support for valgrind
+# See above, Hybrid-BSD like.
+License: bzip2-1.0.6
 Requires: %{?scl_prefix}valgrind = %{epoch}:%{version}-%{release}
 
 %description openmpi
@@ -213,33 +259,23 @@ Valgrind User Manual for details.
 %prep
 %setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}
 
-%patch1 -p1
-%patch3 -p1
-
-# Old rhel gcc doesn't have -fstack-protector-strong.
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%patch4 -p1
-%patch5 -p1
-%endif
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
 
 %build
-# LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
-# configure time option, but that doesn't seem to help.
-# Disable LTO for now.
+# LTO triggers undefined symbols in valgrind.  But valgrind has a
+# --enable-lto configure time option that we will use instead.
 %define _lto_cflags %{nil}
 
 # Some patches (might) touch Makefile.am or configure.ac files.
 # Just always autoreconf so we don't need patches to prebuild files.
 ./autogen.sh
 
-# Old openmpi-devel has version depended paths for mpicc.
 %if %{build_openmpi}
-%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
 %define mpiccpath %{!?scl:%{_libdir}}%{?scl:%{_root_libdir}}/openmpi/bin/mpicc
 %else
-%define mpiccpath %{!?scl:%{_libdir}}%{?scl:%{_root_libdir}}/openmpi/*/bin/mpicc
-%endif
-%else
 # We explicitly don't want the libmpi wrapper. So make sure that configure
 # doesn't pick some random mpi compiler that happens to be installed.
 %define mpiccpath /bin/false
@@ -290,7 +326,9 @@ export LDFLAGS
 %configure \
   --with-mpicc=%{mpiccpath} \
   %{only_arch} \
-  GDB=%{_bindir}/gdb
+  GDB=%{_bindir}/gdb \
+  --with-gdbscripts-dir=%{_datadir}/gdb/auto-load \
+  --enable-lto
 
 %make_build
 
@@ -393,26 +431,52 @@ fi
 cat diffs
 echo ===============END TESTING===============
 
-%files
 %{!?_licensedir:%global license %%doc}
-%license COPYING COPYING.DOCS
-%doc NEWS README_*
-%doc docs/installed/html docs/installed/*.pdf
-%{_bindir}/*
+
+%files
+%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 devel
-%{!?_licensedir:%global license %%doc}
+%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
+
+%files devel
 %dir %{_includedir}/valgrind
 %{_includedir}/valgrind/valgrind.h
+%{_includedir}/valgrind/cachegrind.h
 %{_includedir}/valgrind/callgrind.h
 %{_includedir}/valgrind/drd.h
 %{_includedir}/valgrind/helgrind.h
@@ -421,9 +485,8 @@ echo ===============END TESTING===============
 %{_libdir}/pkgconfig/valgrind.pc
 
 %if %{build_tools_devel}
-%{!?_licensedir:%global license %%doc}
-%license COPYING
 %files tools-devel
+%license COPYING
 %{_includedir}/valgrind/config.h
 %{_includedir}/valgrind/libvex*h
 %{_includedir}/valgrind/pub_tool_*h
@@ -439,19 +502,324 @@ echo ===============END TESTING===============
 %{_libdir}/valgrind/libmpiwrap*.so
 %endif
 
-%if 0%{?rhel} == 6
-%post
-# There is a bug in rpm (rhbz#214737) that might cause post to be run
-# even thought the binary isn't installed when installing two multilib
-# versions at the same time.
-if [ -x %{_bindir}/valgrind ]; then
-# On RHEL6 the fs equivalency should be setup by the devtoolset meta
-# package, but because of a rpm bug (rhbz#924044) it might not work.
-%{?scl:/sbin/restorecon %{_bindir}/valgrind}%{!?scl:true}
-fi
-%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
+  0002-vgdb.c-fork_and_exec_valgrind-Fix-off-by-one-error-w.patch
+  0003-vgdb.c-fork_and_exec_valgrind-Fix-another-off-by-one.patch
+  0004-regtest-add-a-fdleak-filter-for-write-on-write-on-li.patch
+  0005-Add-exp-and-supp-patterns-for-missing-main-frame-for.patch
+  0006-Add-additional-exp-ppc64le-files-to-EXTRA_DIST.patch
+  0007-Add-support-for-landlock_create_ruleset-444-landlock.patch
+  0008-helgrind-tests-tc17_sembar.c-Remove-bool-typedef.patch
+  0009-drd-tests-swapcontext.c-Rename-typedef-struct-thread.patch
+  0010-none-tests-bug234814.c-sa_handler-take-an-int-as-arg.patch
+  0011-Add-open_tree-move_mount-fsopen-fsconfig-fsmount-fsp.patch
+
+* Mon Nov  4 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.24.0-1
+- Upstream 3.24.0 final
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.23.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jul  6 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-4
+- Add more upstream VALGRIND_3_23_BRANCH patches
+  0016-mips-skip-using-shared-syscall-numbers-for-mips64.patch
+  0017-gdbserver_tests-filters-remove-python-rpm-module-loa.patch
+  0018-Implement-VMOVQ-xmm1-xmm2-m64.patch
+  0019-arm64-Fix-fcvtas-instruction.patch
+  0020-gdbserver_tests-filters-remove-more-verbose-python-r.patch
+  0021-Avoid-dev-inode-check-on-btrfs-with-sanity-level-3.patch
+
+* Sun Jun 23 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-3
+- Add more upstream VALGRIND_3_23_BRANCH patches
+  0012-Bug-487439-SIGILL-in-JDK11-JDK17.patch
+  0013-Don-t-leave-fds-created-with-log-file-xml-file-or-lo.patch
+  0014-Close-both-internal-pipe-fds-after-VG_-fork-in-paren.patch
+  0015-Don-t-allow-programs-calling-fnctl-on-valgrind-s-own.patch
+
+* Mon Jun 10 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-2
+- Add upstream VALGRIND_3_23_BRANCH patches
+
+* Fri Apr 26 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-1
+- Upstream 3.23.0 final
+
+* Thu Apr 25 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-0.2.RC2
+- configure --enable-lto
+
+* Wed Apr 24 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-0.1.RC2
+- Upstream 3.23.0-RC2
+
+* Sat Apr 20 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.23.0-0.1.RC1
++- Upstream 3.23.0-RC1
++- Remove all upstreamed patches
+
+* Sat Apr 13 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-8
+- Add BuildRequires: python3-devel for running testsuite.
+- Add valgrind-3.22.0-gdb-thread-exited.patch
+- Add valgrind-3.22.0-set_vma_name-supp.patch
+- Add valgrind-3.22.0-pth_mempcpy_false_races.patch
+- Add valgrind-3.22.0-amd64-VFMADD213.patch
+- Add valgrind-3.22.0-amd64-redir-strcmp.patch
+
+* Mon Mar 11 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-7
+- Add valgrind-3.22.0-gcc-builtin_strcmp-128-256-bit-vector.patch
+
+* Mon Mar  4 2024 Mark Wielaard <mjw@fedoraproject.org>
+- Update Fedora license tags to spdx license tags
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.22.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-5
+- Add valgrind-3.22.0-x86-nop.patch
+
+* Sat Dec  9 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-4
+- Add valgrind-3.22.0-fchmodat2.patch
+- Prep for migration to SPDX identifiers
+
+* Tue Dec  5 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-3
+- Add valgrind-3.22.0-rodata.patch
+
+* Fri Nov 17 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-2
+- Add valgrind-3.22.0-valgrind-monitor-python-re.patch
+- Drop support for rhel6
+
+* Tue Oct 31 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-1
+- Upstream 3.22.0 final
+- BuildRequires elfutils-debuginfod for testing
+
+* Mon Oct 30 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-0.2.RC2
+- Update valgrind-3.21.0-no-memcpy-replace-check.patch
+- Fedora 40 dropped openmpi support on i386
+
+* Thu Oct 26 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-0.1.RC2
+- Upstream 3.22.0-RC2
+
+* Tue Oct 17 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-0.1.RC1
+- Upstream 3.22.0-RC1
+- Remove all upstreamed patches
+- Adjust valgrind-3.16.0-some-stack-protector.patch
+- Adjust valgrind-3.16.0-some-Wl-z-now.patch
+- Add cachegrind.h to valgrind-devel package
+
+* Mon Aug 21 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-10
+- Add valgrind-3.21.0-lazy-debuginfo.patch
+- Add valgrind-3.21.0-cleanup-read_elf_object.patch
+
+* Thu Aug 17 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-9
+- Add valgrind-3.21.0-gdb-multi-mode-stdout-redirecting-to-stderr.patch
+- Use %%patch -Pn instead of deprecated %%patchn
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.21.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 22 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-7
+- Add valgrind-3.21.0-vgm.patch and valgrind-3.21.0-vgm-tests.patch
+- Add valgrind-3.21.0-pgste.patch
+
+* Thu Jun  1 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-6
+- Add valgrind-3.21.0-callgrind_control-no-strict.patch
+- Add valgrind-3.21.0-realloc-again.patch
+
+* Tue May 30 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-5
+- Update valgrind-3.21.0-no-memcpy-replace-check.patch (memcpy_chk)
+
+* Wed May 17 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-4
+- Add valgrind-3.21.0-epoll_pwait2.patch
+
+* Tue May 16 2023 Alexandra Hájková <ahajkova@redhat.com> - 3.21.0-3
+- Add valgrind-3.21.0-Add-with-gdbscripts-dir.patch
+
+* Fri May  5 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-2
+- Add valgrind-3.21.0-no-memcpy-replace-check.patch
+
+* Fri Apr 28 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-1
+- Upstream 3.21.0 final
+
+* Sat Apr 22 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-0.1.RC2
+- Upstream 3.21.0-RC2
+
+* Fri Apr 21 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-0.1.RC1
+- Upstream 3.21.0-RC1
+- Remove upstreamed valgrind-faultstatus-implicit-int.patch
+- Adjust valgrind-3.16.0-some-{Wl-z-now,stack-protector}.patch
+  cg_merge is now a pything script.
+
+* Fri Nov 18 2022 Florian Weimer <fweimer@redhat.com> - 1:3.20.0-2
+- Avoid using implicit int C89 feature
+
+* Mon Oct 24 2022 Mark Wielaard <mjw@fedoraproject.org> - 3.20.0-1
+- Upgrade to valgrind 3.20.0. Drop old patches.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.19.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed May 25 2022 Mark Wielaard <mjw@fedoraproject.org> - 3.19.0-3
+- Add valgrind-3.19.0-s390x-memmem.patch
+
+* Fri May 13 2022 Mark Wielaard <mjw@fedoraproject.org> - 3.19.0-2
+- Add valgrind-3.19.0-ld-so-strncmp.patch
+
+* Tue Apr 12 2022 Mark Wielaard <mjw@fedoraproject.org> - 3.19.0-1
+- Upgrade to valgrind 3.19.0. Drop old patches.
+
+* Tue Feb  8 2022 Mark Wielaard <mjw@fedoraproject.org>
+- Add valgrind-3.18.1-ppc64-cmov.patch
+- Add valgrind-3.18.1-arm64-atomics-rdm.patch
+- Add valgrind-3.18.1-rust-demangle-suffix.patch
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.18.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 12 2022 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-8
+- Add valgrind-3.18.1-ppc-hwcaps.patch
+- Add valgrind-3.18.1-s390x-wflrx.patch
+
+* Sat Dec 11 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-7
+-Add valgrind-3.18.1-s390x-vdso.patch
+
+* Fri Dec 10 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-6
+- Add valgrind-3.18.1-rseq-enosys.patch
+
+* Mon Nov 22 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-5
+- Add valgrind-3.18.1-demangle-namespace.patch
+
+* Fri Nov 19 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-4
+- Add valgrind-3.18.1-condvar.patch
+
+* Wed Nov 17 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-3
+- Add valgrind-3.18.1-ppc-pstq.patch
+- Add valgrind-3.18.1-ppc-pstq-tests.patch
+- Add valgrind-3.18.1-gdbserver_tests-hwcap.patch
+- Add valgrind-3.18.1-rust-v0-demangle.patch
+- Add valgrind-3.18.1-arm64-doubleword-cas.patch
+- Add valgrind-3.18.1-arm64-ldaxp-stlxp.patch
+- Add valgrind-3.18.1-arm64-atomic-align.patch
+- Add valgrind-3.18.1-amd64-more-spec-rules.patch
+
+* Mon Nov  1 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-2
+- Add valgrind-3.18.1-dhat-tests-copy.patch
+- Add valgrind-3.18.1-s390x-EXRL.patch
+- Add valgrind-3.18.1-ppc64-lxsibzx-lxsihzx.patch
+
 * Fri Oct 15 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.0-1
 - Update to upstream 3.18.1 final