diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2019-12-15 14:47:36 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-12-15 14:47:36 +0000 |
| commit | 9609603ff3a95b2f053c836afbec9ecf5db699db (patch) | |
| tree | 25aa87a0abdb1bbc9a7d351bf945f984324feaa8 | |
| parent | cb68f8d062fa42bfc67ef084ba467deb2493b13d (diff) | |
| download | aports-9609603ff3a95b2f053c836afbec9ecf5db699db.tar.bz2 aports-9609603ff3a95b2f053c836afbec9ecf5db699db.tar.xz | |
main/libnftnl: upgrade to 1.1.5
| -rw-r--r-- | main/libnftnl/APKBUILD | 8 | ||||
| -rw-r--r-- | main/libnftnl/nft-flowtable-test.patch | 38 |
2 files changed, 43 insertions, 3 deletions
diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD index 0424d2b485..bf00eb9bc4 100644 --- a/main/libnftnl/APKBUILD +++ b/main/libnftnl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=libnftnl -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -10,7 +10,8 @@ license="GPL-2.0-or-later" depends_dev="libmnl-dev" makedepends="$depends_dev bash jansson-dev" subpackages="$pkgname-dev $pkgname-libs" -source="https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2" +source="https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2 +nft-flowtable-test.patch" case "$CARCH" in s390x) options="!check" ;; # FIXME @@ -39,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2" +sha512sums="a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7 libnftnl-1.1.5.tar.bz2 +9c9efaccc2f01e031fe6e05db480a3a1aeace74d11e5e2f2f25979e7543beeea86ea80c0661836a2ec26663c801abb08de3c76c5ac98536b8c05e7caab1f9407 nft-flowtable-test.patch" diff --git a/main/libnftnl/nft-flowtable-test.patch b/main/libnftnl/nft-flowtable-test.patch new file mode 100644 index 0000000000..7b02e94f1a --- /dev/null +++ b/main/libnftnl/nft-flowtable-test.patch @@ -0,0 +1,38 @@ +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: 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"); +-- +cgit v1.2.1 + |