From d38884287b673917c51d2e9f84a3aa725894f6eb Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 18 Nov 2022 19:55:54 +0100
Subject: [PATCH] Avoid using implicit int C89 feature

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 valgrind-faultstatus-implicit-int.patch | 17 +++++++++++++++++
 valgrind.spec                           |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 valgrind-faultstatus-implicit-int.patch

diff --git a/valgrind-faultstatus-implicit-int.patch b/valgrind-faultstatus-implicit-int.patch
new file mode 100644
index 0000000..d91a69b
--- /dev/null
+++ b/valgrind-faultstatus-implicit-int.patch
@@ -0,0 +1,17 @@
+Add the missing int, to avoid a compilation failure in strict C99 mode.
+
+Submitted upstream: <https://bugs.kde.org/show_bug.cgi?id=462007>
+
+diff --git a/none/tests/faultstatus.c b/none/tests/faultstatus.c
+index 458ea8264593af4e..92a8350ab2285092 100644
+--- a/none/tests/faultstatus.c
++++ b/none/tests/faultstatus.c
+@@ -190,7 +190,7 @@ int main()
+ 	return 0;
+ }
+ 
+-static volatile s_zero;
++static volatile int s_zero;
+ 
+ static int zero()
+ {
diff --git a/valgrind.spec b/valgrind.spec
index 7a4f63b..bbaab71 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
 Version: 3.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: https://www.valgrind.org/
@@ -83,6 +83,8 @@ Patch3: valgrind-3.16.0-some-stack-protector.patch
 # Add some -Wl,z,now.
 Patch4: valgrind-3.16.0-some-Wl-z-now.patch
 
+Patch5: valgrind-faultstatus-implicit-int.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -218,6 +220,7 @@ Valgrind User Manual for details.
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %endif
 
 %build
@@ -448,6 +451,9 @@ fi
 %endif
 
 %changelog
+* 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.