packages: kernel/kernel-layer7.patch, kernel/kernel-pom-ng-mms-conntrack-na...

[arekm]

Author: arekm                        Date: Thu May 19 15:15:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update some patches

---- Files affected:
packages/kernel:
   kernel-layer7.patch (1.5 -> 1.6) , kernel-pom-ng-mms-conntrack-nat.patch (1.4 -> 1.5) , kernel-pom-ng-rsh.patch (1.3 -> 1.4) , kernel-zph.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-layer7.patch
diff -u packages/kernel/kernel-layer7.patch:1.5 packages/kernel/kernel-layer7.patch:1.6
--- packages/kernel/kernel-layer7.patch:1.5	Tue Apr  5 18:12:16 2011
+++ packages/kernel/kernel-layer7.patch	Thu May 19 17:15:35 2011
@@ -2082,7 +2082,7 @@
 --- linux-2.6.28-stock/include/net/netfilter/nf_conntrack.h	2009-01-07 16:05:30.000000000 -0600
 +++ linux-2.6.28/include/net/netfilter/nf_conntrack.h	2009-01-07 16:07:31.000000000 -0600
 @@ -118,6 +118,22 @@ struct nf_conn
- 	u_int32_t secmark;
+ 	struct net *ct_net;
  #endif
  
 +#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
@@ -2101,7 +2101,7 @@
 +	} layer7;
 +#endif
 +
- 	/* Storage reserved for other modules: */
+ 	/* Storage reserved for other modules, must be the last member */
  	union nf_conntrack_proto proto;
  
 --- linux-2.6.28-stock/include/linux/netfilter/xt_layer7.h	1969-12-31 18:00:00.000000000 -0600

================================================================
Index: packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch
diff -u packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.4 packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.5
--- packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.4	Wed Jan  5 22:48:56 2011
+++ packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch	Thu May 19 17:15:35 2011
@@ -47,11 +47,13 @@
  
  /* per conntrack: application helper private data */
  union nf_conntrack_help {
-@@ -54,6 +55,7 @@ union nf_conntrack_help {
- 	struct nf_ct_h323_master ct_h323_info;
- 	struct nf_ct_sane_master ct_sane_info;
+@@ -69,6 +69,9 @@
+ #if defined(CONFIG_NF_CONNTRACK_SIP) || defined(CONFIG_NF_CONNTRACK_SIP_MODULE)
  	struct nf_ct_sip_master ct_sip_info;
+ #endif
++#if defined(CONFIG_NF_NAT_MMS) || defined(CONFIG_NF_NAT_MMS_MODULE)
 +	struct nf_ct_mms_master ct_mms_info;
++#endif
  };
  
  #include <linux/types.h>

================================================================
Index: packages/kernel/kernel-pom-ng-rsh.patch
diff -u packages/kernel/kernel-pom-ng-rsh.patch:1.3 packages/kernel/kernel-pom-ng-rsh.patch:1.4
--- packages/kernel/kernel-pom-ng-rsh.patch:1.3	Wed Jan  5 22:48:56 2011
+++ packages/kernel/kernel-pom-ng-rsh.patch	Thu May 19 17:15:35 2011
@@ -9,14 +9,17 @@
  #include <linux/netfilter/nf_conntrack_ftp.h>
  #include <linux/netfilter/nf_conntrack_pptp.h>
  #include <linux/netfilter/nf_conntrack_h323.h>
-@@ -39,6 +40,7 @@ union nf_conntrack_expect_proto {
- /* per conntrack: application helper private data */
- union nf_conntrack_help {
- 	/* insert conntrack helper private data (master) here */
+@@ -73,6 +73,10 @@
+ #if defined(CONFIG_NF_NAT_MMS) || defined(CONFIG_NF_NAT_MMS_MODULE)
+ 	struct nf_ct_mms_master ct_mms_info;
+ #endif
++#if defined(CONFIG_NF_CONNTRACK_RSH) || defined(CONFIG_NF_CONNTRACK_RSH_MODULE)
 +	struct nf_ct_rsh_master ct_rsh_info;
- 	struct nf_ct_ftp_master ct_ftp_info;
- 	struct nf_ct_pptp_master ct_pptp_info;
- 	struct nf_ct_h323_master ct_h323_info;
++#endif
++
+ };
+ 
+ #include <linux/types.h>
 diff -NurpP --minimal linux/include/linux/netfilter/nf_conntrack_rsh.h linux/include/linux/netfilter/nf_conntrack_rsh.h
 --- linux/include/linux/netfilter/nf_conntrack_rsh.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux/include/linux/netfilter/nf_conntrack_rsh.h	2007-05-30 11:58:41.000000000 +0200

================================================================
Index: packages/kernel/kernel-zph.patch
diff -u packages/kernel/kernel-zph.patch:1.3 packages/kernel/kernel-zph.patch:1.4
--- packages/kernel/kernel-zph.patch:1.3	Thu Feb 25 11:09:47 2010
+++ packages/kernel/kernel-zph.patch	Thu May 19 17:15:35 2011
@@ -1,11 +1,11 @@
 diff -Nur linux-2.6.26.3/include/net/inet_sock.h linux-2.6.26.3-zph/include/net/inet_sock.h
 --- linux-2.6.26.3/include/net/inet_sock.h	2008-08-20 21:11:37.000000000 +0300
 +++ linux-2.6.26.3-zph/include/net/inet_sock.h	2008-08-21 16:51:59.000000000 +0300
-@@ -141,6 +141,7 @@
- 		__be32			addr;
- 		struct flowi		fl;
- 	} cork;
-+	__u16                    zph_tos;        /* ZPH TOS received on connect */ 
+@@ -157,6 +157,7 @@
+ 	__be32			mc_addr;
+ 	struct ip_mc_socklist __rcu	*mc_list;
+ 	struct inet_cork	cork;
++	__u16			zph_tos;	/* ZPH TOS received on connect */
  };
  
  #define IPCORK_OPT	1	/* ip-options has been held in ipcork.opt */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-layer7.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-rsh.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-zph.patch?r1=1.3&r2=1.4&f=u