summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch27
-rw-r--r--PKGBUILD8
3 files changed, 10 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 88b3651ec50c..d35767cc876d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 5.2.8
+ pkgver = 5.2.9
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -9,8 +9,8 @@ pkgbase = linux-ck
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.8.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.8.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.sign
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -21,10 +21,9 @@ pkgbase = linux-ck
source = 0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
source = 0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
source = 0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
- source = 0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = a127cd06cc01468e5564c5242827610b679827d7b40c2a2e4d82c629dd0f6937
+ sha256sums = b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6
sha256sums = SKIP
sha256sums = 1c4d5500a3b4995035c2e940fc0ad2a2dae7be047c8eb20c097444e348258f87
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -36,7 +35,6 @@ pkgbase = linux-ck
sha256sums = 63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9
sha256sums = fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020
sha256sums = ef926edbd866d95464eb86f7565de572eb97ecfa0369d3b2e078016a0e71a871
- sha256sums = 4ca62639b7efb87c847e089b0a9aaf7ffc52bdbf25ac0d785926f6d667d130ec
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.192
@@ -46,12 +44,12 @@ pkgname = linux-ck
depends = kmod
depends = mkinitcpio
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-ck=5.2.8
+ provides = linux-ck=5.2.9
backup = etc/mkinitcpio.d/linux-ck.preset
pkgname = linux-ck-headers
pkgdesc = Header files and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.2.8
- provides = linux-headers=5.2.8
+ provides = linux-ck-headers=5.2.9
+ provides = linux-headers=5.2.9
diff --git a/0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch b/0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
deleted file mode 100644
index 1c617f6121dd..000000000000
--- a/0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 103abca5ff3ca4db4d8f6c21626fa597fe122a03 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Thu, 11 Jul 2019 01:31:12 +0200
-Subject: [PATCH 5/6] netfilter: nf_tables: fix module autoload for redir
-
-Fix expression for autoloading.
-
-Fixes: 5142967ab524 ("netfilter: nf_tables: fix module autoload with inet family")
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/nft_redir.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c
-index 8487eeff5c0e..43eeb1f609f1 100644
---- a/net/netfilter/nft_redir.c
-+++ b/net/netfilter/nft_redir.c
-@@ -291,4 +291,4 @@ module_exit(nft_redir_module_exit);
-
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Arturo Borrero Gonzalez <arturo@debian.org>");
--MODULE_ALIAS_NFT_EXPR("nat");
-+MODULE_ALIAS_NFT_EXPR("redir");
---
-2.22.0
-
diff --git a/PKGBUILD b/PKGBUILD
index ecf88bbe2f3d..6843da84eed8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -63,7 +63,7 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-_srcver=5.2.8-arch1
+_srcver=5.2.9-arch1
pkgver=${_srcver%-*}
pkgrel=1
_ckpatchversion=1
@@ -86,13 +86,12 @@ source=(
0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
- 0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('a127cd06cc01468e5564c5242827610b679827d7b40c2a2e4d82c629dd0f6937'
+sha256sums=('b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6'
'SKIP'
'1c4d5500a3b4995035c2e940fc0ad2a2dae7be047c8eb20c097444e348258f87'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -103,8 +102,7 @@ sha256sums=('a127cd06cc01468e5564c5242827610b679827d7b40c2a2e4d82c629dd0f6937'
'91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3'
'63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9'
'fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020'
- 'ef926edbd866d95464eb86f7565de572eb97ecfa0369d3b2e078016a0e71a871'
- '4ca62639b7efb87c847e089b0a9aaf7ffc52bdbf25ac0d785926f6d667d130ec')
+ 'ef926edbd866d95464eb86f7565de572eb97ecfa0369d3b2e078016a0e71a871')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}