diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-11-02 17:48:48 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-03 08:20:42 +0000 |
| commit | d81f9f3ed497241d6ac93d3c756eb55747eb07a0 (patch) | |
| tree | 2157150fc1028d99bc33a996788a54fe73e02e6e /meta/recipes-extended/iptables | |
| parent | 9fcdf7b7c3236a92f417c5c4969440fcc3f7ac01 (diff) | |
| download | openembedded-core-contrib-d81f9f3ed497241d6ac93d3c756eb55747eb07a0.tar.gz | |
iptables: upgrade 1.8.5 -> 1.8.6
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables')
| -rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-extended/iptables/iptables_1.8.6.bb (renamed from meta/recipes-extended/iptables/iptables_1.8.5.bb) | 5 |
2 files changed, 2 insertions, 48 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 deleted file mode 100644 index 51ed66ed24..0000000000 --- a/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/meta/recipes-extended/iptables/iptables_1.8.5.bb b/meta/recipes-extended/iptables/iptables_1.8.6.bb index 5976128807..9c15b0bc9d 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.5.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.6.bb @@ -11,13 +11,12 @@ 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[sha256sum] = "d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309" + " +SRC_URI[sha256sum] = "a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ |