libnftnl update 1.1.7

This commit is contained in:
hanzj0122_admin 2020-07-22 10:08:43 +08:00
parent a49ba6207b
commit 33edf75b5f
4 changed files with 6 additions and 42 deletions

View File

@ -1,37 +0,0 @@
From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Mon, 2 Dec 2019 18:29:56 +0100
Subject: [PATCH] tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
Marshalling code around that attribute has been dropped by commit
d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
lost during the test.
Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
later point, leave the test code in place but just comment it out.
Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
tests/nft-flowtable-test.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
index 3edb00d..8ab8d4c 100644
--- a/tests/nft-flowtable-test.c
+++ b/tests/nft-flowtable-test.c
@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
print_err("Flowtable use mismatches");
+#if 0
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
print_err("Flowtable size mismatches");
+#endif
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
print_err("Flowtable flags mismatches");
--
2.19.1

Binary file not shown.

BIN
libnftnl-1.1.7.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,14 +1,12 @@
Name: libnftnl
Version: 1.1.5
Release: 3
Version: 1.1.7
Release: 1
Summary: Library for low-level interaction with nftables Netlink's API over libmnl
License: GPLv2+
URL: http://netfilter.org/projects/libnftnl/
Source0: http://ftp.netfilter.org/pub/libnftnl/libnftnl-%{version}.tar.bz2
Patch6000: backport-tests-flowtable-Don-t-check-NFTNL_FLOOWTABLE_SIZE.patch
BuildRequires: libmnl-devel jansson-devel gcc libnftnl
BuildRequires: libmnl-devel jansson-devel gcc
# replace old libnftables package
Provides: libnftables = %{version}-%{release}
@ -53,6 +51,9 @@ make %{?_smp_mflags} check
%{_includedir}/libnftnl
%changelog
* Wed Jul 22 2020 hanzhijun<hanzhijun1@huawei.com> - 1.1.7-1
- update to 1.1.7
* Wed Jul 1 2020 chengquan<chengquan3@huawei.com> - 1.1.5-3
- delete temporary binary compatibility