12/15: gnu: libnftnl: Update to 1.1.5.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 79a392535591fc4224280ade6a87910793ca6688
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Tue Dec 10 16:28:42 2019 +0100

    gnu: libnftnl: Update to 1.1.5.
    
    * gnu/packages/linux.scm (libnftnl): Update to 1.1.5.
    [source]: Add patch.
    * gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch: New 
file.
    * gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/linux.scm                             |  6 ++-
 .../libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch | 47 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 00ff3b8..7f87152 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1012,6 +1012,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/java-xerces-xjavac_taskdef.patch        \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
+  %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch  \
   %D%/packages/patches/libvirt-create-machine-cgroup.patch     \
   %D%/packages/patches/libziparchive-add-includes.patch                \
   %D%/packages/patches/localed-xorg-keyboard.patch             \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8b5969c..024c6e5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5229,14 +5229,16 @@ re-use code and to avoid re-inventing the wheel.")
 (define-public libnftnl
   (package
     (name "libnftnl")
-    (version "1.1.4")
+    (version "1.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://netfilter.org/libnftnl/"
                            "libnftnl-" version ".tar.bz2"))
        (sha256
-        (base32 "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8"))))
+        (base32 "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6"))
+       (patches
+        (search-patches "libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
diff --git 
a/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch 
b/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch
new file mode 100644
index 0000000..df0571b
--- /dev/null
+++ b/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch
@@ -0,0 +1,47 @@
+From: Tobias Geerinckx-Rice <address@hidden>
+Date: Tue, 10 Dec 2019 16:20:40 +0100
+Subject: gnu: libnftnl: Don't check NFTNL_FLOWTABLE_SIZE.
+
+Taken verbatim from the upstream commit[0] directly following the 1.1.5
+release.
+
+[0]: 
https://git.netfilter.org/libnftnl/commit/?id=b2388765e0c4405442faa13845419f6a35d0134c
+
+From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
+From: Phil Sutter <address@hidden>
+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 <address@hidden>
+Acked-by: Pablo Neira Ayuso <address@hidden>
+---
+ 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
+