Released

4 files changed, 23 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c3587960d08..c9f08b3361c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-bnx2x-2.5g
 	pkgdesc = Linux
-	pkgver = 5.18.5.arch1
+	pkgver = 5.18.7.arch1
 	pkgrel = 1
-	url = https://github.com/archlinux/linux/commits/v5.18.5-arch1
+	url = https://github.com/archlinux/linux/commits/v5.18.7-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -14,7 +14,7 @@ pkgbase = linux-bnx2x-2.5g
 	makedepends = xz
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.18.5-arch1
+	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.18.7-arch1
 	source = bnx2x_warpcore+8727_2_5g_sgmii_arch.patch
 	source = config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@@ -23,7 +23,7 @@ pkgbase = linux-bnx2x-2.5g
 	validpgpkeys = C7E7849466FE2358343588377258734B41C31549
 	sha256sums = SKIP
 	sha256sums = d655669179109ae8e801a259c35dbe442ca67a49b9ceb6ca3ef0e56f48149a7d
-	sha256sums = ee1f138da9c39bc2510f25cd7bfc00edaa6e418b35e52ce7f8392135e51068b9
+	sha256sums = 382aa201a6a6939210dd8668ab052724547b4bd489b38e97502bbd0848061b35
 
 pkgname = linux-bnx2x-2.5g
 	pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 6bfcca4564d1..2dbd2f922278 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux-bnx2x-2.5g
-pkgver=5.18.5.arch1
+pkgver=5.18.7.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -27,7 +27,7 @@ validpgpkeys=(
 )
 sha256sums=('SKIP'
             'd655669179109ae8e801a259c35dbe442ca67a49b9ceb6ca3ef0e56f48149a7d'
-            'ee1f138da9c39bc2510f25cd7bfc00edaa6e418b35e52ce7f8392135e51068b9')
+            '382aa201a6a6939210dd8668ab052724547b4bd489b38e97502bbd0848061b35')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 44972c463741..3472a8f2bc06 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.5-arch1 Kernel Configuration
+# Linux/x86 5.18.6-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -197,6 +197,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC12_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -497,7 +499,9 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
-# CONFIG_KEXEC_SIG is not set
+CONFIG_KEXEC_SIG=y
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
@@ -10219,7 +10223,7 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="landlock,lockdown,yama,bpf"
+CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"
 
 #
 # Kernel hardening options
@@ -10533,6 +10537,7 @@ CONFIG_CRYPTO_LIB_SM3=m
 CONFIG_CRYPTO_LIB_SM4=m
 # end of Crypto library routines
 
+CONFIG_LIB_MEMNEQ=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/update.sh b/update.sh
index 96338a302e09..4e698c48f79a 100755
--- a/update.sh
+++ b/update.sh
@@ -7,9 +7,14 @@ cd $s_dir
 
 l_ver=`grep ^pkgver= PKGBUILD | cut -d= -f2`
 
-cd arch-package
-git checkout -q packages/linux
-git pull -q
+if [ ! -d arch-package ] ; then
+    git clone --single-branch --branch packages/linux https://github.com/archlinux/svntogit-packages.git arch-package
+    cd arch-package
+else
+    cd arch-package
+    git checkout -q packages/linux
+    git pull -q
+fi
 c_ver=`grep ^pkgver= repos/core-x86_64/PKGBUILD | cut -d= -f2`
 
 n_ver=`echo -e "$c_ver\n$l_ver" | sort -rV | head -n 1`
@@ -27,7 +32,7 @@ sed -i -e "s/^pkgbase=.*/pkgbase=linux-bnx2x-2.5g/" PKGBUILD
 sed -i -e '/^makedepends=/{N;n;d}' PKGBUILD
 sed -i -e '/^source=/{N;s/$/\n  "bnx2x_warpcore+8727_2_5g_sgmii_arch.patch"/}' PKGBUILD
 sed -i -e "/^sha256sums=/{s/$/\\n            'd655669179109ae8e801a259c35dbe442ca67a49b9ceb6ca3ef0e56f48149a7d'/}" PKGBUILD
-sed -i -e "/^  make htmldocs/d" PKGBUILD
+sed -i -e "s/^  make htmldocs all.*/  make all/" PKGBUILD
 sed -i -e '/^_package-docs() {/,/^}/d' PKGBUILD
 sed -i -e '/^pkgname=/s/ "$pkgbase-docs"//' PKGBUILD