Ubuntu

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

Proposed by Chris J Arges on 2013-01-31
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~arges/ubuntu/quantal/iptables/fix-lp982961
Merge into: lp:ubuntu/quantal/iptables
Diff against target: 122 lines (+97/-0) 4 files modified
To merge this branch: bzr merge lp:~arges/ubuntu/quantal/iptables/fix-lp982961
Reviewer Review Type Date Requested Status
Bryce Harrington Approve on 2013-01-31
Ubuntu branches 2013-01-31 Pending
Review via email: mp+145942@code.launchpad.net
To post a comment you must log in.
Bryce Harrington (bryce) wrote :

Looks good

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-17 17:10:24 +0000
3+++ debian/changelog 2013-01-31 18:17:28 +0000
4@@ -1,3 +1,11 @@
5+iptables (1.4.12-2ubuntu3) quantal; urgency=low
6+
7+ * Add debian/patches/0002-libxt_RATEEST-link-with-lm.patch and
8+ debian/patches/0003-libxt_statistic-link-with-lm.patch to fix broken
9+ RATEEST and statistic modules. (LP: #982961)
10+
11+ -- Chris J Arges <chris.j.arges@canonical.com> Wed, 30 Jan 2013 09:27:30 -0600
12+
13 iptables (1.4.12-2ubuntu2) quantal; urgency=low
14
15 * debian/patches/9006-lp1042260-fix-add-inverted-physdev.patch: add back
16
17=== added file 'debian/patches/9007-libxt_statistic-link-with-lm.patch'
18--- debian/patches/9007-libxt_statistic-link-with-lm.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/9007-libxt_statistic-link-with-lm.patch 2013-01-31 18:17:28 +0000
20@@ -0,0 +1,60 @@
21+From: Jan Engelhardt <jengelh@medozas.de>
22+Date: Sat, 3 Sep 2011 11:34:40 +0000 (+0200)
23+Subject: libxt_statistic: link with -lm
24+X-Git-Tag: v1.4.12.2~14^2~4
25+X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
26+
27+libxt_statistic: link with -lm
28+
29+$ ldd -r libxt_statistic.so
30+undefined symbol: lround (./libxt_statistic.so)
31+
32+References: https://bugs.archlinux.org/task/25358
33+Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
34+---
35+
36+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
37+index 2b48d84..dbf210c 100644
38+--- a/extensions/GNUmakefile.in
39++++ b/extensions/GNUmakefile.in
40+@@ -90,11 +90,14 @@ init%.o: init%.c
41+ # Shared libraries
42+ #
43+ lib%.so: lib%.oo
44+- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
45++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD};
46+
47+ lib%.oo: ${srcdir}/lib%.c
48+ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
49+
50++# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
51++xt_statistic_LIBADD = -lm
52++
53+
54+ #
55+ # Static bits
56+diff --git a/iptables/Makefile.am b/iptables/Makefile.am
57+index addb159..f6db32d 100644
58+--- a/iptables/Makefile.am
59++++ b/iptables/Makefile.am
60+@@ -6,12 +6,17 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
61+ lib_LTLIBRARIES = libxtables.la
62+ libxtables_la_SOURCES = xtables.c xtoptions.c
63+ libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
64++libxtables_la_LIBADD =
65++if ENABLE_STATIC
66++# With --enable-static, shipped extensions are linked into the main executable,
67++# so we need all the LIBADDs here too
68++libxtables_la_LIBADD += -lm
69++endif
70+ if ENABLE_SHARED
71+ libxtables_la_CFLAGS = ${AM_CFLAGS}
72+-libxtables_la_LIBADD = -ldl
73++libxtables_la_LIBADD += -ldl
74+ else
75+ libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
76+-libxtables_la_LIBADD =
77+ endif
78+
79+ xtables_multi_SOURCES = xtables-multi.c iptables-xml.c
80+
81
82=== added file 'debian/patches/9008-libxt_RATEEST-link-with-lm.patch'
83--- debian/patches/9008-libxt_RATEEST-link-with-lm.patch 1970-01-01 00:00:00 +0000
84+++ debian/patches/9008-libxt_RATEEST-link-with-lm.patch 2013-01-31 18:17:28 +0000
85@@ -0,0 +1,27 @@
86+From: Jan Engelhardt <jengelh@medozas.de>
87+Date: Sat, 3 Sep 2011 11:35:53 +0000 (+0200)
88+Subject: libxt_RATEEST: link with -lm
89+X-Git-Tag: v1.4.12.2~14^2~3
90+X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=9249ad37b2342eb48009e18f3982362e1018ea5a
91+
92+libxt_RATEEST: link with -lm
93+
94+$ ldd -r libxt_RATEEST.so
95+undefined symbol: log (./libxt_RATEEST.so)
96+
97+Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
98+---
99+
100+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
101+index dbf210c..107c9d5 100644
102+--- a/extensions/GNUmakefile.in
103++++ b/extensions/GNUmakefile.in
104+@@ -96,6 +96,7 @@ lib%.oo: ${srcdir}/lib%.c
105+ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
106+
107+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
108++xt_RATEEST_LIBADD = -lm
109+ xt_statistic_LIBADD = -lm
110+
111+
112+
113
114=== modified file 'debian/patches/series'
115--- debian/patches/series 2012-09-17 17:10:24 +0000
116+++ debian/patches/series 2013-01-31 18:17:28 +0000
117@@ -6,3 +6,5 @@
118 9004-argv-is-null.patch
119 9005-lp1027252-fixrestore.patch
120 9006-lp1042260-fix-inverted-physdev.patch
121+9007-libxt_statistic-link-with-lm.patch
122+9008-libxt_RATEEST-link-with-lm.patch

Subscribers

People subscribed via source and target branches

to all changes: