From b1f6c96b6c82f3bfb6da8ba46d571a0930ce8fff Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 16 Aug 2019 11:40:59 -0700 Subject: Updated to 5.2.9 --- ...r-nf_tables-fix-module-autoload-for-redir.patch | 27 ---------------------- PKGBUILD | 7 ++---- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch 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 f3ec50e..0000000 --- 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 -Date: Thu, 11 Jul 2019 01:31:12 +0200 -Subject: 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 -Signed-off-by: Pablo Neira Ayuso ---- - 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 "); --MODULE_ALIAS_NFT_EXPR("nat"); -+MODULE_ALIAS_NFT_EXPR("redir"); --- -cgit v1.2.1-1-g437b - diff --git a/PKGBUILD b/PKGBUILD index 0ce3e69..1ef8815 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ pkgbase=linux-ck _majver=5.2 -_minver=8 +_minver=9 if [ "$_minver" == "0" ]; then pkgver=${_majver} else @@ -44,7 +44,6 @@ 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 ck_remove-excess-extraversion.patch linux-ck-patch-${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/5.0/${_majver}/${_majver}-${_ckpatchversion}/${_ckpatch}.xz graysky_bdver2-hotfix.patch @@ -56,13 +55,12 @@ source=( 90-linux.hook # pacman hook for initramfs regeneration linux.preset # standard config files for mkinitcpio ramdisk ) -sha256sums=('a127cd06cc01468e5564c5242827610b679827d7b40c2a2e4d82c629dd0f6937' +sha256sums=('b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6' 'SKIP' '91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3' '63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9' '8449de698dfc8f95ff03dbfd98b6abdd71dbc4238896256690cb856fe366aac3' 'bcace026000869cffe107e33ba4facba93f2fda9a5a3c65b7576e30b7ee2c8d3' - 'f6eac8cc5a9e4f186d277b8679f78c1da14a42eeab40370f4f52ec5181af39a8' '152c551bd03e92d6458b0d9f352c97eb058014ab019fa213167a6f8178bd6d71' 'f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36' '5d078323fc39482a8f828f721e55246d061914602f0cdadaa4787de50a2a6228' @@ -95,7 +93,6 @@ prepare() { patch -p1 -i ../0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch patch -p1 -i ../0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch patch -p1 -i ../0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch - patch -p1 -i ../0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch # ck hotfixes -- cgit v1.2.1