diff --git a/backport-json-fix-base-chain-output.patch b/backport-json-fix-base-chain-output.patch deleted file mode 100644 index 96093fd..0000000 --- a/backport-json-fix-base-chain-output.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 790889957b48f4d28dc1699bd6c193617f2141b3 Mon Sep 17 00:00:00 2001 -From: Florian Westphal -Date: Wed, 2 Jun 2021 12:47:24 +0200 -Subject: json: fix base chain output - -nft-test.py -j fails with -python: json.c:243: chain_print_json: Assertion `__out' failed. - -The member was changed from char * to a struct, pass the name again. - -Fixes: 5008798157e2114f ("libnftables: location-based error reporting for chain type") -Signed-off-by: Florian Westphal -(cherry picked from commit cabe8992b3ee4eb0001a07075b317d966df6bcbd) ---- - src/json.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -(limited to 'src/json.c') - -diff --git a/src/json.c b/src/json.c -index a3d1008f..e588ef4c 100644 ---- a/src/json.c -+++ b/src/json.c -@@ -241,7 +241,7 @@ static json_t *chain_print_json(const struct chain *chain) - mpz_export_data(&policy, chain->policy->value, - BYTEORDER_HOST_ENDIAN, sizeof(int)); - tmp = json_pack("{s:s, s:s, s:i, s:s}", -- "type", chain->type, -+ "type", chain->type.str, - "hook", hooknum2str(chain->handle.family, - chain->hook.num), - "prio", priority, --- -cgit v1.2.3 diff --git a/nftables-0.9.9.tar.bz2 b/nftables-0.9.9.tar.bz2 deleted file mode 100644 index 80a7b31..0000000 Binary files a/nftables-0.9.9.tar.bz2 and /dev/null differ diff --git a/nftables-1.0.0.tar.bz2 b/nftables-1.0.0.tar.bz2 new file mode 100644 index 0000000..41a0612 Binary files /dev/null and b/nftables-1.0.0.tar.bz2 differ diff --git a/nftables.spec b/nftables.spec index 4cbabf5..aacda07 100644 --- a/nftables.spec +++ b/nftables.spec @@ -1,6 +1,6 @@ Name: nftables -Version: 0.9.9 -Release: 3 +Version: 1.0.0 +Release: 1 Epoch: 1 Summary: A subsystem of the Linux kernel processing network data License: GPLv2 @@ -8,7 +8,6 @@ URL: https://netfilter.org/projects/nftables/ Source0: http://ftp.netfilter.org/pub/nftables/nftables-%{version}.tar.bz2 Source1: nftables.service Source2: nftables.conf -Patch0: backport-json-fix-base-chain-output.patch BuildRequires: gcc flex bison libmnl-devel gmp-devel readline-devel libnftnl-devel docbook2X systemd BuildRequires: iptables-devel jansson-devel python3-devel @@ -105,6 +104,12 @@ echo "%{_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %{python3_sitelib}/nftables/ %changelog +* Sat Mar 19 2022 quanhongfei - 1:1.0.0-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update nftables to 1.0.0 + * Tue Sep 07 2021 gaihuiying - 1:0.9.9-3 - Type:requirement - ID:NA