up to 5.18.14 (bunch of new x86 mitigations)

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index ef20dcb464bbd7585352897b18c8912ca77a3aa2..0eab377ae2c8f3f36df28cd00a72808b0126c934 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
 %endif
 
 %define                rel             1
-%define                basever         5.17
-%define                postver         .5
+%define                basever         5.18
+%define                postver         .14
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -118,10 +118,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 07321a70a48d062cebd0358132f11771
+# Source0-md5: 58e80452e2d8e1993cd7ec95e697ab5a
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  cdcffeee90d436b93ecb621d3ce940d8
+# Patch0-md5:  05dee8a9a2d04a0cde691b449114177b
 %endif
 Source1:       kernel.sysconfig
 
@@ -247,6 +247,7 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: uboot-mkimage
 %endif
 BuildRequires: xz >= 1:4.999.7
+BuildConflicts:        dwarves < 1.16
 Requires(post):        coreutils
 Requires(post):        geninitrd >= 12787-6
 Requires(post):        kmod >= %{kmod_ver}
@@ -708,7 +709,7 @@ find -name '*.py' -print0 | \
        scripts/show_delta \
        tools/hv/vmbus_testing \
        tools/kvm/kvm_stat/kvm_stat \
-       tools/testing/selftests/exec/binfmt_script
+       tools/testing/selftests/exec/binfmt_script.py
 
 find -name '*.pl' -print0 | \
        xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -889,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}