Merge lp:~arges/ubuntu/precise/iptables/fix-lp982961 into lp:ubuntu/precise/iptables

[Chris J Arges]

[Bryce Harrington (bryce)]

Looks good

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-09 14:02:08 +0000
+++ debian/changelog	2013-01-31 18:17:27 +0000
@@ -1,3 +1,11 @@
+iptables (1.4.12-1ubuntu5) precise; urgency=low
+
+  * Add debian/patches/0002-libxt_RATEEST-link-with-lm.patch and
+    debian/patches/0003-libxt_statistic-link-with-lm.patch to fix broken
+    RATEEST and statistic modules. (LP: #982961)
+
+ -- Chris J Arges <[e-mail]>  Wed, 30 Jan 2013 08:19:20 -0600
+
 iptables (1.4.12-1ubuntu4) precise; urgency=low
 
   * Update to use reap patch which was accepted upstream in slightly different form.
 
=== added file 'debian/patches/0002-libxt_statistic-link-with-lm.patch'
--- debian/patches/0002-libxt_statistic-link-with-lm.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-libxt_statistic-link-with-lm.patch	2013-01-31 18:17:27 +0000
@@ -0,0 +1,60 @@
+From: Jan Engelhardt <[e-mail]>
+Date: Sat, 3 Sep 2011 11:34:40 +0000 (+0200)
+Subject: libxt_statistic: link with -lm
+X-Git-Tag: v1.4.12.2~14^2~4
+X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
+
+libxt_statistic: link with -lm
+
+$ ldd -r libxt_statistic.so
+undefined symbol: lround        (./libxt_statistic.so)
+
+References: https://bugs.archlinux.org/task/25358
+Signed-off-by: Jan Engelhardt <[e-mail]>
+---
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index 2b48d84..dbf210c 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -90,11 +90,14 @@ init%.o: init%.c
+ #	Shared libraries
+ #
+ lib%.so: lib%.oo
+-	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
++	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD};
+ 
+ lib%.oo: ${srcdir}/lib%.c
+ 	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
+ 
++# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
++xt_statistic_LIBADD = -lm
++
+ 
+ #
+ #	Static bits
+diff --git a/iptables/Makefile.am b/iptables/Makefile.am
+index addb159..f6db32d 100644
+--- a/iptables/Makefile.am
++++ b/iptables/Makefile.am
+@@ -6,12 +6,17 @@ AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
+ lib_LTLIBRARIES       = libxtables.la
+ libxtables_la_SOURCES = xtables.c xtoptions.c
+ libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
++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
++endif
+ if ENABLE_SHARED
+ libxtables_la_CFLAGS  = ${AM_CFLAGS}
+-libxtables_la_LIBADD  = -ldl
++libxtables_la_LIBADD += -ldl
+ else
+ libxtables_la_CFLAGS  = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
+-libxtables_la_LIBADD  =
+ endif
+ 
+ xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
+
 
=== added file 'debian/patches/0003-libxt_RATEEST-link-with-lm.patch'
--- debian/patches/0003-libxt_RATEEST-link-with-lm.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-libxt_RATEEST-link-with-lm.patch	2013-01-31 18:17:27 +0000
@@ -0,0 +1,27 @@
+From: Jan Engelhardt <[e-mail]>
+Date: Sat, 3 Sep 2011 11:35:53 +0000 (+0200)
+Subject: libxt_RATEEST: link with -lm
+X-Git-Tag: v1.4.12.2~14^2~3
+X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=9249ad37b2342eb48009e18f3982362e1018ea5a
+
+libxt_RATEEST: link with -lm
+
+$ ldd -r libxt_RATEEST.so
+undefined symbol: log   (./libxt_RATEEST.so)
+
+Signed-off-by: Jan Engelhardt <[e-mail]>
+---
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index dbf210c..107c9d5 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -96,6 +96,7 @@ lib%.oo: ${srcdir}/lib%.c
+ 	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
+ 
+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
++xt_RATEEST_LIBADD   = -lm
+ xt_statistic_LIBADD = -lm
+ 
+ 
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-09 14:02:08 +0000
+++ debian/patches/series	2013-01-31 18:17:27 +0000
@@ -4,3 +4,5 @@
 0001-Fixed-FTBS-by-copying-linux-types.h-from-linux-3.2.patch
 0001-libxt_recent-Add-support-for-reap-option.patch
 debian-changes-1.4.12-1ubuntu4
+0002-libxt_statistic-link-with-lm.patch
+0003-libxt_RATEEST-link-with-lm.patch