- update some patches

Changed files:
    kernel-layer7.patch -> 1.6
    kernel-pom-ng-mms-conntrack-nat.patch -> 1.5
    kernel-pom-ng-rsh.patch -> 1.4
    kernel-zph.patch -> 1.4

diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index a3358107b434e340667af04254e62e57c805f690..991dd4bf401637d9c8938e6d33ea290d78afdba4 100644 (file)
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -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

diff --git a/kernel-pom-ng-mms-conntrack-nat.patch b/kernel-pom-ng-mms-conntrack-nat.patch
index a99b6981ab645a08a5bad051ce7bd991a833eccd..3729bf5ed8435688a072cf9e8e616b8eda0c4152 100644 (file)
--- a/kernel-pom-ng-mms-conntrack-nat.patch
+++ b/kernel-pom-ng-mms-conntrack-nat.patch
@@ -47,11 +47,13 @@ diff -NurpP --minimal linux-2.6.21.a/include/net/netfilter/nf_conntrack.h linux-
  
  /* 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>

diff --git a/kernel-pom-ng-rsh.patch b/kernel-pom-ng-rsh.patch
index 6460b19418be5d8f92d4768b55ad7e7c14f3eeb1..3478395c343745828ad9bd67dab6cdeef44208f5 100644 (file)
--- a/kernel-pom-ng-rsh.patch
+++ b/kernel-pom-ng-rsh.patch
@@ -9,14 +9,17 @@ diff -NurpP --minimal linux/include/net/netfilter/nf_conntrack.h linux/include/n
  #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

diff --git a/kernel-zph.patch b/kernel-zph.patch
index 54fd8dc6e2847950028c565e6b41ba6588dad69b..a8cd140c4b6e17fe38db57b5f58383b5345362b3 100644 (file)
--- a/kernel-zph.patch
+++ b/kernel-zph.patch
@@ -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 */