From 19dd56dbaa67dca49e3a129186d7c43850858700 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Tue, 9 Dec 2014 08:04:13 -0800 Subject: iptables: rename patches to new convention Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/iptables/0001-fix-static-link.patch | 68 ++++++++++++++++++++++ ...ip-6-tables-save.c-remove-dlfcn.h-include.patch | 47 +++++++++++++++ package/iptables/iptables-01-fix-static-link.patch | 68 ---------------------- ...ip-6-tables-save.c-remove-dlfcn.h-include.patch | 47 --------------- 4 files changed, 115 insertions(+), 115 deletions(-) create mode 100644 package/iptables/0001-fix-static-link.patch create mode 100644 package/iptables/0002-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch delete mode 100644 package/iptables/iptables-01-fix-static-link.patch delete mode 100644 package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch (limited to 'package/iptables') diff --git a/package/iptables/0001-fix-static-link.patch b/package/iptables/0001-fix-static-link.patch new file mode 100644 index 0000000000..ce2ea48866 --- /dev/null +++ b/package/iptables/0001-fix-static-link.patch @@ -0,0 +1,68 @@ +From 76e230e41947576efb96e86e605bb84015cdb287 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 13 Aug 2013 19:02:06 +0000 +Subject: iptables: link against libnetfilter_conntrack + +Linking currently fails in --enable-static case: + +../extensions/libext.a(libxt_connlabel.o): In function `connlabel_get_name': +iptables/extensions/libxt_connlabel.c:57: undefined reference to `nfct_labelmap_get_name' +[..] +It's libxtables.la(libxt_connlabel.o) using libnetfilter_conntrack. + +If libnetfilter_conntrack is not found, @libnetfilter_conntrack_CFLAGS@ +and @libnetfilter_conntrack_LIBS@ (and their ${} ones) should be empty, +therefore producing no harm to include unconditionally. + +[Gustavo: update for iptables 1.4.21] +Reported-and-tested-by: Gustavo Zacarias +Signed-off-by: Florian Westphal +--- +diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in +index 14e7c57..780e715 100644 +--- a/extensions/GNUmakefile.in ++++ b/extensions/GNUmakefile.in +@@ -21,7 +21,7 @@ regular_CPPFLAGS = @regular_CPPFLAGS@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} ++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + +@@ -93,7 +93,7 @@ lib%.so: lib%.oo + ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; + + lib%.oo: ${srcdir}/lib%.c +- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<; ++ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; + + libxt_NOTRACK.so: libxt_CT.so + ln -fs $< $@ +@@ -103,9 +103,7 @@ libxt_state.so: libxt_conntrack.so + # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD + xt_RATEEST_LIBADD = -lm + xt_statistic_LIBADD = -lm +-@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ +- +-@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@ ++xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ + + # + # Static bits +diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am +index c5795fe..4267cb5 100644 +--- a/libxtables/Makefile.am ++++ b/libxtables/Makefile.am +@@ -10,7 +10,7 @@ libxtables_la_LIBADD = + if ENABLE_STATIC + # With --enable-static, shipped extensions are linked into the main executable, + # so we need all the LIBADDs here too +-libxtables_la_LIBADD += -lm ++libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS} + endif + if ENABLE_SHARED + libxtables_la_CFLAGS = ${AM_CFLAGS} +-- +cgit v0.9.2 diff --git a/package/iptables/0002-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch b/package/iptables/0002-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch new file mode 100644 index 0000000000..1cdc6c0af2 --- /dev/null +++ b/package/iptables/0002-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch @@ -0,0 +1,47 @@ +From 2efdcf332a40431c6584970bb0c68712d14d409b Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Wed, 27 Nov 2013 10:18:11 -0300 +Subject: [PATCH] iptables/ip(6)tables-save.c: remove dlfcn.h include + +It's not required and breaks on static-only uClibc builds which don't +have the header file. + +Signed-off-by: Gustavo Zacarias +--- + iptables/ip6tables-save.c | 4 ---- + iptables/iptables-save.c | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c +index d819b30..a86a64a 100644 +--- a/iptables/ip6tables-save.c ++++ b/iptables/ip6tables-save.c +@@ -18,10 +18,6 @@ + #include "ip6tables.h" + #include "ip6tables-multi.h" + +-#ifndef NO_SHARED_LIBS +-#include +-#endif +- + static int show_counters = 0; + + static const struct option options[] = { +diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c +index e599fce..2999c7f 100644 +--- a/iptables/iptables-save.c ++++ b/iptables/iptables-save.c +@@ -17,10 +17,6 @@ + #include "iptables.h" + #include "iptables-multi.h" + +-#ifndef NO_SHARED_LIBS +-#include +-#endif +- + static int show_counters = 0; + + static const struct option options[] = { +-- +1.8.3.2 + diff --git a/package/iptables/iptables-01-fix-static-link.patch b/package/iptables/iptables-01-fix-static-link.patch deleted file mode 100644 index ce2ea48866..0000000000 --- a/package/iptables/iptables-01-fix-static-link.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 76e230e41947576efb96e86e605bb84015cdb287 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 13 Aug 2013 19:02:06 +0000 -Subject: iptables: link against libnetfilter_conntrack - -Linking currently fails in --enable-static case: - -../extensions/libext.a(libxt_connlabel.o): In function `connlabel_get_name': -iptables/extensions/libxt_connlabel.c:57: undefined reference to `nfct_labelmap_get_name' -[..] -It's libxtables.la(libxt_connlabel.o) using libnetfilter_conntrack. - -If libnetfilter_conntrack is not found, @libnetfilter_conntrack_CFLAGS@ -and @libnetfilter_conntrack_LIBS@ (and their ${} ones) should be empty, -therefore producing no harm to include unconditionally. - -[Gustavo: update for iptables 1.4.21] -Reported-and-tested-by: Gustavo Zacarias -Signed-off-by: Florian Westphal ---- -diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in -index 14e7c57..780e715 100644 ---- a/extensions/GNUmakefile.in -+++ b/extensions/GNUmakefile.in -@@ -21,7 +21,7 @@ regular_CPPFLAGS = @regular_CPPFLAGS@ - kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ - - AM_CFLAGS = ${regular_CFLAGS} --AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} -+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ - AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ - AM_LDFLAGS = @noundef_LDFLAGS@ - -@@ -93,7 +93,7 @@ lib%.so: lib%.oo - ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; - - lib%.oo: ${srcdir}/lib%.c -- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<; -+ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; - - libxt_NOTRACK.so: libxt_CT.so - ln -fs $< $@ -@@ -103,9 +103,7 @@ libxt_state.so: libxt_conntrack.so - # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD - xt_RATEEST_LIBADD = -lm - xt_statistic_LIBADD = -lm --@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ -- --@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@ -+xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ - - # - # Static bits -diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am -index c5795fe..4267cb5 100644 ---- a/libxtables/Makefile.am -+++ b/libxtables/Makefile.am -@@ -10,7 +10,7 @@ libxtables_la_LIBADD = - if ENABLE_STATIC - # With --enable-static, shipped extensions are linked into the main executable, - # so we need all the LIBADDs here too --libxtables_la_LIBADD += -lm -+libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS} - endif - if ENABLE_SHARED - libxtables_la_CFLAGS = ${AM_CFLAGS} --- -cgit v0.9.2 diff --git a/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch b/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch deleted file mode 100644 index 1cdc6c0af2..0000000000 --- a/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2efdcf332a40431c6584970bb0c68712d14d409b Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 27 Nov 2013 10:18:11 -0300 -Subject: [PATCH] iptables/ip(6)tables-save.c: remove dlfcn.h include - -It's not required and breaks on static-only uClibc builds which don't -have the header file. - -Signed-off-by: Gustavo Zacarias ---- - iptables/ip6tables-save.c | 4 ---- - iptables/iptables-save.c | 4 ---- - 2 files changed, 8 deletions(-) - -diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c -index d819b30..a86a64a 100644 ---- a/iptables/ip6tables-save.c -+++ b/iptables/ip6tables-save.c -@@ -18,10 +18,6 @@ - #include "ip6tables.h" - #include "ip6tables-multi.h" - --#ifndef NO_SHARED_LIBS --#include --#endif -- - static int show_counters = 0; - - static const struct option options[] = { -diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c -index e599fce..2999c7f 100644 ---- a/iptables/iptables-save.c -+++ b/iptables/iptables-save.c -@@ -17,10 +17,6 @@ - #include "iptables.h" - #include "iptables-multi.h" - --#ifndef NO_SHARED_LIBS --#include --#endif -- - static int show_counters = 0; - - static const struct option options[] = { --- -1.8.3.2 - -- cgit v1.2.1