version bump

5 files changed, 141 insertions, 18 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index b0de74e50689..d5ac995b86dd 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.31 2004/04/17 13:57:19 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.32 2004/04/21 17:03:00 jhhudso Exp $
+
+*usermode-sources-2.6.4 (21 Apr 2004)
+
+  21 Apr 2004; Jared Hudson <jhhudso@gentoo.org> usermode-sources-2.6.4.ebuild,
+  files/usermode-sources-2.6.4.CAN-2004-0109.patch:
+  Version bump.
 
 *usermode-sources-2.4.24-r3 (17 Apr 2004)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 570e69497c09..7cf2c51225c8 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,28 +1,31 @@
-MD5 4c2a92a87f55f4f5804fca576db315df ChangeLog 5661
-MD5 5c739fab83545ccbea47c9afc2df914c usermode-sources-2.4.23-r2.ebuild 1684
-MD5 f065cee00b825478aa2a42cd1deb001d usermode-sources-2.4.24-r3.ebuild 1932
-MD5 6432b6a6e6fdf8d11e98a8fb0bf955ad usermode-sources-2.4.21-r1.ebuild 1976
 MD5 73a76ea43d99f2369d8ac469599c8175 usermode-sources-2.4.23-r1.ebuild 1688
+MD5 f065cee00b825478aa2a42cd1deb001d usermode-sources-2.4.24-r3.ebuild 1932
+MD5 5c739fab83545ccbea47c9afc2df914c usermode-sources-2.4.23-r2.ebuild 1684
+MD5 674edc209a36a494e1fd190f81df4f78 usermode-sources-2.6.4.ebuild 843
 MD5 6cdc1e33ed67ce129f7498203526cb16 metadata.xml 252
-MD5 48ac359d9b4bd01d58538bac6ab3643e usermode-sources-2.6.1-r1.ebuild 1506
+MD5 4c2a92a87f55f4f5804fca576db315df ChangeLog 5661
 MD5 a2f284fae42dbf9801371cd88b76382c usermode-sources-2.4.22-r2.ebuild 1969
-MD5 2f03fbab00001abd97bbf6a22ad25481 usermode-sources-2.4.20-r2.ebuild 2270
+MD5 6432b6a6e6fdf8d11e98a8fb0bf955ad usermode-sources-2.4.21-r1.ebuild 1976
+MD5 48ac359d9b4bd01d58538bac6ab3643e usermode-sources-2.6.1-r1.ebuild 1506
 MD5 634e7f9fd8566b856eadf6db27cd2565 usermode-sources-2.6.3-r2.ebuild 847
+MD5 2f03fbab00001abd97bbf6a22ad25481 usermode-sources-2.4.20-r2.ebuild 2270
+MD5 634e7f9fd8566b856eadf6db27cd2565 usermode-sources-2.6.4.ebuild~ 847
 MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/usermode-sources-2.4.22.rtc_fix.patch 7073
 MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
-MD5 cf8295a2c632cf6aa45b56a91e9a8a31 files/digest-usermode-sources-2.6.3-r2 135
+MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r3 134
+MD5 81d1aecdba0a87dcee572935be335b6d files/digest-usermode-sources-2.4.23-r2 134
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/usermode-sources-2.4.20.rtc_fix.patch 6769
-MD5 2b62c53b9695ab543819727b7e64e73b files/digest-usermode-sources-2.4.21-r1 134
+MD5 c4b73bf68d5c34ca2fa6e9ef6dd89268 files/digest-usermode-sources-2.6.4 132
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/usermode-sources.CAN-2003-0985.patch 414
+MD5 f418f335a883a78923ebd9205011c25a files/digest-usermode-sources-2.6.1-r1 131
+MD5 2b62c53b9695ab543819727b7e64e73b files/digest-usermode-sources-2.4.21-r1 134
 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/usermode-sources-2.6.3.CAN-2004-0109.patch 2072
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/usermode-sources-2.4.22.rtc_fix.patch 7073
-MD5 b8ba6a7baf14cbeb3a21bf174ea7d773 files/digest-usermode-sources-2.4.23-r1 134
-MD5 81d1aecdba0a87dcee572935be335b6d files/digest-usermode-sources-2.4.23-r2 134
-MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r3 134
+MD5 21f3a4f186017d925067335e24db36a1 files/usermode-sources-2.4.24.CAN-2004-0109.patch 1877
 MD5 3c89919b01bf69d48c4307faa77d99a1 files/digest-usermode-sources-2.4.20-r2 134
