- updated to 1.4.11.1

- removed obsolete build patch

Changed files:
    iptables-build.patch -> 1.2
    iptables.spec -> 1.301

diff --git a/iptables-build.patch b/iptables-build.patch
deleted file mode 100644 (file)
index 3e62337..0000000
--- a/iptables-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 13e144e..741729b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -96,6 +96,6 @@ config.status: extensions/GNUmakefile.in \
- install-exec-hook:
-       -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi;
-       ${INSTALL} -dm0755 "${DESTDIR}${bindir}";
--      for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/iptables-multi" "${DESTDIR}${bindir}/$$i"; done;
--      for i in ${v4_sbin_links}; do ${LN_S} -f iptables-multi "${DESTDIR}${sbindir}/$$i"; done;
--      for i in ${v6_sbin_links}; do ${LN_S} -f ip6tables-multi "${DESTDIR}${sbindir}/$$i"; done;
-+      for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done;
-+      for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;
-+      for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;

diff --git a/iptables.spec b/iptables.spec
index c09e2d62efc6d6f6d937b2640610acebda405d71..b5f825f6718f0d894b10c19763763a09fb9ad347 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.11
-Release:       2
+Version:       1.4.11.1
+Release:       1
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
-# Source0-md5: 4d77c912d17364e2515fda27d398e15e
+# Source0-md5: 7de6e1ae7ed8a2025f184763a6a24b9a
 Source1:       cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2
 # Source1-md5: 2ed2b452daefe70ededd75dc0061fd07
 Source2:       %{name}.init
@@ -62,7 +62,6 @@ Patch14:      %{name}-1.3.5-owner-xid.patch
 Patch15:       %{name}-owner-struct-size-vs.patch
 # ipt_stealth; currently disabled (broken, see below)
 Patch16:       %{name}-stealth.patch
-Patch17:       %{name}-build.patch
 URL:           http://www.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -192,7 +191,6 @@ iptables(8).
 %endif
 # builds but init() api is broken, see warnings
 #patch16 -p1
-%patch17 -p1
 
 %build
 %{__libtoolize}
@@ -214,11 +212,6 @@ iptables(8).
 sed -i 's:$(HTML_HOWTOS)::g; s:$(PSUS_HOWTOS)::g' iptables-howtos/Makefile
 %endif
 
-# Make a library, needed for OpenVCP
-# unpackaged; is it still valid? --q
-ar rcs libiptables.a *iptables*.o
-ar rcs libip6tables.a *ip6tables*.o
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_includedir},%{_libdir},%{_mandir}/man3}
@@ -368,13 +361,13 @@ fi
 %{?with_ipt_IPV4OPTSSTRIP:%attr(755,root,root) %{_libdir}/xtables/libipt_IPV4OPTSSTRIP.so}
 %{?with_ipt_rpc:%attr(755,root,root) %{_libdir}/xtables/libipt_rpc.so}
 %{?with_xt_layer7:%attr(755,root,root) %{_libdir}/xtables/libxt_layer7.so}
+%{_mandir}/man1/iptables-xml.1*
 %{_mandir}/man8/ip6tables.8*
 %{_mandir}/man8/ip6tables-restore.8*
 %{_mandir}/man8/ip6tables-save.8*
 %{_mandir}/man8/iptables.8*
 %{_mandir}/man8/iptables-restore.8*
 %{_mandir}/man8/iptables-save.8*
-%{_mandir}/man8/iptables-xml.8*
 
 %files libs
 %defattr(644,root,root,755)