NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libnftnl: bump version to 1.1.4

Browse Source 
Removed patch after upstream committed an updated version from Baruch:
https://git.netfilter.org/libnftnl/commit/?id=78709f7b55aa8934f42aa40548dcdf65e6bfeb2c

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2019-08-31 14:01:40 +02:00 committed by Thomas Petazzoni
parent d23e0a23a4
commit cdfcdc1282
3 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
package/libnftnl/0001-Add-Libs.private-field-to-libnftnl.pc.patch
View File

@ -1,49 +0,0 @@
From d89fca062ba966332b573673fdd5c4cf01c3e2f5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Dec 2014 15:32:08 +0100
Subject: [PATCH 2/2] Add Libs.private field to libnftnl.pc
Static linking userspace programs such as nftables against libnftnl
currently doesn't work out of the box, because libnftnl is linked
against libmnl, but this isn't expressed in libnftnl pkg-config
file:
CCLD nft
[...]/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libnftnl.a(table.o): In function `_nft_table_nlmsg_parse':
table.c:(.text+0x480): undefined reference to `_mnl_attr_parse'
table.c:(.text+0x492): undefined reference to `_mnl_attr_get_str'
table.c:(.text+0x4a8): undefined reference to `_mnl_attr_get_u32'
table.c:(.text+0x4ca): undefined reference to `_mnl_attr_get_u32'
[...]
The Libs.private field is specifically designed for such usage:
From pkg-config documentation:
Libs.private:
This line should list any private libraries in use. Private
libraries are libraries which are not exposed through your
library, but are needed in the case of static linking.
Therefore, this patch adds a reference to libmnl in the Libs.private
field of libnftnl pkg-config file.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
libnftnl.pc.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/libnftnl.pc.in b/libnftnl.pc.in
index fd5cc6a..7fef921 100644
--- a/libnftnl.pc.in
+++ b/libnftnl.pc.in
@@ -12,4 +12,5 @@ Version: @VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lnftnl
+Libs.private: @LIBMNL_LIBS@
Cflags: -I${includedir}
--
2.1.0

2
package/libnftnl/libnftnl.hash
View File

@ -1,3 +1,3 @@
# From http://www.netfilter.org/projects/libnftnl/downloads.html
sha256 22dd97d3b06ae8c67499506e2bfd6803ce116479076ec3700e7a4c7cd9fcba0f libnftnl-1.1.3.tar.bz2
sha256 c8c7988347adf261efac5bba59f8e5f995ffb65f247a88cc144e69620573ed20 libnftnl-1.1.4.tar.bz2
sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING

2
package/libnftnl/libnftnl.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBNFTNL_VERSION = 1.1.3
LIBNFTNL_VERSION = 1.1.4
LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files
LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2
LIBNFTNL_LICENSE = GPL-2.0+