From 02971543527e993b60132ddb101a9093efa3f324 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 5 Jun 2013 15:47:15 +0300 Subject: iptables: upgrade to 1.4.19.1 fix-iptables-extensions-build-error.patch no longer needed. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../fix-iptables-extensions-build-error.patch | 44 -------------------- meta/recipes-extended/iptables/iptables_1.4.18.bb | 47 ---------------------- .../recipes-extended/iptables/iptables_1.4.19.1.bb | 46 +++++++++++++++++++++ 3 files changed, 46 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch delete mode 100644 meta/recipes-extended/iptables/iptables_1.4.18.bb create mode 100644 meta/recipes-extended/iptables/iptables_1.4.19.1.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch b/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch deleted file mode 100644 index 4cd919de19..0000000000 --- a/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0a43f156e23edf616859ac5a8c90e41ccc5cb1cd Mon Sep 17 00:00:00 2001 -From: Cristian Iorga -Date: Wed, 16 Jan 2013 20:14:43 +0200 -Subject: [PATCH] extensions: fix iptables extensions build error - in cross-compilation environments - -libtool is properly declared and used for cross-platform -build environments - -Upstream-Status: Pending - -Signed-off-by: Cristian Iorga ---- - extensions/GNUmakefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in -index adad4d6..befb1fb 100644 ---- a/extensions/GNUmakefile.in -+++ b/extensions/GNUmakefile.in -@@ -13,6 +13,7 @@ xtlibdir = @xtlibdir@ - - CC = @CC@ - CCLD = ${CC} -+LIBTOOL = @LIBTOOL@ - CFLAGS = @CFLAGS@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ -@@ -94,10 +95,10 @@ lib%.so: lib%.la - ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@ - - lib%.la: lib%.lo -- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir} -+ ${AM_VERBOSE_CCLD} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir} - - lib%.lo: ${srcdir}/lib%.c -- ${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $< -+ ${AM_VERBOSE_CC} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $< - - libxt_NOTRACK.so: libxt_CT.so - ${AM_VERBOSE_GEN} ln -fs $< $@ --- -1.7.10.4 - diff --git a/meta/recipes-extended/iptables/iptables_1.4.18.bb b/meta/recipes-extended/iptables/iptables_1.4.18.bb deleted file mode 100644 index bb8718f3b1..0000000000 --- a/meta/recipes-extended/iptables/iptables_1.4.18.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Tools for managing kernel packet 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;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc" - -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/ ${datadir}/xtables" -FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" - -SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ - file://types.h-add-defines-that-are-required-for-if_packet.patch \ - file://fix-iptables-extensions-build-error.patch \ - file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ - " - -SRC_URI[md5sum] = "a819199d5ec013b82da13a8ffbba857e" -SRC_URI[sha256sum] = "14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c" - -inherit autotools - -EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ - " -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ - " - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# libnfnetlink recipe is in meta-networking layer -PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink" - -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.19.1.bb b/meta/recipes-extended/iptables/iptables_1.4.19.1.bb new file mode 100644 index 0000000000..a98ad4c0bb --- /dev/null +++ b/meta/recipes-extended/iptables/iptables_1.4.19.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "Tools for managing kernel packet 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;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc" + +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/ ${datadir}/xtables" +FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" + +SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ + file://types.h-add-defines-that-are-required-for-if_packet.patch \ + file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ + " + +SRC_URI[md5sum] = "be97ce9007fa42c867901b496c935a0a" +SRC_URI[sha256sum] = "dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2" + +inherit autotools + +EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ + " +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ + " + +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# libnfnetlink recipe is in meta-networking layer +PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink" + +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