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
debian/changelog (+8/-0)
debian/patches/9007-libxt_statistic-link-with-lm.patch (+60/-0)
debian/patches/9008-libxt_RATEEST-link-with-lm.patch (+27/-0)
debian/patches/series (+2/-0)
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-17 17:10:24 +0000
+++ debian/changelog 2013-01-31 18:17:28 +0000
@@ -1,3 +1,11 @@
1iptables (1.4.12-2ubuntu3) quantal; urgency=low
2
3 * Add debian/patches/0002-libxt_RATEEST-link-with-lm.patch and
4 debian/patches/0003-libxt_statistic-link-with-lm.patch to fix broken
5 RATEEST and statistic modules. (LP: #982961)
6
7 -- Chris J Arges <chris.j.arges@canonical.com> Wed, 30 Jan 2013 09:27:30 -0600
8
1iptables (1.4.12-2ubuntu2) quantal; urgency=low9iptables (1.4.12-2ubuntu2) quantal; urgency=low
210
3 * debian/patches/9006-lp1042260-fix-add-inverted-physdev.patch: add back11 * debian/patches/9006-lp1042260-fix-add-inverted-physdev.patch: add back
412
=== added file 'debian/patches/9007-libxt_statistic-link-with-lm.patch'
--- debian/patches/9007-libxt_statistic-link-with-lm.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/9007-libxt_statistic-link-with-lm.patch 2013-01-31 18:17:28 +0000
@@ -0,0 +1,60 @@
1From: Jan Engelhardt <jengelh@medozas.de>
2Date: Sat, 3 Sep 2011 11:34:40 +0000 (+0200)
3Subject: libxt_statistic: link with -lm
4X-Git-Tag: v1.4.12.2~14^2~4
5X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
6
7libxt_statistic: link with -lm
8
9$ ldd -r libxt_statistic.so
10undefined symbol: lround (./libxt_statistic.so)
11
12References: https://bugs.archlinux.org/task/25358
13Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
14---
15
16diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
17index 2b48d84..dbf210c 100644
18--- a/extensions/GNUmakefile.in
19+++ b/extensions/GNUmakefile.in
20@@ -90,11 +90,14 @@ init%.o: init%.c
21 # Shared libraries
22 #
23 lib%.so: lib%.oo
24- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
25+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD};
26
27 lib%.oo: ${srcdir}/lib%.c
28 ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
29
30+# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
31+xt_statistic_LIBADD = -lm
32+
33
34 #
35 # Static bits
36diff --git a/iptables/Makefile.am b/iptables/Makefile.am
37index addb159..f6db32d 100644
38--- a/iptables/Makefile.am
39+++ b/iptables/Makefile.am
40@@ -6,12 +6,17 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
41 lib_LTLIBRARIES = libxtables.la
42 libxtables_la_SOURCES = xtables.c xtoptions.c
43 libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
44+libxtables_la_LIBADD =
45+if ENABLE_STATIC
46+# With --enable-static, shipped extensions are linked into the main executable,
47+# so we need all the LIBADDs here too
48+libxtables_la_LIBADD += -lm
49+endif
50 if ENABLE_SHARED
51 libxtables_la_CFLAGS = ${AM_CFLAGS}
52-libxtables_la_LIBADD = -ldl
53+libxtables_la_LIBADD += -ldl
54 else
55 libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
56-libxtables_la_LIBADD =
57 endif
58
59 xtables_multi_SOURCES = xtables-multi.c iptables-xml.c
60
061
=== added file 'debian/patches/9008-libxt_RATEEST-link-with-lm.patch'
--- debian/patches/9008-libxt_RATEEST-link-with-lm.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/9008-libxt_RATEEST-link-with-lm.patch 2013-01-31 18:17:28 +0000
@@ -0,0 +1,27 @@
1From: Jan Engelhardt <jengelh@medozas.de>
2Date: Sat, 3 Sep 2011 11:35:53 +0000 (+0200)
3Subject: libxt_RATEEST: link with -lm
4X-Git-Tag: v1.4.12.2~14^2~3
5X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=9249ad37b2342eb48009e18f3982362e1018ea5a
6
7libxt_RATEEST: link with -lm
8
9$ ldd -r libxt_RATEEST.so
10undefined symbol: log (./libxt_RATEEST.so)
11
12Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
13---
14
15diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
16index dbf210c..107c9d5 100644
17--- a/extensions/GNUmakefile.in
18+++ b/extensions/GNUmakefile.in
19@@ -96,6 +96,7 @@ lib%.oo: ${srcdir}/lib%.c
20 ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
21
22 # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
23+xt_RATEEST_LIBADD = -lm
24 xt_statistic_LIBADD = -lm
25
26
27
028
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-09-17 17:10:24 +0000
+++ debian/patches/series 2013-01-31 18:17:28 +0000
@@ -6,3 +6,5 @@
69004-argv-is-null.patch69004-argv-is-null.patch
79005-lp1027252-fixrestore.patch79005-lp1027252-fixrestore.patch
89006-lp1042260-fix-inverted-physdev.patch89006-lp1042260-fix-inverted-physdev.patch
99007-libxt_statistic-link-with-lm.patch
109008-libxt_RATEEST-link-with-lm.patch

Subscribers

People subscribed via source and target branches

to all changes: