iptables: fix invalid symbolic link for ip6tables-apply
PATCH v2 1/2 iptables: fix invalid symbolic link for ip6tables-apply
The iptables-apply is not installed which makes ip6tables-apply as an invalid symbolic link:
$ ls -l /usr/sbin/ip6tables-apply lrwxrwxrwx 1 root root 14 Jun 11 08:27 /usr/sbin/ip6tables-apply -> iptables-apply $ ls -l /usr/sbin/iptables-apply ls: cannot access '/usr/sbin/iptables-apply': No such file or directory
Backport a patch to fix the issue.
Signed-off-by Yi Zhao <[email protected]>
--- ...iptables-apply-not-getting-installed.patch | 45 +++++++++++++++++++ .../iptables/iptables_1.8.5.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch
meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch new file +45 -0
@@ -0,0 +1,45 @@ +From d4ed0c741fc789bb09d977d74d30875fdd50d08b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <[email protected]> +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 <[email protected]> +Signed-off-by: Pablo Neira Ayuso <[email protected]> + +Upstream-Status: Backport +[https://git.netfilter.org/iptables/commit/?id=d4ed0c741fc789bb09d977d74d30875fdd50d08b] + +Signed-off-by: Yi Zhao <[email protected]> +--- + 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 +
meta/recipes-extended/iptables/iptables_1.8.5.bb +1 -0
@@ -11,6 +11,7 @@ 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 \
Signature · 1 line
2.17.1
PATCH 2/2 iptables: split iptables-apply to its own package
We do not want iptables to depend on bash. So move iptables-apply/ip6tables-apply to a separate package.
Signed-off-by Yi Zhao <[email protected]>
--- meta/recipes-extended/iptables/iptables_1.8.5.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/iptables/iptables_1.8.5.bb +4 -1
@@ -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"
Signature · 1 line
2.17.1