Bump to 2.6.18-r2

	- Includes a patch to work with linux-header-2.6.21

Package-Manager: portage-2.1.2.7

5 files changed, 242 insertions, 9 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index b3950b14793b..9c20947d43b5 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.86 2007/01/03 04:32:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.87 2007/05/25 03:23:50 dang Exp $
+
+*usermode-sources-2.6.18-r2 (25 May 2007)
+
+  25 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/usermode-sources-2.6.18-r2-gentoo-headers.patch,
+  +usermode-sources-2.6.18-r2.ebuild:
+  Bump to 2.6.18-r2
+  	- Includes a patch to work with linux-header-2.6.21
 
   03 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
   +files/usermode-sources-2.6.18-r1-CVE-2006-4572.patch,
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 206d5cce02d5..f0cb6bd83deb 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -25,6 +25,10 @@ AUX usermode-sources-2.6.18-r1-CVE-2006-4572.patch 4192 RMD160 5522cf0607475788b
 MD5 a8ae4d41e9513925ba02e10813f68c79 files/usermode-sources-2.6.18-r1-CVE-2006-4572.patch 4192
 RMD160 5522cf0607475788bc40bf3d23140fb9ea80149d files/usermode-sources-2.6.18-r1-CVE-2006-4572.patch 4192
 SHA256 dc6efb9d1617e109945c36b8dac7c14eb7df43b6f3bbdeebcaa1b7067c3fd781 files/usermode-sources-2.6.18-r1-CVE-2006-4572.patch 4192
+AUX usermode-sources-2.6.18-r2-gentoo-headers.patch 7098 RMD160 7a3da2168cd4c465feffe8541e54a6f15e3b5170 SHA1 c2447178f649b9498330f6471e8dd4b273271d92 SHA256 0e598bf1c8accf5f94ba39977141ab3cee0fbf0c7600b4a5158ab5dbc8665ee5
+MD5 355df74ad606c6bf5c94b6b04efb752d files/usermode-sources-2.6.18-r2-gentoo-headers.patch 7098
+RMD160 7a3da2168cd4c465feffe8541e54a6f15e3b5170 files/usermode-sources-2.6.18-r2-gentoo-headers.patch 7098
+SHA256 0e598bf1c8accf5f94ba39977141ab3cee0fbf0c7600b4a5158ab5dbc8665ee5 files/usermode-sources-2.6.18-r2-gentoo-headers.patch 7098
 DIST genpatches-2.6.16-13.base.tar.bz2 98287 RMD160 55e01ae4090fdbb65c2033d7df3f6d667bcd874f SHA1 0d5bc13616264f0e58c67337dafe72e92a7b7025 SHA256 3bfa570f10939a838a3d460563f30b429d227e9f5b4cd0bd6b448a22bdb63858
 DIST genpatches-2.6.16-15.base.tar.bz2 98632 RMD160 46e8cfcae8fea262d7599c2e4d3e7fbc8af239b2 SHA1 e0f253ad01a4da388675af4b90223289d9bcd578 SHA256 fb78f2a4d32d1770a34d9ee254686a6a12102fa99c1bb73e9c282ab5f82dddaa
 DIST genpatches-2.6.18-1.base.tar.bz2 2397 RMD160 1b02d9e5adba7a9a17f85691f312ee2c870c9a48 SHA1 790186d9d44c358d05489cdff417beab03124708 SHA256 e87db440591d48f74b8d50f47bde55a1652c969626befa94aba48cee57aa5da8
@@ -50,14 +54,18 @@ EBUILD usermode-sources-2.6.18-r1.ebuild 1009 RMD160 e0bac77c7776dfbaa506767af62
 MD5 7baf7387a1b63224d1a3befe7e3970dd usermode-sources-2.6.18-r1.ebuild 1009
 RMD160 e0bac77c7776dfbaa506767af62d2e213cb746f3 usermode-sources-2.6.18-r1.ebuild 1009
 SHA256 b2429ddd86eeab6168edd80c446ba1beb0d5cec7371dbb7033ae1b4d22e5f490 usermode-sources-2.6.18-r1.ebuild 1009
