packages: iptables/iptables.spec, iptables/iptables-1.4.12.1-lm.patch (NEW)...
gotar
gotar at pld-linux.org
Sat Nov 26 12:48:14 CET 2011
Author: gotar Date: Sat Nov 26 11:48:14 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- upstream fix for xt_statistic, restored C: xtables-addons < 1.25 (arekm!), rel. 2
---- Files affected:
packages/iptables:
iptables.spec (1.307 -> 1.308) , iptables-1.4.12.1-lm.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.307 packages/iptables/iptables.spec:1.308
--- packages/iptables/iptables.spec:1.307 Tue Oct 4 22:02:54 2011
+++ packages/iptables/iptables.spec Sat Nov 26 12:48:09 2011
@@ -34,7 +34,7 @@
Summary(zh_CN.UTF-8): Linux内核包过滤管理工具
Name: iptables
Version: 1.4.12.1
-Release: 1
+Release: 2
License: GPL v2
Group: Networking/Admin
Source0: ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -50,6 +50,7 @@
# additional utils; off by default
Patch1: %{name}-batch.patch
Patch2: no-libiptc.patch
+Patch3: %{name}-%{version}-lm.patch
# --- ADDITIONAL/CHANGED EXTENSIONS:
# just ipt_IPV4OPTSSTRIP now
Patch10: %{name}-20070806.patch
@@ -94,7 +95,7 @@
Obsoletes: ipchains
Obsoletes: iptables24-compat
Obsoletes: netfilter
-Conflicts: xtables-addons < 1.14
+Conflicts: xtables-addons < 1.25
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -186,6 +187,7 @@
%patch1 -p1
%endif
%patch2 -p1
+%patch3 -p1
%{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1}
%{?with_xt_layer7:%patch11 -p1}
%{?with_ipt_rpc:%patch12 -p1}
@@ -430,6 +432,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.308 2011/11/26 11:48:09 gotar
+- upstream fix for xt_statistic, restored C: xtables-addons < 1.25 (arekm!), rel. 2
+
Revision 1.307 2011/10/04 20:02:54 sls
- BR: texlive-fonts-jknappen
================================================================
Index: packages/iptables/iptables-1.4.12.1-lm.patch
diff -u /dev/null packages/iptables/iptables-1.4.12.1-lm.patch:1.1
--- /dev/null Sat Nov 26 12:48:14 2011
+++ packages/iptables/iptables-1.4.12.1-lm.patch Sat Nov 26 12:48:09 2011
@@ -0,0 +1,61 @@
+parent 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (v1.4.12-43-g2ca6273)
+commit d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
+Author: Jan Engelhardt <jengelh at medozas.de>
+Date: Sat Sep 3 13:34:40 2011 +0200
+
+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 <jengelh at medozas.de>
+---
+ extensions/GNUmakefile.in | 5 ++++-
+ iptables/Makefile.am | 9 +++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.307&r2=1.308&f=u
More information about the pld-cvs-commit
mailing list