packages: iptables/iptables-20070806.patch, iptables/iptables-old-1.3.7.pat...

arekm arekm at pld-linux.org
Thu May 26 19:30:58 CEST 2011 

Author: arekm                        Date: Thu May 26 17:30:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.11

---- Files affected:
packages/iptables:
   iptables-20070806.patch (1.11 -> 1.12) , iptables-old-1.3.7.patch (1.7 -> 1.8) , iptables-owner-struct-size-vs.patch (1.3 -> 1.4) , iptables-stealth.patch (1.2 -> 1.3) , iptables.spec (1.297 -> 1.298) 

---- Diffs:

================================================================
Index: packages/iptables/iptables-20070806.patch
diff -u packages/iptables/iptables-20070806.patch:1.11 packages/iptables/iptables-20070806.patch:1.12
--- packages/iptables/iptables-20070806.patch:1.11	Tue Oct 12 21:34:08 2010
+++ packages/iptables/iptables-20070806.patch	Thu May 26 19:30:53 2011
@@ -62,8 +62,8 @@
 +	.next		= NULL,
 +	.name		= "IPV4OPTSSTRIP",
 +	.version	= XTABLES_VERSION,
-+	.size		= IPT_ALIGN(0),
-+	.userspacesize	= IPT_ALIGN(0),
++	.size		= XT_ALIGN(0),
++	.userspacesize	= XT_ALIGN(0),
 +	.help		= &help,
 +	.parse		= &parse,
 +	.final_check	= &final_check,

================================================================
Index: packages/iptables/iptables-old-1.3.7.patch
diff -u packages/iptables/iptables-old-1.3.7.patch:1.7 packages/iptables/iptables-old-1.3.7.patch:1.8
--- packages/iptables/iptables-old-1.3.7.patch:1.7	Sun Feb  6 12:53:49 2011
+++ packages/iptables/iptables-old-1.3.7.patch	Thu May 26 19:30:53 2011
@@ -356,8 +356,8 @@
 +	.next		= NULL,
 +	.name		= "rpc",
 +	.version	= XTABLES_VERSION,
-+	.size		= IPT_ALIGN(sizeof(struct ipt_rpc_info)),
-+	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_rpc_info)),
++	.size		= XT_ALIGN(sizeof(struct ipt_rpc_info)),
++	.userspacesize	= XT_ALIGN(sizeof(struct ipt_rpc_info)),
 +	.help		= &help,
 +	.init		= &init,
 +	.parse		= &parse,

================================================================
Index: packages/iptables/iptables-owner-struct-size-vs.patch
diff -u packages/iptables/iptables-owner-struct-size-vs.patch:1.3 packages/iptables/iptables-owner-struct-size-vs.patch:1.4
--- packages/iptables/iptables-owner-struct-size-vs.patch:1.3	Sun Dec 12 13:51:08 2010
+++ packages/iptables/iptables-owner-struct-size-vs.patch	Thu May 26 19:30:53 2011
@@ -19,18 +19,18 @@
 @@ -38,6 +42,8 @@
  	pid_t sid;
  	char comm[16];