+EBUILD usermode-sources-2.6.18-r2.ebuild 1051 RMD160 5a8b0cc87d385529177ff4c9d0c60732d77f048f SHA1 a6d3a617d303d424e132b5f3eeb89a32365f2a24 SHA256 0c9b3c9f4bb067c48693d39b6e2cdaa0fac40f42aaa0fe9001497fef1188b021
+MD5 7c9946f1addfb4652c3e5082e178494b usermode-sources-2.6.18-r2.ebuild 1051
+RMD160 5a8b0cc87d385529177ff4c9d0c60732d77f048f usermode-sources-2.6.18-r2.ebuild 1051
+SHA256 0c9b3c9f4bb067c48693d39b6e2cdaa0fac40f42aaa0fe9001497fef1188b021 usermode-sources-2.6.18-r2.ebuild 1051
 EBUILD usermode-sources-2.6.18.ebuild 919 RMD160 2d409c33d4e75ada220c339ddb887ac6cdae521c SHA1 47bcb8a03fce0c8bf006728e578c73111e358858 SHA256 a936b615f74f3af610e5bbb43eeec34b74bb088a6433e744bf935c9ac1df5cf2
 MD5 80ad0f13a00939853185c632c423fd4c usermode-sources-2.6.18.ebuild 919
 RMD160 2d409c33d4e75ada220c339ddb887ac6cdae521c usermode-sources-2.6.18.ebuild 919
 SHA256 a936b615f74f3af610e5bbb43eeec34b74bb088a6433e744bf935c9ac1df5cf2 usermode-sources-2.6.18.ebuild 919
-MISC ChangeLog 23915 RMD160 3e0546eb02ce0bf8ab273741fac273d854dc5a86 SHA1 14f94632732a0023a7e10b8671dedd4719d5bc24 SHA256 64f245e96a8463cc022f957d1dc4ee932f3e32522be5400bf58ac3fc2a237b9a
-MD5 e89e45d56526a7214432a7dfe29e6d5f ChangeLog 23915
-RMD160 3e0546eb02ce0bf8ab273741fac273d854dc5a86 ChangeLog 23915
-SHA256 64f245e96a8463cc022f957d1dc4ee932f3e32522be5400bf58ac3fc2a237b9a ChangeLog 23915
+MISC ChangeLog 24181 RMD160 66ad21c12c3772689ec3b61b35008d4175e44cfc SHA1 2c3bcfaa36f188560eb3b0ae58de7e08f6cde852 SHA256 f9854e7b9f60ced45888c67ecaa1b0ed0dd13f6d049647ca47a0e3791b062a44
+MD5 8345fc45d122b69b5ed3f6fe7c98a0ca ChangeLog 24181
+RMD160 66ad21c12c3772689ec3b61b35008d4175e44cfc ChangeLog 24181
+SHA256 f9854e7b9f60ced45888c67ecaa1b0ed0dd13f6d049647ca47a0e3791b062a44 ChangeLog 24181
 MISC metadata.xml 250 RMD160 9657d63a141d387fa3a42ef4087ee0ed3757cf67 SHA1 7a59aecd3ddaed1b49f15c552a7893929b5155ed SHA256 c1aa14289c2eb84cdf6c739f3d48b122a09d4c99de38bd22ae558ac47be0cf90
 MD5 5811f74eb87a97c082114675db0ef41b metadata.xml 250
 RMD160 9657d63a141d387fa3a42ef4087ee0ed3757cf67 metadata.xml 250
@@ -77,10 +85,13 @@ SHA256 0d6676ef2ae421b16b6c04e38bdcd6c6deabe3df4873669eda46c47f5af0d631 files/di
 MD5 bb664042fcd485eb4961aebdfe1b7ecf files/digest-usermode-sources-2.6.18-r1 780
 RMD160 76b5427db2aa54c270a317dafc2939a56bf6c443 files/digest-usermode-sources-2.6.18-r1 780
 SHA256 f3424bc44e5d7f5e8b016bfb117b6bb2fea5d20d7cc997cdce3012b1baa6c6f1 files/digest-usermode-sources-2.6.18-r1 780
