summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-05-07 12:35:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-12 09:37:28 +0100
commitea65bb430a920cc39bbcd64b789f23d376d3a8a2 (patch)
treeaba6019d9733233f6e9cc99f0561c23f0ea1e4fd
parent37c284c16b90d07b362cb6b605ea392f6829f7e6 (diff)
downloadpoky-ea65bb430a920cc39bbcd64b789f23d376d3a8a2.tar.gz
iptables: upgrade to 1.4.18
fix-link-failure-ip6t-NETMAP.patch removed; already included in upstream. (From OE-Core rev: f5f2959391721a98d4259421650d90ccf475b025) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch86
-rw-r--r--meta/recipes-extended/iptables/iptables_1.4.18.bb (renamed from meta/recipes-extended/iptables/iptables_1.4.17.bb)8
2 files changed, 3 insertions, 91 deletions
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 @@
1From 68e77a26111ee6b8f10c735a76891a7de6d57ee6 Mon Sep 17 00:00:00 2001
2From: Jan Engelhardt <jengelh@inai.de>
3Date: Tue, 1 Jan 2013 22:47:51 +0000
4Subject: [PATCH] build: resolve link failure for ip6t_NETMAP
5
6Link stage of libip6t_NETMAP failed since recently.
7
8 CCLD libip6t_NETMAP.so
9/usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld:
10cannot find -lip6tc
11
12libip6t_NETMAP.c uses the "ipv6_prefix_length" function from
13libip6tc.so; "-lip6tc" is used in the Makefile, but, the directory to
14it is not specified.
15
16Why does the link succeed for some people? Because
17/usr/lib(64)/libip6tc.so satisfies -lip6tc, but not all environments,
18especially those without iptables development files, have that file,
19hence this link error can happen.
20
21By suggestion of Mike Frysinger, this patch uses libtool to produce
22and link the plugins.
23
24Upstream-Status: Backport
25
26Signed-off-by: Jan Engelhardt <jengelh@inai.de>
27Acked-by: Mike Frysinger <vapier@gentoo.org>
28Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
29---
30 extensions/GNUmakefile.in | 20 ++++++++++++--------
31 1 files changed, 12 insertions(+), 8 deletions(-)
32
33diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
34index e71e3ff..adad4d6 100644
35--- a/extensions/GNUmakefile.in
36+++ b/extensions/GNUmakefile.in
37@@ -33,6 +33,7 @@ AM_VERBOSE_CXX = @echo " CXX " $@;
38 AM_VERBOSE_CXXLD = @echo " CXXLD " $@;
39 AM_VERBOSE_AR = @echo " AR " $@;
40 AM_VERBOSE_GEN = @echo " GEN " $@;
41+AM_VERBOSE_NULL = @
42 endif
43
44 #
45@@ -75,7 +76,7 @@ install: ${targets_install}
46 if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
47
48 clean:
49- rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
50+ rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
51 rm -f .*.d .*.dd;
52
53 distclean: clean
54@@ -89,19 +90,22 @@ init%.o: init%.c
55 #
56 # Shared libraries
57 #
58-lib%.so: lib%.oo
59- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
60+lib%.so: lib%.la
61+ ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
62
63-lib%.oo: ${srcdir}/lib%.c
64- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
65+lib%.la: lib%.lo
66+ ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
67+
68+lib%.lo: ${srcdir}/lib%.c
69+ ${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 $<
70
71 libxt_NOTRACK.so: libxt_CT.so
72- ln -fs $< $@
73+ ${AM_VERBOSE_GEN} ln -fs $< $@
74 libxt_state.so: libxt_conntrack.so
75- ln -fs $< $@
76+ ${AM_VERBOSE_GEN} ln -fs $< $@
77
78 # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
79-ip6t_NETMAP_LIBADD = -lip6tc
80+ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la
81 xt_RATEEST_LIBADD = -lm
82 xt_statistic_LIBADD = -lm
83
84--
851.7.2.5
86
diff --git a/meta/recipes-extended/iptables/iptables_1.4.17.bb b/meta/recipes-extended/iptables/iptables_1.4.18.bb
index aa932ce67a..bb8718f3b1 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.17.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.18.bb
@@ -7,8 +7,6 @@ LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
8 file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc" 8 file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc"
9 9
10PR = "r1"
11
12RRECOMMENDS_${PN} = "kernel-module-x-tables \ 10RRECOMMENDS_${PN} = "kernel-module-x-tables \
13 kernel-module-ip-tables \ 11 kernel-module-ip-tables \
14 kernel-module-iptable-filter \ 12 kernel-module-iptable-filter \
@@ -23,12 +21,12 @@ FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
23 21
24SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ 22SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
25 file://types.h-add-defines-that-are-required-for-if_packet.patch \ 23 file://types.h-add-defines-that-are-required-for-if_packet.patch \
26 file://fix-link-failure-ip6t-NETMAP.patch \
27 file://fix-iptables-extensions-build-error.patch \ 24 file://fix-iptables-extensions-build-error.patch \
28 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ 25 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
29 " 26 "
30SRC_URI[md5sum] = "c3fb2ffd5b39d0d54b06ccc4c8660116" 27
31SRC_URI[sha256sum] = "51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925" 28SRC_URI[md5sum] = "a819199d5ec013b82da13a8ffbba857e"
29SRC_URI[sha256sum] = "14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c"
32 30
33inherit autotools 31inherit autotools
34 32