From d70f34fdddaf9bb6da47359487fe7f9bea7a9ac9 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Sat, 21 Jan 2012 22:27:32 +0800 Subject: iptables: upgrade to 1.4.12.2 This patch is to upgrade iptables to 1.4.12.2, and introduce a patch not to check unknown symbols. Otherwise, when it is compiled, it will report "libxtables.so.7" from LD_PRELOAD cannot be preloaded. (From OE-Core rev: 27ed7024cf2ee9c9f84246fd931bc390cb638851) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- .../iptables/iptables/GNUmakefile.patch | 18 ++++++++++ .../recipes-extended/iptables/iptables_1.4.12.1.bb | 38 --------------------- .../recipes-extended/iptables/iptables_1.4.12.2.bb | 39 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-extended/iptables/iptables/GNUmakefile.patch delete mode 100644 meta/recipes-extended/iptables/iptables_1.4.12.1.bb create mode 100644 meta/recipes-extended/iptables/iptables_1.4.12.2.bb (limited to 'meta/recipes-extended/iptables') diff --git a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch new file mode 100644 index 0000000000..c60e84f0a2 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch @@ -0,0 +1,18 @@ +Don't check unknown symbols. + +Signed-off-by: Shane Wang + +Upstream-Status: Inappropriate [configuration] + +diff -r abb89394ce0c extensions/GNUmakefile.in +--- a/extensions/GNUmakefile.in Mon Jan 23 00:12:27 2012 +0800 ++++ b/extensions/GNUmakefile.in Mon Jan 23 00:38:32 2012 +0800 +@@ -68,7 +68,7 @@ + + .PHONY: all install clean distclean FORCE + +-all: ${targets} check ++all: ${targets} + + check: ${targets} + @echo " CHECK unknown symbols in .so files"; \ diff --git a/meta/recipes-extended/iptables/iptables_1.4.12.1.bb b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb deleted file mode 100644 index 52aa4d52c9..0000000000 --- a/meta/recipes-extended/iptables/iptables_1.4.12.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Tools for managing kernel packaet filtering capabilities" -DESCRIPTION = "iptables is the userspace command line program used to configure and control network packet \ -filtering code in Linux." -HOMEPAGE = "http://www.netfilter.org/" -BUGTRACKER = "http://bugzilla.netfilter.org/" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" - -PR = "r0" - -RRECOMMENDS_${PN} = "kernel-module-x-tables \ - kernel-module-ip-tables \ - kernel-module-iptable-filter \ - kernel-module-iptable-nat \ - kernel-module-nf-defrag-ipv4 \ - kernel-module-nf-conntrack \ - kernel-module-nf-conntrack-ipv4 \ - kernel-module-nf-nat \ - kernel-module-ipt-masquerade" -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] = "b08a1195ec2c1ebeaf072db3c55fdf43" -SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba" - -inherit autotools - -EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" - -do_configure_prepend() { - # 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 -} diff --git a/meta/recipes-extended/iptables/iptables_1.4.12.2.bb b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb new file mode 100644 index 0000000000..2d3d3113bb --- /dev/null +++ b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Tools for managing kernel packaet filtering capabilities" +DESCRIPTION = "iptables is the userspace command line program used to configure and control network packet \ +filtering code in Linux." +HOMEPAGE = "http://www.netfilter.org/" +BUGTRACKER = "http://bugzilla.netfilter.org/" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ + file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" + +PR = "r0" + +RRECOMMENDS_${PN} = "kernel-module-x-tables \ + kernel-module-ip-tables \ + kernel-module-iptable-filter \ + kernel-module-iptable-nat \ + kernel-module-nf-defrag-ipv4 \ + kernel-module-nf-conntrack \ + kernel-module-nf-conntrack-ipv4 \ + kernel-module-nf-nat \ + kernel-module-ipt-masquerade" +FILES_${PN} =+ "${libdir}/xtables/" +FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" + +SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ + file://GNUmakefile.patch" + +SRC_URI[md5sum] = "212112389c7f10c72efb31a4ed193a4c" +SRC_URI[sha256sum] = "09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13" + +inherit autotools + +EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" + +do_configure_prepend() { + # 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 +} -- cgit v1.2.3-54-g00ecf