packages: iptables/iptables-owner-struct-size-vs.patch, iptables/iptables.s...

[arekm]

Author: arekm                        Date: Sun Dec 12 12:51:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix owner struct for xt

---- Files affected:
packages/iptables:
   iptables-owner-struct-size-vs.patch (1.2 -> 1.3) , iptables.spec (1.287 -> 1.288) 

---- Diffs:

================================================================
Index: packages/iptables/iptables-owner-struct-size-vs.patch
diff -u packages/iptables/iptables-owner-struct-size-vs.patch:1.2 packages/iptables/iptables-owner-struct-size-vs.patch:1.3
--- packages/iptables/iptables-owner-struct-size-vs.patch:1.2	Mon Jun  7 22:41:25 2010
+++ packages/iptables/iptables-owner-struct-size-vs.patch	Sun Dec 12 13:51:08 2010
@@ -34,3 +34,22 @@
  };
  
  /*
+--- iptables-1.4.10/include/linux/netfilter/xt_owner.h~	2010-10-29 16:37:22.000000000 +0200
++++ iptables-1.4.10/include/linux/netfilter/xt_owner.h	2010-12-12 14:50:24.192495705 +0100
+@@ -7,12 +7,16 @@
+ 	XT_OWNER_UID    = 1 << 0,
+ 	XT_OWNER_GID    = 1 << 1,
+ 	XT_OWNER_SOCKET = 1 << 2,
++	XT_OWNER_NID    = 1 << 3,
++	XT_OWNER_XID    = 1 << 4,
+ };
+ 
+ struct xt_owner_match_info {
+ 	__u32 uid_min, uid_max;
+ 	__u32 gid_min, gid_max;
+ 	__u8 match, invert;
++	__u32 nid;
++	__u32 xid;
+ };
+ 
+ #endif /* _XT_OWNER_MATCH_H */

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.287 packages/iptables/iptables.spec:1.288
--- packages/iptables/iptables.spec:1.287	Sun Dec 12 13:22:45 2010
+++ packages/iptables/iptables.spec	Sun Dec 12 13:51:08 2010
@@ -26,7 +26,7 @@
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		iptables
 Version:	1.4.10
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Admin
 Source0:	ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -414,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.288  2010/12/12 12:51:08  arekm
+- rel 2; fix owner struct for xt
+
 Revision 1.287  2010/12/12 12:22:45  arekm
 - up to 1.4.10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-owner-struct-size-vs.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.287&r2=1.288&f=u