[kernel] r17999 - in dists/squeeze-security/linux-2.6/debian/patches/features/all: openvz vserver

[Dann Frazier]

Author: dannf
Date: Thu Aug 25 02:39:36 2011
New Revision: 17999

Log:
tweak feature patches to apply on top of CVE-2011-3188 fix

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
   dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Aug 25 01:39:55 2011	(r17998)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Aug 25 02:39:36 2011	(r17999)
@@ -85811,9 +85811,9 @@
 index 7cda24b..e360965 100644
 --- a/net/ipv4/tcp_ipv4.c
 +++ b/net/ipv4/tcp_ipv4.c
-@@ -72,6 +72,8 @@
- #include <net/xfrm.h>
+@@ -73,6 +73,8 @@
  #include <net/netdma.h>
+ #include <net/secure_seq.h>
  
 +#include <bc/tcp.h>
 +
@@ -87810,9 +87810,9 @@
 index 21d100b..1c534b7 100644
 --- a/net/ipv6/tcp_ipv6.c
 +++ b/net/ipv6/tcp_ipv6.c
-@@ -61,6 +61,8 @@
- #include <net/netdma.h>
+@@ -62,6 +62,8 @@
  #include <net/inet_common.h>
+ #include <net/secure_seq.h>
  
 +#include <bc/tcp.h>
 +

Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch	Thu Aug 25 01:39:55 2011	(r17998)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch	Thu Aug 25 02:39:36 2011	(r17999)
@@ -27558,10 +27558,10 @@
 diff -urpN a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
 --- a/net/ipv4/inet_hashtables.c	2009-12-02 20:51:21.000000000 -0700
 +++ b/net/ipv4/inet_hashtables.c	2010-11-07 19:33:33.076795114 -0700
-@@ -21,6 +21,7 @@
- 
+@@ -22,6 +22,7 @@
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
 +#include <net/route.h>
  #include <net/ip.h>