summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch44
-rw-r--r--meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch86
-rw-r--r--meta/recipes-extended/iptables/iptables_1.4.17.bb (renamed from meta/recipes-extended/iptables/iptables_1.4.16.3.bb)9
3 files changed, 135 insertions, 4 deletions
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
new file mode 100644
index 0000000000..4cd919de19
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch
@@ -0,0 +1,44 @@
1From 0a43f156e23edf616859ac5a8c90e41ccc5cb1cd Mon Sep 17 00:00:00 2001
2From: Cristian Iorga <cristian.iorga@intel.com>
3Date: Wed, 16 Jan 2013 20:14:43 +0200
4Subject: [PATCH] extensions: fix iptables extensions build error
5 in cross-compilation environments
6
7libtool is properly declared and used for cross-platform
8build environments
9
10Upstream-Status: Pending
11
12Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
13---
14 extensions/GNUmakefile.in | 5 +++--
15 1 file changed, 3 insertions(+), 2 deletions(-)
16
17diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
18index adad4d6..befb1fb 100644
19--- a/extensions/GNUmakefile.in
20+++ b/extensions/GNUmakefile.in
21@@ -13,6 +13,7 @@ xtlibdir = @xtlibdir@
22
23 CC = @CC@
24 CCLD = ${CC}
25+LIBTOOL = @LIBTOOL@
26 CFLAGS = @CFLAGS@
27 CPPFLAGS = @CPPFLAGS@
28 LDFLAGS = @LDFLAGS@
29@@ -94,10 +95,10 @@ lib%.so: lib%.la
30 ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
31
32 lib%.la: lib%.lo
33- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
34+ ${AM_VERBOSE_CCLD} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
35
36 lib%.lo: ${srcdir}/lib%.c
37- ${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 $<
38+ ${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 $<
39
40 libxt_NOTRACK.so: libxt_CT.so
41 ${AM_VERBOSE_GEN} ln -fs $< $@
42--
431.7.10.4
44
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
new file mode 100644
index 0000000000..aa8efd6384
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/fix-link-failure-ip6t-NETMAP.patch
@@ -0,0 +1,86 @@
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.16.3.bb b/meta/recipes-extended/iptables/iptables_1.4.17.bb
index 448748b5b2..f8ef7b6552 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.16.3.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.17.bb
@@ -22,10 +22,11 @@ FILES_${PN} =+ "${libdir}/xtables/ ${datadir}/xtables"
22FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" 22FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
23 23
24SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ 24SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
25 file://types.h-add-defines-that-are-required-for-if_packet.patch" 25 file://types.h-add-defines-that-are-required-for-if_packet.patch \
26 26 file://fix-link-failure-ip6t-NETMAP.patch \
27SRC_URI[md5sum] = "6dd40c12fb8f4c4312a0f8434369fbcd" 27 file://fix-iptables-extensions-build-error.patch"
28SRC_URI[sha256sum] = "643ccf34099d53d5b839e1d889c05627745a51ec122648e76a9fcec3a8a9ec79" 28SRC_URI[md5sum] = "c3fb2ffd5b39d0d54b06ccc4c8660116"
29SRC_URI[sha256sum] = "51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925"
29 30
30inherit autotools 31inherit autotools
31 32