- up to 1.4.12.2

Changed files:
    iptables-1.4.12.1-lm.patch -> 1.2
    iptables.spec -> 1.309
    no-libiptc.patch -> 1.2

diff --git a/iptables-1.4.12.1-lm.patch b/iptables-1.4.12.1-lm.patch
deleted file mode 100644 (file)
index 4d9e1d8..0000000
--- a/iptables-1.4.12.1-lm.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-parent 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (v1.4.12-43-g2ca6273)
-commit d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
-Author: Jan Engelhardt <jengelh@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@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

diff --git a/iptables.spec b/iptables.spec
index 3b084867cbc7096be63957ee207199348170f535..e19f09defbb1a238872455f6759bacc41e51cfd4 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -32,12 +32,12 @@ Summary(ru.UTF-8):  Утилиты для управления пакетными
 Summary(uk.UTF-8):     Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          iptables
-Version:       1.4.12.1
-Release:       2
+Version:       1.4.12.2
+Release:       1
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
-# Source0-md5: b08a1195ec2c1ebeaf072db3c55fdf43
+# Source0-md5: 212112389c7f10c72efb31a4ed193a4c
 Source1:       cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2
 # Source1-md5: 2ed2b452daefe70ededd75dc0061fd07
 Source2:       %{name}.init
@@ -49,7 +49,6 @@ Patch0:               %{name}-man.patch
 # 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
@@ -186,7 +185,7 @@ iptables(8).
 %patch1 -p1
 %endif
 %patch2 -p1
-%patch3 -p1
+
 %{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1}
 %{?with_xt_layer7:%patch11 -p1}
 %{?with_ipt_rpc:%patch12 -p1}
@@ -403,6 +402,8 @@ fi
 %{_includedir}/libipq.h
 %{_includedir}/xtables.h
 %{_includedir}/libiptc
+%{_pkgconfigdir}/libip4tc.pc
+%{_pkgconfigdir}/libip6tc.pc
 %{_pkgconfigdir}/libipq.pc
 %{_pkgconfigdir}/libiptc.pc
 %{_pkgconfigdir}/xtables.pc

diff --git a/no-libiptc.patch b/no-libiptc.patch
index 7f4dc3a7f4d5d13d2af40789508dc79353cb1ca7..c976f2b28126b670301bff1586e9c8fbe014c861 100644 (file)
--- a/no-libiptc.patch
+++ b/no-libiptc.patch
@@ -12,13 +12,4 @@
  libip4tc_la_SOURCES = libip4tc.c
  libip4tc_la_LDFLAGS = -version-info 0:0:0
  libip6tc_la_SOURCES = libip6tc.c
---- iptables-1.4.12/libiptc/libiptc.pc.in.wiget        2011-08-15 20:43:05.416843686 +0200
-+++ iptables-1.4.12/libiptc/libiptc.pc.in      2011-08-15 20:44:35.062684328 +0200
-@@ -7,6 +7,5 @@ includedir=@includedir@
- Name:         libiptc
- Description:  iptables ruleset ADT and kernel interface
- Version:      @PACKAGE_VERSION@
--Libs:         -L${libdir} -liptc
--Libs.private: -lip4tc -lip6tc
-+Libs:         -L${libdir} -lip4tc -lip6tc
- Cflags:               -I${includedir}
+