iptables: upgrade to version 1.4.12.1

Change do_configure_prepend() since some m4 file is needed when
doing configuration.

Define correct FILE for iptables and iptables-dbg packages.

License checksum changed (not essential part), and the license is
still GPLv2.

(From OE-Core rev: de034bf830bec1b64260ac8516dd584163716ef4)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 9 insertions, 7 deletions

diff --git a/meta/recipes-extended/iptables/iptables_1.4.9.bb b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
index 7c9fbea1c0..52aa4d52c9 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.9.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
@@ -4,8 +4,8 @@ filtering code in Linux."
 HOMEPAGE = "http://www.netfilter.org/"
 BUGTRACKER = "http://bugzilla.netfilter.org/"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
-                    file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
+                    file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
 
 PR = "r0"
 
@@ -18,12 +18,13 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \
                      kernel-module-nf-conntrack-ipv4 \
                      kernel-module-nf-nat \
                      kernel-module-ipt-masquerade"
-FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug"
+FILES_${PN} =+ "${libdir}/xtables/"
+FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
 
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "db1312f7ce5a4c11dc981a2ac76b26e8"
-SRC_URI[sha256sum] = "1ac719d6265cf64220c80c0974ed9d35febdac2986bb96eeaa9c8c7959a1d306"
+SRC_URI[md5sum] = "b08a1195ec2c1ebeaf072db3c55fdf43"
+SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba"
 
 inherit autotools
 
@@ -31,6 +32,7 @@ EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
                 ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
 
 do_configure_prepend() {
-        # they are all libtool m4 files
-        rm -rf ${S}/m4
+        # Remove some libtool m4 files
+        # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive.
+        rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4
 }