packages (LINUX_2_6_30): kernel/kernel-vserver-2.3.patch, kernel/kernel.spe...

[arekm]

Author: arekm                        Date: Thu Sep 10 12:07:20 2009 GMT
Module: packages                      Tag: LINUX_2_6_30
---- Log message:
- up to 2.6.30.6

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.16 -> 1.16.2.1) , kernel.spec (1.699 -> 1.699.2.1) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.16 packages/kernel/kernel-vserver-2.3.patch:1.16.2.1
--- packages/kernel/kernel-vserver-2.3.patch:1.16	Sat Aug 22 19:26:06 2009
+++ packages/kernel/kernel-vserver-2.3.patch	Thu Sep 10 14:07:14 2009
@@ -24590,18 +24590,6 @@
 +	0;
 +}
 +
-diff -NurpP --minimal linux-2.6.30.5/Makefile linux-2.6.30.5-vs2.3.0.36.14-pre7/Makefile
---- linux-2.6.30.5/Makefile	2009-08-17 16:37:28.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/Makefile	2009-08-22 18:56:40.000000000 +0200
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 30
--EXTRAVERSION = .5
-+EXTRAVERSION = .5-vs2.3.0.36.14-pre7
- NAME = Man-Eating Seals of Antiquity
- 
- # *DOCUMENTATION*
 diff -NurpP --minimal linux-2.6.30.5/mm/filemap_xip.c linux-2.6.30.5-vs2.3.0.36.14-pre7/mm/filemap_xip.c
 --- linux-2.6.30.5/mm/filemap_xip.c	2009-06-11 17:13:27.000000000 +0200
 +++ linux-2.6.30.5-vs2.3.0.36.14-pre7/mm/filemap_xip.c	2009-07-04 01:11:39.000000000 +0200
@@ -26281,24 +26269,13 @@
  	addr_type = ipv6_addr_type(&addr->sin6_addr);
  	if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
  		return -EINVAL;
-@@ -289,13 +300,20 @@ int inet6_bind(struct socket *sock, stru
- 		/* Reproduce AF_INET checks to make the bindings consitant */
- 		v4addr = addr->sin6_addr.s6_addr32[3];
- 		chk_addr_ret = inet_addr_type(net, v4addr);
-+
- 		if (!sysctl_ip_nonlocal_bind &&
- 		    !(inet->freebind || inet->transparent) &&
- 		    v4addr != htonl(INADDR_ANY) &&
- 		    chk_addr_ret != RTN_LOCAL &&
- 		    chk_addr_ret != RTN_MULTICAST &&
--		    chk_addr_ret != RTN_BROADCAST)
-+		    chk_addr_ret != RTN_BROADCAST) {
-+			err = -EADDRNOTAVAIL;
-+			goto out;
-+		}
+@@ -309,6 +309,10 @@ int inet6_bind(struct socket *sock, stru
+ 			err = -EADDRNOTAVAIL;
+ 			goto out;
+ 		}
 +		if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
 +			err = -EADDRNOTAVAIL;
- 			goto out;
++			goto out;
 +		}
  	} else {
  		if (addr_type != IPV6_ADDR_ANY) {

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.699 packages/kernel/kernel.spec:1.699.2.1
--- packages/kernel/kernel.spec:1.699	Mon Sep  7 10:06:04 2009
+++ packages/kernel/kernel.spec	Thu Sep 10 14:07:14 2009
@@ -113,8 +113,8 @@
 %endif
 
 %define		basever		2.6.30
-%define		postver		.5
-%define		rel		0.4
+%define		postver		.6
+%define		rel		0.1
 
 %define		_enable_debug_packages			0
 
@@ -158,7 +158,7 @@
 # Source0-md5:	7a80058a6382e5108cdb5554d1609615
 %if "%{postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	47841c7ff5c81a7b349a79f2fa8e9138
+# Source1-md5:	f89295707f68c2b349534b490c9d5f2d
 %endif
 
 Source3:	kernel-autoconf.h
@@ -1579,6 +1579,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.699.2.1  2009/09/10 12:07:14  arekm
+- up to 2.6.30.6
+
 Revision 1.699  2009/09/07 08:06:04  adamg
 - define NUMA for pae bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.16&r2=1.16.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.699&r2=1.699.2.1&f=u