summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Cunningham <todd.cunningham@opengear.com>2019-12-16 14:55:13 +1000
committerKhem Raj <raj.khem@gmail.com>2019-12-16 08:38:35 -0800
commit906efee42764b2640ef7f58638cf03df2385d3a2 (patch)
tree4dc6c5d3fd3e9260690b5e5568fc9628255caf43
parent29126c33387229ae2cb585b863de7b17c317f86e (diff)
downloadmeta-openembedded-906efee42764b2640ef7f58638cf03df2385d3a2.tar.gz
nftables: upgrade 0.9.2 -> 0.9.3
New patch: 0001-update-python3-nftables-reference.patch Signed-off-by: Todd Cunningham <tcunningham07@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch47
-rw-r--r--meta-networking/recipes-filter/nftables/nftables_0.9.3.bb (renamed from meta-networking/recipes-filter/nftables/nftables_0.9.2.bb)7
2 files changed, 51 insertions, 3 deletions
diff --git a/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch b/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch
new file mode 100644
index 0000000000..db2243480d
--- /dev/null
+++ b/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch
@@ -0,0 +1,47 @@
1From ddbe652bf0f4ed300bae9497250130d68e4cbf5b Mon Sep 17 00:00:00 2001
2From: Arturo Borrero Gonzalez <arturo@netfilter.org>
3Date: Tue, 10 Dec 2019 12:00:45 +0100
4Subject: py: load the SONAME-versioned shared object
5
6Instruct the python module to load the SONAME versioned shared object.
7
8Normal end-user systems may only have available libnftables.so.1.0.0 and not
9libnftables.so which is usually only present in developer systems.
10
11In Debian systems, for example:
12
13 % dpkg -L libnftables1 | grep so.1
14 /usr/lib/x86_64-linux-gnu/libnftables.so.1.0.0
15 /usr/lib/x86_64-linux-gnu/libnftables.so.1
16
17 % dpkg -L libnftables-dev | grep so
18 /usr/lib/x86_64-linux-gnu/libnftables.so
19
20The "1" is not a magic number, is the SONAME of libnftables in the current
21version, as stated in Make_global.am.
22
23Reported-by: Michael Biebl <biebl@debian.org>
24Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
25Acked-by: Phil Sutter <phil@nwl.cc>
26Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
27---
28 py/nftables.py | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31diff --git a/py/nftables.py b/py/nftables.py
32index 48eb54fe..2a0a1e89 100644
33--- a/py/nftables.py
34+++ b/py/nftables.py
35@@ -64,7 +64,7 @@ class Nftables:
36
37 validator = None
38
39- def __init__(self, sofile="libnftables.so"):
40+ def __init__(self, sofile="libnftables.so.1"):
41 """Instantiate a new Nftables class object.
42
43 Accepts a shared object file to open, by default standard search path
44--
45cgit v1.2.1
46
47
diff --git a/meta-networking/recipes-filter/nftables/nftables_0.9.2.bb b/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb
index 0c57e7255e..7302626165 100644
--- a/meta-networking/recipes-filter/nftables/nftables_0.9.2.bb
+++ b/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb
@@ -7,9 +7,10 @@ DEPENDS = "libmnl libnftnl readline gmp bison-native"
7 7
8UPSTREAM_CHECK_URI = "https://www.netfilter.org/projects/nftables/files/" 8UPSTREAM_CHECK_URI = "https://www.netfilter.org/projects/nftables/files/"
9 9
10SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" 10SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \
11SRC_URI[md5sum] = "dfe130724d7c998eb26b56447e932899" 11 file://0001-update-python3-nftables-reference.patch"
12SRC_URI[sha256sum] = "5cb66180143e6bfc774f4eb316206d40ac1cb6df269a90882404cbf7165513f5" 12SRC_URI[md5sum] = "9913b2b46864394d41916b74638e0875"
13SRC_URI[sha256sum] = "956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78"
13 14
14inherit autotools manpages pkgconfig 15inherit autotools manpages pkgconfig
15 16