diff options
Diffstat (limited to 'poky/meta/recipes-extended/iptables')
-rw-r--r-- | poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch | 45 | ||||
-rw-r--r-- | poky/meta/recipes-extended/iptables/iptables_1.8.5.bb (renamed from poky/meta/recipes-extended/iptables/iptables_1.8.4.bb) | 9 |
2 files changed, 51 insertions, 3 deletions
diff --git a/poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch b/poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch new file mode 100644 index 000000000..51ed66ed2 --- /dev/null +++ b/poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch @@ -0,0 +1,45 @@ +From d4ed0c741fc789bb09d977d74d30875fdd50d08b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jengelh@inai.de> +Date: Wed, 3 Jun 2020 15:38:48 +0200 +Subject: [PATCH] build: resolve iptables-apply not getting installed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ip6tables-apply gets installed but iptables-apply does not. +That is wrong. + +» make install DESTDIR=$PWD/r +» find r -name "*app*" +r/usr/local/sbin/ip6tables-apply +r/usr/local/share/man/man8/iptables-apply.8 +r/usr/local/share/man/man8/ip6tables-apply.8 + +Fixes: v1.8.5~87 +Signed-off-by: Jan Engelhardt <jengelh@inai.de> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> + +Upstream-Status: Backport +[https://git.netfilter.org/iptables/commit/?id=d4ed0c741fc789bb09d977d74d30875fdd50d08b] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + iptables/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptables/Makefile.am b/iptables/Makefile.am +index dc66b3cc..2024dbf5 100644 +--- a/iptables/Makefile.am ++++ b/iptables/Makefile.am +@@ -56,7 +56,7 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ + ip6tables-save.8 iptables-extensions.8 \ + iptables-apply.8 ip6tables-apply.8 + +-sbin_SCRIPT = iptables-apply ++sbin_SCRIPTS = iptables-apply + + if ENABLE_NFTABLES + man_MANS += xtables-nft.8 xtables-translate.8 xtables-legacy.8 \ +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/iptables/iptables_1.8.4.bb b/poky/meta/recipes-extended/iptables/iptables_1.8.5.bb index cf1388ce9..597612880 100644 --- a/poky/meta/recipes-extended/iptables/iptables_1.8.4.bb +++ b/poky/meta/recipes-extended/iptables/iptables_1.8.5.bb @@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ + file://0001-build-resolve-iptables-apply-not-getting-installed.patch \ file://iptables.service \ file://iptables.rules \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[md5sum] = "9b201107957fbf62709c3d8226239b0d" -SRC_URI[sha256sum] = "993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c" +SRC_URI[sha256sum] = "d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ @@ -68,7 +68,7 @@ do_install_append() { fi } -PACKAGES += "${PN}-modules" +PACKAGES =+ "${PN}-modules ${PN}-apply" PACKAGES_DYNAMIC += "^${PN}-module-.*" python populate_packages_prepend() { @@ -98,6 +98,9 @@ RRECOMMENDS_${PN} = " \ FILES_${PN} += "${datadir}/xtables" +FILES_${PN}-apply = "${sbindir}/ip*-apply" +RDEPENDS_${PN}-apply = "${PN} bash" + # Include the symlinks as well in respective packages FILES_${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" FILES_${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" |