packages: iptables/iptables.spec, iptables/iptables-build.patch (NEW) - rel...

[arekm]

Author: arekm                        Date: Mon May 30 09:08:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; iptables and ip6tables symlinks were pointing to nowhere; fixed

---- Files affected:
packages/iptables:
   iptables.spec (1.299 -> 1.300) , iptables-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.299 packages/iptables/iptables.spec:1.300
--- packages/iptables/iptables.spec:1.299	Thu May 26 20:42:17 2011
+++ packages/iptables/iptables.spec	Mon May 30 11:08:19 2011
@@ -34,7 +34,7 @@
 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
@@ -63,6 +63,7 @@
 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,6 +193,7 @@
 %endif
 # builds but init() api is broken, see warnings
 #patch16 -p1
+%patch17 -p1
 
 %build
 %{__libtoolize}
@@ -430,6 +432,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.300  2011/05/30 09:08:19  arekm
+- rel 2; iptables and ip6tables symlinks were pointing to nowhere; fixed
+
 Revision 1.299  2011/05/26 18:42:17  qboosh
 - texlive BR note
 

================================================================
Index: packages/iptables/iptables-build.patch
diff -u /dev/null packages/iptables/iptables-build.patch:1.1
--- /dev/null	Mon May 30 11:08:24 2011
+++ packages/iptables/iptables-build.patch	Mon May 30 11:08:19 2011
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.299&r2=1.300&f=u