From f5f2959391721a98d4259421650d90ccf475b025 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Tue, 7 May 2013 12:35:24 +0300 Subject: iptables: upgrade to 1.4.18 fix-link-failure-ip6t-NETMAP.patch removed; already included in upstream. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../iptables/fix-link-failure-ip6t-NETMAP.patch | 86 ---------------------- meta/recipes-extended/iptables/iptables_1.4.17.bb | 49 ------------ meta/recipes-extended/iptables/iptables_1.4.18.bb | 47 ++++++++++++ 3 files changed, 47 insertions(+), 135 deletions(-) delete mode 100644 meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch delete mode 100644 meta/recipes-extended/iptables/iptables_1.4.17.bb create mode 100644 meta/recipes-extended/iptables/iptables_1.4.18.bb (limited to 'meta/recipes-extended/iptables') diff --git a/meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch b/meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch deleted file mode 100644 index aa8efd6384..0000000000 --- a/meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 68e77a26111ee6b8f10c735a76891a7de6d57ee6 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 1 Jan 2013 22:47:51 +0000 -Subject: [PATCH] build: resolve link failure for ip6t_NETMAP - -Link stage of libip6t_NETMAP failed since recently. - - CCLD libip6t_NETMAP.so -/usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld: -cannot find -lip6tc - -libip6t_NETMAP.c uses the "ipv6_prefix_length" function from -libip6tc.so; "-lip6tc" is used in the Makefile, but, the directory to -it is not specified. - -Why does the link succeed for some people? Because -/usr/lib(64)/libip6tc.so satisfies -lip6tc, but not all environments, -especially those without iptables development files, have that file, -hence this link error can happen. - -By suggestion of Mike Frysinger, this patch uses libtool to produce -and link the plugins. - -Upstream-Status: Backport - -Signed-off-by: Jan Engelhardt -Acked-by: Mike Frysinger -Signed-off-by: Pablo Neira Ayuso ---- - extensions/GNUmakefile.in | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in -index e71e3ff..adad4d6 100644 ---- a/extensions/GNUmakefile.in -+++ b/extensions/GNUmakefile.in -@@ -33,6 +33,7 @@ AM_VERBOSE_CXX = @echo " CXX " $@; - AM_VERBOSE_CXXLD = @echo " CXXLD " $@; - AM_VERBOSE_AR = @echo " AR " $@; - AM_VERBOSE_GEN = @echo " GEN " $@; -+AM_VERBOSE_NULL = @ - endif - - # -@@ -75,7 +76,7 @@ install: ${targets_install} - if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi; - - clean: -- rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c; -+ rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c; - rm -f .*.d .*.dd; - - distclean: clean -@@ -89,19 +90,22 @@ init%.o: init%.c - # - # Shared libraries - # --lib%.so: lib%.oo -- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; -+lib%.so: lib%.la -+ ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@ - --lib%.oo: ${srcdir}/lib%.c -- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; -+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} -+ -+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 $< - - libxt_NOTRACK.so: libxt_CT.so -- ln -fs $< $@ -+ ${AM_VERBOSE_GEN} ln -fs $< $@ - libxt_state.so: libxt_conntrack.so -- ln -fs $< $@ -+ ${AM_VERBOSE_GEN} ln -fs $< $@ - - # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD --ip6t_NETMAP_LIBADD = -lip6tc -+ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la - xt_RATEEST_LIBADD = -lm - xt_statistic_LIBADD = -lm - --- -1.7.2.5 - diff --git a/meta/recipes-extended/iptables/iptables_1.4.17.bb b/meta/recipes-extended/iptables/iptables_1.4.17.bb deleted file mode 100644 index aa932ce67a..0000000000 --- a/meta/recipes-extended/iptables/iptables_1.4.17.bb +++ /dev/null @@ -1,49 +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" - -PR = "r1" - -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-link-failure-ip6t-NETMAP.patch \ - file://fix-iptables-extensions-build-error.patch \ - file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ - " -SRC_URI[md5sum] = "c3fb2ffd5b39d0d54b06ccc4c8660116" -SRC_URI[sha256sum] = "51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925" - -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.18.bb b/meta/recipes-extended/iptables/iptables_1.4.18.bb new file mode 100644 index 0000000000..bb8718f3b1 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables_1.4.18.bb @@ -0,0 +1,47 @@ +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 +} -- cgit 1.2.3-korg