up to 5.18.14 (bunch of new x86 mitigations)

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 729ba43c5f2fab13d52ed17cd9c0294fd6d1b86e..0eab377ae2c8f3f36df28cd00a72808b0126c934 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define                rel             1
 %define                basever         5.18
-%define                postver         .3
+%define                postver         .14
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -121,7 +121,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 58e80452e2d8e1993cd7ec95e697ab5a
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  4bf54f332af56bd84f02a948d57d043f
+# Patch0-md5:  05dee8a9a2d04a0cde691b449114177b
 %endif
 Source1:       kernel.sysconfig
 
@@ -890,6 +890,12 @@ BuildConfig() {
 %ifarch x32
                CONFIG_BPF_PRELOAD=n
 %endif
+%if %{_ver_ge %(rpm -q --qf='%%{VERSION}' gcc) 12}
+               CONFIG_INIT_STACK_ALL_ZERO=y
+               CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=n
+%else
+               CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+%endif
 EOCONFIG
 
 %if %{with rescuecd}