From 63680c8e15d464e285f048b34b072c826d9f5371 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 23 Aug 2023 09:34:22 +0800 Subject: nftables: upgrade 1.0.7 -> 1.0.8 Changelog: https://netfilter.org/projects/nftables/files/changes-nftables-1.0.8.txt Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../recipes-filter/nftables/nftables_1.0.7.bb | 80 ---------------------- .../recipes-filter/nftables/nftables_1.0.8.bb | 80 ++++++++++++++++++++++ 2 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 meta-networking/recipes-filter/nftables/nftables_1.0.7.bb create mode 100644 meta-networking/recipes-filter/nftables/nftables_1.0.8.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb deleted file mode 100644 index 8380bbd73d..0000000000 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -SECTION = "net" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62" - -DEPENDS = "libmnl libnftnl bison-native \ - ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ - file://run-ptest \ - " -SRC_URI[sha256sum] = "c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412" - -inherit autotools manpages pkgconfig ptest - -PACKAGECONFIG ?= "python readline json" -PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" -PACKAGECONFIG[json] = "--with-json, --without-json, jansson" -PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" -PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" -PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = ",, python3-setuptools-native" -PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" -PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" - -# Disable the python via autoconf so we can build it separately via setuptools3 -EXTRA_OECONF = "--disable-python \ - ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" - -SETUPTOOLS_SETUP_PATH = "${S}/py" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} - -RRECOMMENDS:${PN} += "kernel-module-nf-tables" - -PACKAGES =+ "${PN}-python" -FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" - -# Explicitly define do_configure, do_compile and do_install because both autotools and setuptools3 -# have EXPORT_FUNCTIONS do_configure do_compile do_install -do_configure() { - autotools_do_configure - if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_configure - fi -} - -do_compile() { - autotools_do_compile - if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_compile - fi -} - -do_install() { - autotools_do_install - if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_install - fi -} - -RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" - -TESTDIR = "tests" - -PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" - -do_install_ptest() { - cp -rf ${S}/build-aux ${D}${PTEST_PATH} - cp -rf ${S}/src ${D}${PTEST_PATH} - mkdir -p ${D}${PTEST_PATH}/src/.libs - cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs - cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ - cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} - sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py - sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py - # handle multilib - sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest -} diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.8.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.8.bb new file mode 100644 index 0000000000..00fe483bbd --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.8.bb @@ -0,0 +1,80 @@ +SUMMARY = "Netfilter Tables userspace utillites" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62" + +DEPENDS = "libmnl libnftnl bison-native \ + ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ + file://run-ptest \ + " +SRC_URI[sha256sum] = "9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50" + +inherit autotools manpages pkgconfig ptest + +PACKAGECONFIG ?= "python readline json" +PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" +PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" +PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" +PACKAGECONFIG[python] = ",, python3-setuptools-native" +PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +# Disable the python via autoconf so we can build it separately via setuptools3 +EXTRA_OECONF = "--disable-python \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" + +SETUPTOOLS_SETUP_PATH = "${S}/py" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} + +RRECOMMENDS:${PN} += "kernel-module-nf-tables" + +PACKAGES =+ "${PN}-python" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" + +# Explicitly define do_configure, do_compile and do_install because both autotools and setuptools3 +# have EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + autotools_do_configure + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_configure + fi +} + +do_compile() { + autotools_do_compile + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_compile + fi +} + +do_install() { + autotools_do_install + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_install + fi +} + +RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" + +TESTDIR = "tests" + +PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" + +do_install_ptest() { + cp -rf ${S}/build-aux ${D}${PTEST_PATH} + cp -rf ${S}/src ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} + sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py + sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} -- cgit v1.2.3-54-g00ecf