+MD5 b8ba6a7baf14cbeb3a21bf174ea7d773 files/digest-usermode-sources-2.4.23-r1 134
+MD5 cf8295a2c632cf6aa45b56a91e9a8a31 files/digest-usermode-sources-2.6.3-r2 135
 MD5 4c510db2fdca185ae68005e677b87dcd files/digest-usermode-sources-2.4.22-r2 134
-MD5 f418f335a883a78923ebd9205011c25a files/digest-usermode-sources-2.6.1-r1 131
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/usermode-sources.CAN-2003-0985.patch 414
-MD5 21f3a4f186017d925067335e24db36a1 files/usermode-sources-2.4.24.CAN-2004-0109.patch 1877
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.4 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.4
new file mode 100644
index 000000000000..c29ed2e225ed
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.4
@@ -0,0 +1,2 @@
+MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
+MD5 2c589503c6451fe9f06bc38072774799 uml-patch-2.6.4-1.bz2 103319
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.4.CAN-2004-0109.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.4.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d7726c2e5aaf
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.4.CAN-2004-0109.patch
@@ -0,0 +1,88 @@
+--- linux/fs/isofs/rock.c.orig
++++ linux/fs/isofs/rock.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
+ #include <linux/buffer_head.h>
++#include <asm/page.h>
+ 
+ #include "rock.h"
+@@ -419,7 +420,7 @@ int parse_rock_ridge_inode_internal(stru
+   return 0;
+ }
+ 
+-static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
++static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
+ {
+ 	int slen;
+ 	int rootflag;
+@@ -431,16 +432,25 @@ static char *get_symlink_chunk(char *rpn
+ 		rootflag = 0;
+ 		switch (slp->flags & ~1) {
+ 		case 0:
++			if (slp->len > plimit - rpnt)
++				return NULL;
+ 			memcpy(rpnt, slp->text, slp->len);
+ 			rpnt+=slp->len;
+ 			break;
++		case 2:
++			if (rpnt >= plimit)
++				return NULL;
++			*rpnt++='.';
++			break;
+ 		case 4:
++			if (2 > plimit - rpnt)
++				return NULL;
+ 			*rpnt++='.';
+-			/* fallthru */
+-		case 2:
+ 			*rpnt++='.';
+ 			break;
+ 		case 8:
++			if (rpnt >= plimit)
++				return NULL;
+ 			rootflag = 1;
+ 			*rpnt++='/';
+ 			break;
+@@ -457,17 +467,23 @@ static char *get_symlink_chunk(char *rpn
+ 			 * If there is another SL record, and this component
+ 			 * record isn't continued, then add a slash.
+ 			 */
+-			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
++			if ((!rootflag) && (rr->u.SL.flags & 1) &&
++			    !(oldslp->flags & 1)) {
++				if (rpnt >= plimit)
++					return NULL;
+ 				*rpnt++='/';
++			}
+ 			break;
+ 		}
+ 
+ 		/*
+ 		 * If this component record isn't continued, then append a '/'.
+ 		 */
+-		if (!rootflag && !(oldslp->flags & 1))
++		if (!rootflag && !(oldslp->flags & 1)) {
++			if (rpnt >= plimit)
++				return NULL;
+ 			*rpnt++='/';
+-
++		}
+ 	}
+ return rpnt;
+ }
+@@ -548,7 +564,10 @@ static int rock_ridge_symlink_readpage(s
+ 			CHECK_SP(goto out);
+ 			break;
+ 		case SIG('S', 'L'):
+-			rpnt = get_symlink_chunk(rpnt, rr);
++			rpnt = get_symlink_chunk(rpnt, rr,
++						 link + (PAGE_SIZE - 1));
++			if (rpnt == NULL)
++				goto out;
+ 			break;
+ 		case SIG('C', 'E'):
+ 			/* This tells is if there is a continuation record */
+
+
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.4.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.4.ebuild
new file mode 100644
index 000000000000..f441fbdd9bec
--- /dev/null
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.4.ebuild,v 1.1 2004/04/21 17:03:00 jhhudso Exp $
+
+K_NOUSENAME="yes"
+ETYPE="sources"
+
+inherit kernel-2
+UML_PATCH="uml-patch-2.6.4-1"
+OKV="${PV}"
+EXTRAVERSION="-${UML_PATCH//-*-/}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+S="${WORKDIR}/linux-${KV}"
+IUSE=""
+
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.CAN-2004-0109.patch"
+
+DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
+	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
+HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
+SLOT="${KV}"
+KEYWORDS="~x86"
+RESTRICT="nomirror"