iptables: fix invalid symbolic link for ip6tables-apply
PATCH 1/1 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.
Also add bash as runtime dependency to fix QA error:
ERROR: iptables-1.8.5-r0 do_package_qa: QA Issue:/usr/sbin/iptables-apply contained in package iptables requires /bin/bash, but no providers found in RDEPENDS_iptables? [file-rdeps]
--- ...iptables-apply-not-getting-installed.patch | 45 +++++++++++++++++++ .../iptables/iptables_1.8.5.bb | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) 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 +2 -1
@@ -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 \
@@ -77,7 +78,7 @@ python populate_packages_prepend() { d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) } -RDEPENDS_${PN} = "${PN}-module-xt-standard" +RDEPENDS_${PN} = "${PN}-module-xt-standard bash" RRECOMMENDS_${PN} = " \ ${PN}-modules \ kernel-module-x-tables \
Signature · 1 line
2.17.1
Quoted 100 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Yi Zhao
Sent: den 15 juni 2020 03:35
To: [email protected]
Subject: [OE-core] [PATCH] iptables: fix invalid symbolic link for ip6tables-applyThe 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 directoryBackport a patch to fix the issue.
Also add bash as runtime dependency to fix QA error:ERROR: iptables-1.8.5-r0
do_package_qa: QA Issue:/usr/sbin/iptables-applycontained in package iptables requires/bin/bash, but no providers found inRDEPENDS_iptables? [file-rdeps]Signed-off-by Yi Zhao <[email protected]>--- ...iptables-apply-not-getting-installed.patch | 45 +++++++++++++++++++ .../iptables/iptables_1.8.5.bb | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch
(quoted diff) +0
-0iptables-apply-not-getting-installed.patch b/meta/recipes- extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting- installed.patch
new file mode 100644
index 0000000000..51ed66ed24meta/recipes-extended/iptables/iptables/0001-build-resolve- new file +0
-0iptables-apply-not-getting-installed.patch
meta/recipes-extended/iptables/iptables/0001-build-resolve- 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 \
meta/recipes-extended/iptables/iptables_1.8.5.bb python populate_packages_prepend() { · line 81
Quoted 5 lines
meta/recipes-extended/iptables/iptables_1.8.5.bb +1
-1@@ -77,7 +78,7 @@ python populate_packages_prepend() { d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) } -RDEPENDS_${PN} = "${PN}-module-xt-standard" +RDEPENDS_${PN} = "${PN}-module-xt-standard bash"
We do not want iptables to depend on bash. Either modify the iptables-apply script so that it does not require bash, or move it (and the ip6tables-apply link) to a separate package (e.g., iptables-apply), which can then depend on bash.
Quoted 5 lines
meta/recipes-extended/iptables/iptables_1.8.5.bb +0
-1RRECOMMENDS_${PN} = " \ ${PN}-modules \ kernel-module-x-tables \ --2.17.1
//Peter
Quoted 103 lines · Peter Kjellerstedt
Quoted 103 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Yi Zhao
Sent: den 15 juni 2020 03:35
To: [email protected]
Subject: [OE-core] [PATCH] iptables: fix invalid symbolic link for ip6tables-applyThe 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 directoryBackport a patch to fix the issue.
Also add bash as runtime dependency to fix QA error:ERROR: iptables-1.8.5-r0
do_package_qa: QA Issue:/usr/sbin/iptables-applycontained in package iptables requires/bin/bash, but no providers found inRDEPENDS_iptables? [file-rdeps]Signed-off-by Yi Zhao <[email protected]>--- ...iptables-apply-not-getting-installed.patch | 45 +++++++++++++++++++ .../iptables/iptables_1.8.5.bb | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-)create mode 100644 meta/recipes-extended/iptables/iptables/0001-build-
resolve-iptables-apply-not-getting-installed.patch(quoted diff) +0
-0iptables-apply-not-getting-installed.patch b/meta/recipes- extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting- installed.patch
new file mode 100644
index 0000000000..51ed66ed24meta/recipes-extended/iptables/iptables/0001-build-resolve- new file +0
-0iptables-apply-not-getting-installed.patch
meta/recipes-extended/iptables/iptables/0001-build-resolve- 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 \@@ -77,7 +78,7 @@ python populate_packages_prepend() { d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) }
Quoted 6 lines
meta/recipes-extended/iptables/iptables_1.8.5.bb python populate_packages_prepend() { · line 81
Quoted 2 lines
meta/recipes-extended/iptables/iptables_1.8.5.bb +1
-1-RDEPENDS_${PN} = "${PN}-module-xt-standard" +RDEPENDS_${PN} = "${PN}-module-xt-standard bash"We do not want iptables to depend on bash. Either modify the iptables-apply script so that it does not require bash, or move it (and the ip6tables-apply link) to a separate package (e.g., iptables-apply), which can then depend on bash.
Thanks, Peter. I will send V2.
//Yi
Quoted 8 lines
Quoted 6 lines
meta/recipes-extended/iptables/iptables_1.8.5.bb +0
-1RRECOMMENDS_${PN} = " \ ${PN}-modules \ kernel-module-x-tables \ --2.17.1
//Peter