aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO32
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD27
-rw-r--r--config9
4 files changed, 40 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87b7a232f375..506039c4ab09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-linode
pkgdesc = Kernel for Linode servers
- pkgver = 6.1.22.hardened1
+ pkgver = 6.1.31.hardened1
pkgrel = 1
url = https://github.com/yardenac/linux-linode
arch = x86_64
@@ -20,10 +20,11 @@ pkgbase = linux-linode
options = !strip
backup = etc/mkinitcpio.d/linux-linode.preset
backup = boot/grub/menu.lst
- source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.22.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.22.tar.sign
- source = https://github.com/anthraxx/linux-hardened/releases/download/6.1.22-hardened1/linux-hardened-6.1.22-hardened1.patch
- source = https://github.com/anthraxx/linux-hardened/releases/download/6.1.22-hardened1/linux-hardened-6.1.22-hardened1.patch.sig
+ source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.31.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.31.tar.sign
+ source = https://github.com/anthraxx/linux-hardened/releases/download/6.1.31-hardened1/linux-hardened-6.1.31-hardened1.patch
+ source = https://github.com/anthraxx/linux-hardened/releases/download/6.1.31-hardened1/linux-hardened-6.1.31-hardened1.patch.sig
+ source = https://gitlab.archlinux.org/archlinux/packaging/packages/linux-hardened/-/raw/main/gcc13-compat.patch
source = config
source = 08_linux_linode
source = 99-grub-ll.hook
@@ -32,29 +33,32 @@ pkgbase = linux-linode
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = E240B57E2C4630BA768E2F26FC1B547C8D8172C8
- md5sums = d889d541302da503f566f4d53a0453dc
+ md5sums = 72ac33b766704899f0a0d4d5e5fb02a9
md5sums = SKIP
- md5sums = f343207d3efd0eeb98787ce7053123e4
+ md5sums = e6d981cd8cfab5d0b7e03195cfb50e02
md5sums = SKIP
- md5sums = 0e660c6c96286550f713118713f2f4af
+ md5sums = 142e3e26901861047e5dfa5c5bd7509c
+ md5sums = 7a8413c1c42841e38596d87cee00e456
md5sums = b24775bcf1d7a04c1d489af73c6e74b0
md5sums = 625481f015365febcd65aa136ee555f9
md5sums = 901c03c685c65119b50666cb31a080be
md5sums = 3d6427cc412dbc226b5d058c82ba7c66
- sha256sums = 2be89141cef74d0e5a55540d203eb8010dfddb3c82d617e66b058f20b19cfda8
+ sha256sums = e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1
sha256sums = SKIP
- sha256sums = f404473346640529f60b77411f637003dcd3c840c511d659833a5289346492db
+ sha256sums = 7f4e37effb3585ff438a1a6d2039762872b40e79f406696d948e4c9b7ee16a11
sha256sums = SKIP
- sha256sums = 1ac50f8116af2d3d735f6fc5cb5d2eff7c8fdd6f8bc7a0387651a26ff96f2dd6
+ sha256sums = c6c5f6be7ae0ef5a8bdfea0a5578f096db38113774e08dc7b78fc48034c7b211
+ sha256sums = 5eda6af949bc31c4dd762eea6bd4dd3515f9071e4184a675a743827423ec8839
sha256sums = a2295cee5ae8c8d9c3efb0483e5e842f6bd9753f851c7433465b242264738546
sha256sums = 368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3
sha256sums = df9f20f818bf6c11296e5ac58c5fdd664ba17f3d80cf301eef9309ddb528741d
sha256sums = 33d9f913e4aed9f41bf263ff784921ab7d69597732079cbd06ff05b9adb32f44
- sha512sums = 9db5360c85a2e8c7d1a3a37e0d79dafe3561566e098394a15e8cb48929a7afa74b203d3d67c286a8ddb4359a0ba8d45f33678219f9ccb8f728d1c4d4455fd27f
+ sha512sums = 1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b
sha512sums = SKIP
- sha512sums = 98df1618f30b2bfb6995760c810a5347d5ab9adaacd3dc5cf1617ebf100531ec6972c06fd128b795460c52ef6f2cc401d0dcf52dc6f62b70031e7d798e71112b
+ sha512sums = c946e62eaff550a897244bc3c82e8c4713e438d25db28bffb5287e8ba41913f4ee80930fd952d1b32074a6b58c0860a37ccd67fe366543f8db79d1e6e0d9c794
sha512sums = SKIP
- sha512sums = 0a02b78f3e25018b45d60df6c81b013f642719efa52ddf2c27865feb951851b21b1990547472713206f0836c95ab37a8d97b82dbe7053a244db70620196aef3e
+ sha512sums = ba5ecf6e5e3f70ef6d0bbd2b929542b0247c8efedef4f2e1de28ca1644452c24a2124fcdcf958f2dc7121f0ab673b64dc3bd6529e26e552c5184a4857818b9bd
+ sha512sums = 4ea8a6c4e773b17e1ab55005aa46ccb56973aef1bc05bc0fe56643f168c75c46d43260baf199aeba989922ef40f4a80f92eb7b74220a7712587525ecb0b4e679
sha512sums = 1e901b8894743e9dcb04046a5fa58e14b19095b3295abae679dcbbf309bd79ddf1716dcd07ae8a71e7cdc9361216c0c9da12a76edb45e9388c512b07df7759e7
sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf
sha512sums = 1a17f83747ebd2dbe8d57996a1234f9e72de0754f8907c984477d761c2d99753490b72d80e2c801b85ded705818d530401f6377e3312937d72d1e4052007ce30
diff --git a/.gitignore b/.gitignore
index e89bb5747457..da64c3ed71d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@
/*.part
/linux-*.tar.xz
/linux-*.tar.sign
-/linux-hardened-*.patch
-/linux-hardened-*.patch.sig
+/*.patch
+/*.patch.sig
/*.diff
/*.log
/*.src.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 4e02dc0206e4..16739c33b3e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# tracks: https://projects.archlinux.org/svntogit/packages.git/log/trunk?h=packages/linux
pkgname=linux-linode
-_basekernel=6.1.22
+_basekernel=6.1.31
_hardenedver=1
pkgrel=1
_kernelname=${pkgname#linux}
@@ -17,28 +17,32 @@ makedepends=(xmlto docbook-xsl kmod inetutils bc libelf)
options=('!strip')
source=("https://www.kernel.org/pub/linux/kernel/v${_basekernel%%.*}.x/${_srcname}.tar."{xz,sign}
"https://github.com/anthraxx/${_patchname}/releases/download/${pkgver_}/${_patchname}-${pkgver_}.patch"{,.sig}
+ 'https://gitlab.archlinux.org/archlinux/packaging/packages/linux-hardened/-/raw/main/gcc13-compat.patch'
'config'
'08_linux_linode'
'99-grub-ll.hook'
'menu.lst'
'preset')
-sha512sums=('9db5360c85a2e8c7d1a3a37e0d79dafe3561566e098394a15e8cb48929a7afa74b203d3d67c286a8ddb4359a0ba8d45f33678219f9ccb8f728d1c4d4455fd27f' 'SKIP'
- '98df1618f30b2bfb6995760c810a5347d5ab9adaacd3dc5cf1617ebf100531ec6972c06fd128b795460c52ef6f2cc401d0dcf52dc6f62b70031e7d798e71112b' 'SKIP'
- '0a02b78f3e25018b45d60df6c81b013f642719efa52ddf2c27865feb951851b21b1990547472713206f0836c95ab37a8d97b82dbe7053a244db70620196aef3e'
+sha512sums=('1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b' 'SKIP'
+ 'c946e62eaff550a897244bc3c82e8c4713e438d25db28bffb5287e8ba41913f4ee80930fd952d1b32074a6b58c0860a37ccd67fe366543f8db79d1e6e0d9c794' 'SKIP'
+ 'ba5ecf6e5e3f70ef6d0bbd2b929542b0247c8efedef4f2e1de28ca1644452c24a2124fcdcf958f2dc7121f0ab673b64dc3bd6529e26e552c5184a4857818b9bd'
+ '4ea8a6c4e773b17e1ab55005aa46ccb56973aef1bc05bc0fe56643f168c75c46d43260baf199aeba989922ef40f4a80f92eb7b74220a7712587525ecb0b4e679'
'1e901b8894743e9dcb04046a5fa58e14b19095b3295abae679dcbbf309bd79ddf1716dcd07ae8a71e7cdc9361216c0c9da12a76edb45e9388c512b07df7759e7'
'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf'
'1a17f83747ebd2dbe8d57996a1234f9e72de0754f8907c984477d761c2d99753490b72d80e2c801b85ded705818d530401f6377e3312937d72d1e4052007ce30'
'a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f')
-sha256sums=('2be89141cef74d0e5a55540d203eb8010dfddb3c82d617e66b058f20b19cfda8' 'SKIP'
- 'f404473346640529f60b77411f637003dcd3c840c511d659833a5289346492db' 'SKIP'
- '1ac50f8116af2d3d735f6fc5cb5d2eff7c8fdd6f8bc7a0387651a26ff96f2dd6'
+sha256sums=('e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1' 'SKIP'
+ '7f4e37effb3585ff438a1a6d2039762872b40e79f406696d948e4c9b7ee16a11' 'SKIP'
+ 'c6c5f6be7ae0ef5a8bdfea0a5578f096db38113774e08dc7b78fc48034c7b211'
+ '5eda6af949bc31c4dd762eea6bd4dd3515f9071e4184a675a743827423ec8839'
'a2295cee5ae8c8d9c3efb0483e5e842f6bd9753f851c7433465b242264738546'
'368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3'
'df9f20f818bf6c11296e5ac58c5fdd664ba17f3d80cf301eef9309ddb528741d'
'33d9f913e4aed9f41bf263ff784921ab7d69597732079cbd06ff05b9adb32f44')
-md5sums=('d889d541302da503f566f4d53a0453dc' 'SKIP'
- 'f343207d3efd0eeb98787ce7053123e4' 'SKIP'
- '0e660c6c96286550f713118713f2f4af'
+md5sums=('72ac33b766704899f0a0d4d5e5fb02a9' 'SKIP'
+ 'e6d981cd8cfab5d0b7e03195cfb50e02' 'SKIP'
+ '142e3e26901861047e5dfa5c5bd7509c'
+ '7a8413c1c42841e38596d87cee00e456'
'b24775bcf1d7a04c1d489af73c6e74b0'
'625481f015365febcd65aa136ee555f9'
'901c03c685c65119b50666cb31a080be'
@@ -55,7 +59,8 @@ backup=(etc/mkinitcpio.d/${pkgname}.preset boot/grub/menu.lst)
prepare() {
cd "${srcdir}/${_srcname}"
- patch -p1 -i "${srcdir}/${_patchname}-${pkgver_}.patch"
+ patch -Np1 -i "${srcdir}/gcc13-compat.patch"
+ patch -Np1 -i "${srcdir}/${_patchname}-${pkgver_}.patch"
sed -e "/^EXTRAVERSION =/s/=.*/= .hardened${_hardenedver}/" -i Makefile
scripts/setlocalversion --save-scmversion
cp "${srcdir}/config" .config
diff --git a/config b/config
index 7d5aa30f7ef4..5bbf77eb8c99 100644
--- a/config
+++ b/config
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.22.hardened1 Kernel Configuration
+# Linux/x86 6.1.31.hardened1 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120201
+CONFIG_GCC_VERSION=130101
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=24000
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=124
+CONFIG_PAHOLE_VERSION=125
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -173,7 +173,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_CC_HAS_INT128=y
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC12_NO_ARRAY_BOUNDS=y
CONFIG_CC_NO_ARRAY_BOUNDS=y
CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_CGROUPS=y