- 	u_int8_t match, invert;	/* flags */
-+	u_int32_t nid;
-+	u_int32_t xid;
+ 	uint8_t match, invert;	/* flags */
++	uint32_t nid;
++	uint32_t xid;
  };
  
  struct ip6t_owner_info {
 @@ -47,6 +53,8 @@
  	pid_t sid;
  	char comm[16];
- 	u_int8_t match, invert;	/* flags */
-+	u_int32_t nid;
-+	u_int32_t xid;
+ 	uint8_t match, invert;	/* flags */
++	uint32_t nid;
++	uint32_t xid;
  };
  
  /*

================================================================
Index: packages/iptables/iptables-stealth.patch
diff -u packages/iptables/iptables-stealth.patch:1.2 packages/iptables/iptables-stealth.patch:1.3
--- packages/iptables/iptables-stealth.patch:1.2	Mon Aug 30 22:55:03 2010
+++ packages/iptables/iptables-stealth.patch	Thu May 26 19:30:53 2011
@@ -49,8 +49,8 @@
 +	.next		= NULL,
 +	.name		= "stealth",
 +	.version	= XTABLES_VERSION,
-+	.size		= IPT_ALIGN(0),
-+	.userspacesize	= IPT_ALIGN(0),
++	.size		= XT_ALIGN(0),
++	.userspacesize	= XT_ALIGN(0),
 +	.help		= &help,
 +	.init		= &init, 
 +	.parse		= &parse,

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.297 packages/iptables/iptables.spec:1.298
--- packages/iptables/iptables.spec:1.297	Fri Mar 18 22:10:28 2011
+++ packages/iptables/iptables.spec	Thu May 26 19:30:53 2011
@@ -33,12 +33,12 @@
 Summary(uk.UTF-8):	Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		iptables
-Version:	1.4.10
-Release:	5
+Version:	1.4.11
+Release:	1
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
-# Source0-md5:	f382fe693f0b59d87bd47bea65eca198
+# Source0-md5:	4d77c912d17364e2515fda27d398e15e
 Source1:	cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2
 # Source1-md5:	2ed2b452daefe70ededd75dc0061fd07
 Source2:	%{name}.init
@@ -63,7 +63,6 @@
 Patch15:	%{name}-owner-struct-size-vs.patch
 # ipt_stealth; currently disabled (broken, see below)
 Patch16:	%{name}-stealth.patch
-Patch17:	%{name}-TPROXY-IPv6.patch
 URL:		http://www.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -192,7 +191,6 @@
 %endif
 # builds but init() api is broken, see warnings
 #patch16 -p1
-%patch17 -p1
 
 %build
 %{__libtoolize}
@@ -216,8 +214,8 @@
 
 # Make a library, needed for OpenVCP
 # unpackaged; is it still valid? --q
-ar rcs libiptables.a iptables*.o
-ar rcs libip6tables.a ip6tables*.o
+ar rcs libiptables.a *iptables*.o
+ar rcs libip6tables.a *ip6tables*.o
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -253,11 +251,9 @@
 %{?with_doc:%doc iptables-howtos/{NAT,networking-concepts,packet-filtering}-HOWTO*}
 %attr(755,root,root) %{_bindir}/iptables-xml
 %attr(755,root,root) %{_sbindir}/iptables
-%attr(755,root,root) %{_sbindir}/iptables-multi
 %attr(755,root,root) %{_sbindir}/iptables-restore
 %attr(755,root,root) %{_sbindir}/iptables-save
 %attr(755,root,root) %{_sbindir}/ip6tables
-%attr(755,root,root) %{_sbindir}/ip6tables-multi
 %attr(755,root,root) %{_sbindir}/ip6tables-restore
 %attr(755,root,root) %{_sbindir}/ip6tables-save
 %if %{with batch}
@@ -265,6 +261,7 @@
 %attr(755,root,root) %{_sbindir}/ip6tables-batch
 %endif
 %attr(755,root,root) %{_sbindir}/nfnl_osf
+%attr(755,root,root) %{_sbindir}/xtables-multi
 %{_datadir}/xtables
 %dir %{_libdir}/xtables
 %attr(755,root,root) %{_libdir}/xtables/libip6t_HL.so
@@ -302,6 +299,7 @@
 #%attr(755,root,root) %{_libdir}/xtables/libipt_stealth.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_ttl.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_unclean.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_AUDIT.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_CHECKSUM.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_CLASSIFY.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_CONNMARK.so
@@ -332,6 +330,7 @@
 %attr(755,root,root) %{_libdir}/xtables/libxt_conntrack.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_cpu.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_dccp.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_devgroup.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_dscp.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_esp.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_hashlimit.so
@@ -386,7 +385,7 @@
 %attr(755,root,root) %{_libdir}/libiptc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libiptc.so.0
 %attr(755,root,root) %{_libdir}/libxtables.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxtables.so.5
+%attr(755,root,root) %ghost %{_libdir}/libxtables.so.6
 
 %files devel
 %defattr(644,root,root,755)
@@ -430,6 +429,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.298  2011/05/26 17:30:53  arekm
+- up to 1.4.11
+
 Revision 1.297  2011/03/18 21:10:28  baggins
 - rel 5
 - add support for IPv6 TPROXY (inlcuded in 2.6.37)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-20070806.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-old-1.3.7.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-owner-struct-size-vs.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-stealth.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.297&r2=1.298&f=u

More information about the pld-cvs-commit mailing list