Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Henrik Riomar
aports
Commits
9609603f
Commit
9609603f
authored
Dec 15, 2019
by
Francesco Colista
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/libnftnl: upgrade to 1.1.5
parent
cb68f8d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
3 deletions
+43
-3
main/libnftnl/APKBUILD
main/libnftnl/APKBUILD
+5
-3
main/libnftnl/nft-flowtable-test.patch
main/libnftnl/nft-flowtable-test.patch
+38
-0
No files found.
main/libnftnl/APKBUILD
View file @
9609603f
# 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"
main/libnftnl/nft-flowtable-test.patch
0 → 100644
View file @
9609603f
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment