From b7f83ca2f719fd0085723e76db72c271736b4d32 Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Mon, 25 Jan 2021 11:14:11 +0100 Subject: nftables: upgrade 0.9.7 -> 0.9.8 Added missing RDEPENDS to the libnft library from nftables-python to libnftable.so.1 which is loaded dynamically by LibraryLoader into python. Added json to default PACKAGECONFIG which is probably used as well when compiled with python support. For example firewalld crashes at runtime if nftables is compiled without json support. Signed-off-by: Adrian Freihofer Signed-off-by: Khem Raj --- .../recipes-filter/nftables/nftables_0.9.7.bb | 31 ---------------------- .../recipes-filter/nftables/nftables_0.9.8.bb | 31 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 meta-networking/recipes-filter/nftables/nftables_0.9.7.bb create mode 100644 meta-networking/recipes-filter/nftables/nftables_0.9.8.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb b/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb deleted file mode 100644 index e5dfef92bd..0000000000 --- a/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" - -DEPENDS = "libmnl libnftnl bison-native \ - ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" - -# Ensure we reject the 0.099 version by matching at least two dots -UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "fe6b8a8c326a2c09c02ca162b840d7d4aadb043ce7a367c166d6455b0e112cb0" - -inherit autotools manpages pkgconfig - -PACKAGECONFIG ??= "python readline" -PACKAGECONFIG[json] = "--with-json, --without-json, jansson" -PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" -PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" -PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" -PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} - -RRECOMMENDS_${PN} += "kernel-module-nf-tables" - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" -RDEPENDS_${PN}-python = "python3-core python3-json" diff --git a/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb b/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb new file mode 100644 index 0000000000..6990ae3aeb --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb @@ -0,0 +1,31 @@ +SUMMARY = "Netfilter Tables userspace utillites" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" + +DEPENDS = "libmnl libnftnl bison-native \ + ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" + +# Ensure we reject the 0.099 version by matching at least two dots +UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" +SRC_URI[sha256sum] = "60fc004656dae4fefc4901c939c9d64120b4dedb49738e420a9a34989f108fe4" + +inherit autotools manpages pkgconfig + +PACKAGECONFIG ??= "python readline json" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" +PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" +PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" +PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} + +RRECOMMENDS_${PN} += "kernel-module-nf-tables" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +RDEPENDS_${PN}-python = "python3-core python3-json ${PN}" -- cgit v1.2.3-54-g00ecf