From: Nick Hainke <vincent@systemli.org>
Date: Thu, 22 Dec 2022 18:59:37 +0000 (+0100)
Subject: nftables: update to 1.0.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b331ffe807e16ac723da5e92094b40bdd9bb06f5;p=openwrt%2Fstaging%2Fblocktrron.git

nftables: update to 1.0.6

Remove upstreamed patches:
- 0001-fix-nft.patch

Upstream switched to "tar.xz" archives.

old ipkg size:
273678 bin/packages/mips_24kc/base/nftables-json_1.0.5-2_mips_24kc.ipk

new ipkg size:
271624 bin/packages/mips_24kc/base/nftables-json_1.0.6-1_mips_24kc.ipk

Release Information:
https://netfilter.org/projects/nftables/files/changes-nftables-1.0.6.txt

Signed-off-by: Nick Hainke <vincent@systemli.org>
---

diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile
index 9691151c7b..2010aaf65c 100644
--- a/package/network/utils/nftables/Makefile
+++ b/package/network/utils/nftables/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nftables
-PKG_VERSION:=1.0.5
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.6
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
-PKG_HASH:=8d1b4b18393af43698d10baa25d2b9b6397969beecac7816c35dd0714e4de50a
+PKG_HASH:=2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/nftables/patches/0001-fix-nft.patch b/package/network/utils/nftables/patches/0001-fix-nft.patch
deleted file mode 100644
index 2138e254e8..0000000000
--- a/package/network/utils/nftables/patches/0001-fix-nft.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-'rule inet dscpclassify dscp_match  meta l4proto { udp }  th dport { 3478 }  th sport { 3478-3497, 16384-16387 } goto ct_set_ef'
-works with 'nft add', but not 'nft insert', the latter yields: "BUG: unhandled op 4".
-
-Fixes: 81e36530fcac ("src: replace interval segment tree overlap and automerge")
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- src/evaluate.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/evaluate.c b/src/evaluate.c
-index d9c9ca28a53a..edebd7bcd8ab 100644
---- a/src/evaluate.c
-+++ b/src/evaluate.c
-@@ -1520,6 +1520,7 @@ static int interval_set_eval(struct eval_ctx *ctx, struct set *set,
- 	switch (ctx->cmd->op) {
- 	case CMD_CREATE:
- 	case CMD_ADD:
-+	case CMD_INSERT:
- 		if (set->automerge) {
- 			ret = set_automerge(ctx->msgs, ctx->cmd, set, init,
- 					    ctx->nft->debug_mask);
--- 
-2.35.1