summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch45
-rw-r--r--meta/recipes-extended/iptables/iptables_1.8.5.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-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..51ed66ed24
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch
@@ -0,0 +1,45 @@
1From d4ed0c741fc789bb09d977d74d30875fdd50d08b Mon Sep 17 00:00:00 2001
2From: Jan Engelhardt <jengelh@inai.de>
3Date: Wed, 3 Jun 2020 15:38:48 +0200
4Subject: [PATCH] build: resolve iptables-apply not getting installed
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9ip6tables-apply gets installed but iptables-apply does not.
10That is wrong.
11
12» make install DESTDIR=$PWD/r
13» find r -name "*app*"
14r/usr/local/sbin/ip6tables-apply
15r/usr/local/share/man/man8/iptables-apply.8
16r/usr/local/share/man/man8/ip6tables-apply.8
17
18Fixes: v1.8.5~87
19Signed-off-by: Jan Engelhardt <jengelh@inai.de>
20Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
21
22Upstream-Status: Backport
23[https://git.netfilter.org/iptables/commit/?id=d4ed0c741fc789bb09d977d74d30875fdd50d08b]
24
25Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
26---
27 iptables/Makefile.am | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/iptables/Makefile.am b/iptables/Makefile.am
31index dc66b3cc..2024dbf5 100644
32--- a/iptables/Makefile.am
33+++ b/iptables/Makefile.am
34@@ -56,7 +56,7 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
35 ip6tables-save.8 iptables-extensions.8 \
36 iptables-apply.8 ip6tables-apply.8
37
38-sbin_SCRIPT = iptables-apply
39+sbin_SCRIPTS = iptables-apply
40
41 if ENABLE_NFTABLES
42 man_MANS += xtables-nft.8 xtables-translate.8 xtables-legacy.8 \
43--
442.17.1
45
diff --git a/meta/recipes-extended/iptables/iptables_1.8.5.bb b/meta/recipes-extended/iptables/iptables_1.8.5.bb
index fa1e5c229d..8664a9751a 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.5.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.5.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ 11SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
12 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ 12 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
13 file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ 13 file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \
14 file://0001-build-resolve-iptables-apply-not-getting-installed.patch \
14 file://iptables.service \ 15 file://iptables.service \
15 file://iptables.rules \ 16 file://iptables.rules \
16 file://ip6tables.service \ 17 file://ip6tables.service \