summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2023-07-07 02:58:02 -0400
committergraysky2023-07-07 02:58:02 -0400
commit01aad31b149c98c2c74f0b0bb861bc7611e5b3c7 (patch)
tree8ae291f1a49500c6e2d76618640d2254305669aa
parent565a764c82b9a801e3855869620ec66b7b33b575 (diff)
downloadaur-01aad31b149c98c2c74f0b0bb861bc7611e5b3c7.tar.gz
Update to 6.4.2-1
-rw-r--r--.SRCINFO16
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch2
-rw-r--r--0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch2
-rw-r--r--PKGBUILD12
-rw-r--r--config3
5 files changed, 17 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a2ef33dc9d3..f29e5c04a4ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
- pkgver = 6.4.1
- pkgrel = 2
+ pkgver = 6.4.2
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -15,8 +15,8 @@ pkgbase = linux-ck
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.1.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.1.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.2.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.2.tar.sign
source = config
source = more-uarches-20221217.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221217.tar.gz
source = ck-hrtimer-2870d6ac146aa658af60bb18a9c7503efe5992d4.tar.gz::https://github.com/graysky2/linux-patches/archive/2870d6ac146aa658af60bb18a9c7503efe5992d4.tar.gz
@@ -25,13 +25,13 @@ pkgbase = linux-ck
source = 0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 0d9daa9f1c176fb13b9447f6e3d80e82b49043f0d344c247bbf09b4e625beef3
+ sha256sums = a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c
sha256sums = SKIP
- sha256sums = 23c9cd83010036f8c5f0a4f0a627bb93118c4dcfb4dcbc5bfd2177088d4a51ea
+ sha256sums = e8d4bbd63808eeec78680c7de4383333b76ab9d58214042bd4b01d784bbc8ec8
sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0
sha256sums = ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144
- sha256sums = d32903944a4dec99dc81c8e53b125639c72755eb7df299e864d1cbee2c6610fa
- sha256sums = 8b46076d107c34ac4aa66dc35b1de9553877e19129bde511c4a14d18bbda091d
+ sha256sums = 4cb280177bbd41d26226417ad9e363708e12e7b8b1b4bbc45d1112bd63492b19
+ sha256sums = 6197fdd3e6d615f63bae43237c5c8292b8c52ac17d798061f7c3be2806cf0378
sha256sums = 36a7a3b002e25c7f01f1ca09c29e010e7ee78887c61354201d67c35345050873
pkgname = linux-ck
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 8a6f35681c33..9a06f6b209c5 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,4 +1,4 @@
-From 5440ebf8dc7c5fd1f97579abbc1840c631141f0a Mon Sep 17 00:00:00 2001
+From 08fe90ab87115393074127f17be88ff9bfcf304a Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged
diff --git a/0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch b/0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch
index 6d554d30ad24..c33b808a6e53 100644
--- a/0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch
+++ b/0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch
@@ -1,4 +1,4 @@
-From 50c597f3cc8dc4de0f0b6153a0ff1bd0b2dc6f56 Mon Sep 17 00:00:00 2001
+From 13bbcf64b256914e57dfe3ab6d16152304513c74 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 26 Jun 2023 00:42:18 +0200
Subject: [PATCH 2/4] netfilter: nf_tables: unbind non-anonymous set if rule
diff --git a/PKGBUILD b/PKGBUILD
index 9017f429e031..e76e65b90134 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,8 +71,8 @@ _subarch=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=6.4.1
-pkgrel=2
+pkgver=6.4.2
+pkgrel=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
license=(GPL2)
@@ -110,13 +110,13 @@ validpgpkeys=(
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman
)
-sha256sums=('0d9daa9f1c176fb13b9447f6e3d80e82b49043f0d344c247bbf09b4e625beef3'
+sha256sums=('a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c'
'SKIP'
- '23c9cd83010036f8c5f0a4f0a627bb93118c4dcfb4dcbc5bfd2177088d4a51ea'
+ 'e8d4bbd63808eeec78680c7de4383333b76ab9d58214042bd4b01d784bbc8ec8'
'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0'
'ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144'
- 'd32903944a4dec99dc81c8e53b125639c72755eb7df299e864d1cbee2c6610fa'
- '8b46076d107c34ac4aa66dc35b1de9553877e19129bde511c4a14d18bbda091d'
+ '4cb280177bbd41d26226417ad9e363708e12e7b8b1b4bbc45d1112bd63492b19'
+ '6197fdd3e6d615f63bae43237c5c8292b8c52ac17d798061f7c3be2806cf0378'
'36a7a3b002e25c7f01f1ca09c29e010e7ee78887c61354201d67c35345050873')
_make() {
test -s version
diff --git a/config b/config
index e08c92eaec1b..e9e2d4717ff1 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.4.1-arch2 Kernel Configuration
+# Linux/x86 6.4.2-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
CONFIG_CC_IS_GCC=y
@@ -1163,7 +1163,6 @@ CONFIG_LRU_GEN=y
CONFIG_LRU_GEN_ENABLED=y
# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
-# CONFIG_PER_VMA_LOCK is not set
CONFIG_LOCK_MM_AND_FIND_VMA=y
#