diff options
author | Pierre-Jean Texier <pjtexier@koncepto.io> | 2020-04-03 18:20:19 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-04-03 14:45:54 -0700 |
commit | 519b86c549a7e62e0f9779402567571c96a35d40 (patch) | |
tree | 4adf7aeb00832be16e072921a9387666a50b3a9a /meta-networking/recipes-filter | |
parent | fbebf1bb0aba87c39d6738fcf5a2422072c13232 (diff) | |
download | meta-openembedded-contrib-519b86c549a7e62e0f9779402567571c96a35d40.tar.gz |
nftables: upgrade 0.9.3 -> 0.9.4
See https://lwn.net/Articles/816528/
Also remove patch applied upstream
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-filter')
-rw-r--r-- | meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch | 47 | ||||
-rw-r--r-- | meta-networking/recipes-filter/nftables/nftables_0.9.4.bb (renamed from meta-networking/recipes-filter/nftables/nftables_0.9.3.bb) | 7 |
2 files changed, 3 insertions, 51 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 deleted file mode 100644 index db2243480d..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ddbe652bf0f4ed300bae9497250130d68e4cbf5b Mon Sep 17 00:00:00 2001 -From: Arturo Borrero Gonzalez <arturo@netfilter.org> -Date: Tue, 10 Dec 2019 12:00:45 +0100 -Subject: py: load the SONAME-versioned shared object - -Instruct the python module to load the SONAME versioned shared object. - -Normal end-user systems may only have available libnftables.so.1.0.0 and not -libnftables.so which is usually only present in developer systems. - -In Debian systems, for example: - - % dpkg -L libnftables1 | grep so.1 - /usr/lib/x86_64-linux-gnu/libnftables.so.1.0.0 - /usr/lib/x86_64-linux-gnu/libnftables.so.1 - - % dpkg -L libnftables-dev | grep so - /usr/lib/x86_64-linux-gnu/libnftables.so - -The "1" is not a magic number, is the SONAME of libnftables in the current -version, as stated in Make_global.am. - -Reported-by: Michael Biebl <biebl@debian.org> -Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org> -Acked-by: Phil Sutter <phil@nwl.cc> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - py/nftables.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py/nftables.py b/py/nftables.py -index 48eb54fe..2a0a1e89 100644 ---- a/py/nftables.py -+++ b/py/nftables.py -@@ -64,7 +64,7 @@ class Nftables: - - validator = None - -- def __init__(self, sofile="libnftables.so"): -+ def __init__(self, sofile="libnftables.so.1"): - """Instantiate a new Nftables class object. - - Accepts a shared object file to open, by default standard search path --- -cgit v1.2.1 - - diff --git a/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb b/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb index 65a7bcc5ff..5b57abb87a 100644 --- a/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb +++ b/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb @@ -9,10 +9,9 @@ DEPENDS = "libmnl libnftnl bison-native \ # Ensure we reject the 0.099 version by matching at least two dots UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ - file://0001-update-python3-nftables-reference.patch" -SRC_URI[md5sum] = "9913b2b46864394d41916b74638e0875" -SRC_URI[sha256sum] = "956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78" +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" +SRC_URI[md5sum] = "fdfd51a1083fb054a487b5159b1ed5cd" +SRC_URI[sha256sum] = "08b8683a9db5fba980bc092b75288af98d218bbe8ab446daf2338570d0730f9a" inherit autotools manpages pkgconfig |