- rel 2; iptables and ip6tables symlinks were pointing to nowhere; fixed

Changed files:
    iptables-build.patch -> 1.1
    iptables.spec -> 1.300

diff --git a/iptables-build.patch b/iptables-build.patch
new file mode 100644 (file)
index 0000000..3e62337
--- /dev/null
+++ b/iptables-build.patch
@@ -0,0 +1,14 @@
+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 02e914447607cdecd85375a8d4d57362ea86a112..c09e2d62efc6d6f6d937b2640610acebda405d71 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -33,7 +33,7 @@ Summary(uk.UTF-8):    Утиліти для керування пакетними 
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          iptables
 Version:       1.4.11
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -62,6 +62,7 @@ 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
@@ -191,6 +192,7 @@ iptables(8).
 %endif
 # builds but init() api is broken, see warnings
 #patch16 -p1
+%patch17 -p1
 
 %build
 %{__libtoolize}