+MD5 bb664042fcd485eb4961aebdfe1b7ecf files/digest-usermode-sources-2.6.18-r2 780
+RMD160 76b5427db2aa54c270a317dafc2939a56bf6c443 files/digest-usermode-sources-2.6.18-r2 780
+SHA256 f3424bc44e5d7f5e8b016bfb117b6bb2fea5d20d7cc997cdce3012b1baa6c6f1 files/digest-usermode-sources-2.6.18-r2 780
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFmzGjomPajV0RnrERAtckAJ9iHmVYBNkaInctZOEC1/2YjT7xkACaAla4
-tW8r7oPBjIkCWesimiqrzJc=
-=e5Fw
+iD8DBQFGVlbgomPajV0RnrERAoANAJ0QyRvuSXEpHPITBds5Nuk9aFgWmACfcUS8
++3+UGQFE4jqzJA3FB5BNU0Q=
+=7kIr
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r2
new file mode 100644
index 000000000000..4784d6488cf2
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r2
@@ -0,0 +1,9 @@
+MD5 65e0ac78c740fd7e70cdd2fcab6d89ad genpatches-2.6.18-8.base.tar.bz2 108656
+RMD160 b0d604f8a1f476e34f6a3a4143e07a24dbcab6e8 genpatches-2.6.18-8.base.tar.bz2 108656
+SHA256 3ac24ea4b287429719de0b2828594e84eecbedb05f66300632363d3a60c185d0 genpatches-2.6.18-8.base.tar.bz2 108656
+MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
+RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
+SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
+MD5 683956ae680b9a09e5c5d7b99a568775 uml-2.6.18.1-bb2.patch.bz2 36108
+RMD160 8984ba75df2283764c916cebc38a4d05ee617996 uml-2.6.18.1-bb2.patch.bz2 36108
+SHA256 58366bd9a2129ed4486c37f9756a35a981a0e3d30a960da1278254777c6d8ac2 uml-2.6.18.1-bb2.patch.bz2 36108
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.18-r2-gentoo-headers.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.18-r2-gentoo-headers.patch
new file mode 100644
index 000000000000..a483716f8f2a
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.18-r2-gentoo-headers.patch
@@ -0,0 +1,179 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/kernel/skas/clone.c linux-2.6.18-usermode-r1/arch/um/kernel/skas/clone.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/kernel/skas/clone.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/kernel/skas/clone.c	2007-05-24 22:44:48.000000000 -0400
+@@ -3,7 +3,6 @@
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #include <asm/unistd.h>
+-#include <asm/page.h>
+ #include "ptrace_user.h"
+ #include "skas.h"
+ #include "stub-data.h"
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/main.c linux-2.6.18-usermode-r1/arch/um/os-Linux/main.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/main.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/main.c	2007-05-24 22:44:48.000000000 -0400
+@@ -12,7 +12,6 @@
+ #include <sys/resource.h>
+ #include <sys/mman.h>
+ #include <sys/user.h>
+-#include <asm/page.h>
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "mem_user.h"
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/skas/mem.c linux-2.6.18-usermode-r1/arch/um/os-Linux/skas/mem.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/skas/mem.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/skas/mem.c	2007-05-24 22:44:48.000000000 -0400
+@@ -8,7 +8,6 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+-#include <asm/page.h>
+ #include <asm/unistd.h>
+ #include "mem_user.h"
+ #include "mem.h"
+@@ -109,6 +108,8 @@ static inline long do_syscall_stub(struc
+ 	return ret;
+ }
+ 
++#define PAGE_MASK   (~(UM_KERN_PAGE_SIZE-1))
++#define PAGE_SHIFT  12
+ long run_syscall_stub(struct mm_id * mm_idp, int syscall,
+ 		      unsigned long *args, long expected, void **addr,
+ 		      int done)
+@@ -133,7 +134,7 @@ long run_syscall_stub(struct mm_id * mm_
+ 	multi_op_count++;
+ 
+ 	if(!done && ((((unsigned long) stack) & ~PAGE_MASK) <
+-		     PAGE_SIZE - 10 * sizeof(long))){
++		     UM_KERN_PAGE_SIZE - 10 * sizeof(long))){
+ 		*addr = stack;
+ 		return 0;
+ 	}
+@@ -152,7 +153,7 @@ long syscall_stub_data(struct mm_id * mm
+ 	 * Thus in this case do_syscall_stub correctly won't be called.
+ 	 */
+ 	if((((unsigned long) *addr) & ~PAGE_MASK) >=
+-	   PAGE_SIZE - (10 + data_count) * sizeof(long)) {
++	   UM_KERN_PAGE_SIZE - (10 + data_count) * sizeof(long)) {
+ 		ret = do_syscall_stub(mm_idp, addr);
+ 		/* in case of error, don't overwrite data on stack */
+ 		if(ret)
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/start_up.c linux-2.6.18-usermode-r1/arch/um/os-Linux/start_up.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/start_up.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/start_up.c	2007-05-24 22:44:48.000000000 -0400
+@@ -19,7 +19,6 @@
+ #include <sys/wait.h>
+ #include <sys/mman.h>
+ #include <asm/unistd.h>
+-#include <asm/page.h>
+ #include <sys/types.h>
+ #include "user_util.h"
+ #include "kern_util.h"
+@@ -80,11 +79,11 @@ static int start_ptraced_child(void **st
+ 	unsigned long sp;
+ 	int pid, n, status;
+ 
+-	stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
++	stack = mmap(NULL, UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
+ 		     MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ 	if(stack == MAP_FAILED)
+ 		panic("check_ptrace : mmap failed, errno = %d", errno);
+-	sp = (unsigned long) stack + PAGE_SIZE - sizeof(void *);
++	sp = (unsigned long) stack + UM_KERN_PAGE_SIZE - sizeof(void *);
+ 	pid = clone(ptrace_child, (void *) sp, SIGCHLD, NULL);
+ 	if(pid < 0)
+ 		panic("start_ptraced_child : clone failed, errno = %d", errno);
+@@ -129,7 +128,7 @@ static int stop_ptraced_child(int pid, v
+ 		ret = -1;
+ 	}
+ 
+-	if(munmap(stack, PAGE_SIZE) < 0)
++	if(munmap(stack, UM_KERN_PAGE_SIZE) < 0)
+ 		panic("check_ptrace : munmap failed, errno = %d", errno);
+ 	return ret;
+ }
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/tt.c linux-2.6.18-usermode-r1/arch/um/os-Linux/tt.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/tt.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/tt.c	2007-05-24 22:53:08.000000000 -0400
+@@ -18,7 +18,6 @@
+ #include <sys/mman.h>
+ #include <asm/ptrace.h>
+ #include <asm/unistd.h>
+-#include <asm/page.h>
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "user.h"
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/sys-i386/ptrace_user.c linux-2.6.18-usermode-r1/arch/um/sys-i386/ptrace_user.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/sys-i386/ptrace_user.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/sys-i386/ptrace_user.c	2007-05-24 22:46:26.000000000 -0400
+@@ -7,9 +7,8 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <linux/stddef.h>
++#include <sys/user.h>
+ #include "ptrace_user.h"
+-/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
+-#include <asm/user.h>
+ #include "kern_util.h"
+ #include "sysdep/thread.h"
+ #include "user.h"
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/sys-i386/user-offsets.c linux-2.6.18-usermode-r1/arch/um/sys-i386/user-offsets.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/sys-i386/user-offsets.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/sys-i386/user-offsets.c	2007-05-24 22:56:43.000000000 -0400
+@@ -1,7 +1,8 @@
+ #include <stdio.h>
+ #include <signal.h>
++#include <stddef.h>
+ #include <asm/ptrace.h>
+-#include <asm/user.h>
++#include <sys/user.h>
+ #include <linux/stddef.h>
+ #include <sys/poll.h>
+ 
+@@ -14,6 +15,34 @@
+ #define OFFSET(sym, str, mem) \
+ 	DEFINE(sym, offsetof(struct str, mem));
+ 
++/* These are gone from userspace; not sure where to pull them from */
++struct user_i387_struct {
++	long	cwd;
++	long	swd;
++	long	twd;
++	long	fip;
++	long	fcs;
++	long	foo;
++	long	fos;
++	long	st_space[20];	/* 8*10 bytes for each FP-reg = 80 bytes */
++};
++
++struct user_fxsr_struct {
++	unsigned short	cwd;
++	unsigned short	swd;
++	unsigned short	twd;
++	unsigned short	fop;
++	long	fip;
++	long	fcs;
++	long	foo;
++	long	fos;
++	long	mxcsr;
++	long	reserved;
++	long	st_space[32];	/* 8*16 bytes for each FP-reg = 128 bytes */
++	long	xmm_space[32];	/* 8*16 bytes for each XMM-reg = 128 bytes */
++	long	padding[56];
++};
++
+ void foo(void)
+ {
+ 	OFFSET(HOST_SC_IP, sigcontext, eip);
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/sys-x86_64/user-offsets.c linux-2.6.18-usermode-r1/arch/um/sys-x86_64/user-offsets.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/sys-x86_64/user-offsets.c	2007-05-24 22:32:15.000000000 -0400
++++ linux-2.6.18-usermode-r1/arch/um/sys-x86_64/user-offsets.c	2007-05-24 22:44:48.000000000 -0400
+@@ -12,7 +12,7 @@
+  */
+ typedef __u64 u64;
+ typedef __u32 u32;
+-#include <asm/user.h>
++#include <sys/user.h>
+ 
+ #define DEFINE(sym, val) \
+         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.18-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.18-r2.ebuild
new file mode 100644
index 000000000000..2561316f4a74
--- /dev/null
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.18-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.18-r2.ebuild,v 1.1 2007/05/25 03:23:50 dang Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="8"
+inherit kernel-2
+detect_version
+
+UML_VER="uml-2.6.18.1-bb2"
+UNIPATCH_LIST="${FILESDIR}/uml-2.6.18-genpatches-8-prep.patch
+	${DISTDIR}/${UML_VER}.patch.bz2
+	${FILESDIR}/${P}-r1-CVE-2006-4572.patch
+	${FILESDIR}/${PF}-gentoo-headers.patch"
+UNIPATCH_STRICTORDER="yes"
+
+DESCRIPTION="Full sources for the User Mode Linux kernel"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
+	http://www.user-mode-linux.org/~blaisorblade/patches/guest/${UML_VER}/${UML_VER}.patch.bz2"
+HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
+KEYWORDS="~amd64 ~x86"
+
+K_EXTRAEINFO="Since you are using UML, you may want to read the Gentoo Linux
+Developer's guide to system testing with User-Mode Linux that
+can be found at http://www.gentoo.org/doc/en/uml.xml"