From 9c483f05bc12955872f3090d6814c3bb8dca49f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Wed, 18 Jan 2023 15:28:51 +0100
Subject: [PATCH] config-qubes: remove STRUCTLEAK configs for Fedora 37

See https://github.com/torvalds/linux/commit/8bd51a2ba3c3bb81a693fff17e983d02d914c14c
---
 kernel.spec.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel.spec.in b/kernel.spec.in
index 11af7180..00dc1128 100644
--- a/kernel.spec.in
+++ b/kernel.spec.in
@@ -204,6 +204,13 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
 
 cd %kernel_build_dir
 
+# FIXME: Find a modular way to include configuration per dist
+# On GCC12+, STRUCTLEAK configs are not needed anymore
+%if 0%{?fedora} >= 37
+sed -i '/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y/d' %{SOURCE101}
+sed -i 's/CONFIG_GCC_PLUGIN_STRUCTLEAK=y/CONFIG_INIT_STACK_ALL_ZERO=y/' %{SOURCE101}
+%endif
+
 # Create QubesOS config kernel
 %{SOURCE34} %{SOURCE100} %{SOURCE101}