X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=a148ddb6e0f5ec3cb61cc76510bce0b0f7af759c;hb=d27ab633e92338fec1ed18d5338747efdfa7f1d1;hp=729ba43c5f2fab13d52ed17cd9c0294fd6d1b86e;hpb=8699792e00d06c2851888d1f53ec36ee2ea7cc05;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 729ba43c..a148ddb6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
 %endif
 
 %define		rel		1
-%define		basever		5.18
-%define		postver		.3
+%define		basever		5.19
+%define		postver		.4
 
 # 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:	58e80452e2d8e1993cd7ec95e697ab5a
+# Source0-md5:	f91bfe133d2cb1692f705947282e123a
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	4bf54f332af56bd84f02a948d57d043f
+# Patch0-md5:	d89c87a448cca0f1192666e538984761
 %endif
 Source1:	kernel.sysconfig
 
@@ -140,6 +140,8 @@ Source22:	kernel-sparc.config
 Source23:	kernel-alpha.config
 Source24:	kernel-powerpc.config
 Source25:	kernel-ia64.config
+Source26:	kernel-arm.config
+Source27:	kernel-arm64.config
 
 Source41:	kernel-patches.config
 Source43:	kernel-vserver.config
@@ -241,7 +243,7 @@ BuildRequires:	openssl-devel >= 1.0.0
 BuildRequires:	openssl-tools >= 1.0.0
 BuildRequires:	perl-base >= 5
 BuildRequires:	rpm-build >= 4.5-24
-BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rpmbuild(macros) >= 2.019
 BuildRequires:	tar >= 1:1.22
 %ifarch ppc
 BuildRequires:	uboot-mkimage
@@ -531,7 +533,7 @@ Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	elfutils-devel
 Requires:	make
-Conflicts:	rpmbuild(macros) < 1.704
+Conflicts:	rpmbuild(macros) < 2.019
 AutoReqProv:	no
 
 %description module-build
@@ -726,7 +728,8 @@ find -name '*.pl' -print0 | \
 
 %{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
 	tools/testing/selftests/powerpc/security/mitigation-patching.sh \
-	scripts/config
+	scripts/config \
+	scripts/check-local-export
 
 %build
 install -d %{objdir}
@@ -890,6 +893,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}
@@ -1416,6 +1425,8 @@ fi
 %dir %{_kernelsrcdir}/security
 %dir %{_kernelsrcdir}/security/selinux
 %{_kernelsrcdir}/security/selinux/include
+%dir %{_kernelsrcdir}/tools
+%{_kernelsrcdir}/tools/include
 %dir %{_kernelsrcdir}/usr
 %dir %{_kernelsrcdir}/usr/include
 %{_kernelsrcdir}/.config
@@ -1449,6 +1460,7 @@ fi
 %{_kernelsrcdir}/scripts/kconfig/lxdialog
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
+%attr(755,root,root) %{_kernelsrcdir}/scripts/check-local-export
 %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/subarch.include
@@ -1516,6 +1528,7 @@ fi
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include
 %exclude %{_kernelsrcdir}/scripts/Makefile*
 %exclude %{_kernelsrcdir}/scripts/basic
+%exclude %{_kernelsrcdir}/scripts/check-local-export
 %exclude %{_kernelsrcdir}/scripts/kconfig
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
 %exclude %{_kernelsrcdir}/scripts/mod
@@ -1536,6 +1549,7 @@ fi
 %{_kernelsrcdir}/security
 %exclude %{_kernelsrcdir}/security/selinux/include
 %{_kernelsrcdir}/tools/*
+%exclude %{_kernelsrcdir}/tools/include
 %ifarch %{x8664} x32
 %exclude %{_kernelsrcdir}/tools/objtool/fixdep
 %exclude %{_kernelsrcdir}/tools/objtool/objtool