diff --git a/srcpkgs/linux6.1/patches/netfilter-typo.patch b/srcpkgs/linux6.1/patches/netfilter-typo.patch deleted file mode 100644 index 431ffb382bb..00000000000 --- a/srcpkgs/linux6.1/patches/netfilter-typo.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 306ed1728e8438caed30332e1ab46b28c25fe3d8 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -Date: Sun, 20 Oct 2024 14:49:51 +0200 -Subject: [PATCH] netfilter: xtables: fix typo causing some targets not to load - on IPv6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- There is no NFPROTO_IPV6 family for mark and NFLOG. -- TRACE is also missing module autoload with NFPROTO_IPV6. - -This results in ip6tables failing to restore a ruleset. This issue has been -reported by several users providing incomplete patches. - -Very similar to Ilya Katsnelson's patch including a missing chunk in the -TRACE extension. - -Fixes: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed") -Reported-by: Ignat Korchagin -Reported-by: Ilya Katsnelson -Reported-by: Krzysztof Olędzki -Signed-off-by: Pablo Neira Ayuso ---- - net/netfilter/xt_NFLOG.c | 2 +- - net/netfilter/xt_TRACE.c | 1 + - net/netfilter/xt_mark.c | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c -index d80abd6ccaf8f7..6dcf4bc7e30b2a 100644 ---- a/net/netfilter/xt_NFLOG.c -+++ b/net/netfilter/xt_NFLOG.c -@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = { - { - .name = "NFLOG", - .revision = 0, -- .family = NFPROTO_IPV4, -+ .family = NFPROTO_IPV6, - .checkentry = nflog_tg_check, - .destroy = nflog_tg_destroy, - .target = nflog_tg, -diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c -index f3fa4f11348cd8..a642ff09fc8e8c 100644 ---- a/net/netfilter/xt_TRACE.c -+++ b/net/netfilter/xt_TRACE.c -@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = { - .target = trace_tg, - .checkentry = trace_tg_check, - .destroy = trace_tg_destroy, -+ .me = THIS_MODULE, - }, - #endif - }; -diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c -index f76fe04fc9a4e1..65b965ca40ea7e 100644 ---- a/net/netfilter/xt_mark.c -+++ b/net/netfilter/xt_mark.c -@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = { - { - .name = "MARK", - .revision = 2, -- .family = NFPROTO_IPV4, -+ .family = NFPROTO_IPV6, - .target = mark_tg, - .targetsize = sizeof(struct xt_mark_tginfo2), - .me = THIS_MODULE, diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template index ef6832ac4e3..2dedc3ac39a 100644 --- a/srcpkgs/linux6.1/template +++ b/srcpkgs/linux6.1/template @@ -1,7 +1,7 @@ # Template file for 'linux6.1' pkgname=linux6.1 -version=6.1.114 -revision=2 +version=6.1.127 +revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only" @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb - 8fdfbfc1610438012de1c936ed342f2908c96f73d1f9e2c37c57cd769bb0a4b8" + 33c5bcfafb33cdf922b07be1bae9baaeca5b6f04eba7443524bc5eb787efddf1" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.