Fix for the 2.4 kNFSd security vulnerability and the 2.6 /dev/ptmx DoS, bug #62524. Also fixed CAN-2004-0814 for 2.4 and 2.6, bug #68421.

17 files changed, 102 insertions, 222 deletions

diff --git a/sys-kernel/xbox-sources/ChangeLog b/sys-kernel/xbox-sources/ChangeLog
index 54a8264adab0..4f0254073e9a 100644
--- a/sys-kernel/xbox-sources/ChangeLog
+++ b/sys-kernel/xbox-sources/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-kernel/xbox-sources
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/ChangeLog,v 1.13 2004/11/04 09:51:04 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/ChangeLog,v 1.14 2004/11/06 23:12:37 plasmaroo Exp $
+
+*xbox-sources-2.6.8.1-r2 (06 Nov 2004)
+
+  06 Nov 2004; <plasmaroo@gentoo.org> -xbox-sources-2.4.27-r1.ebuild,
+  -xbox-sources-2.4.27-r2.ebuild, +xbox-sources-2.4.27-r3.ebuild,
+  -xbox-sources-2.6.7-r5.ebuild, -xbox-sources-2.6.8.1-r1.ebuild,
+  +xbox-sources-2.6.8.1-r2.ebuild, -xbox-sources-2.6.8.1.ebuild,
+  +files/xbox-sources-2.4.27.XDRWrapFix.patch,
+  -files/xbox-sources-2.6.7.CAN-2004-0596.patch,
+  +files/xbox-sources-2.6.8.1.devPtmx.patch,
+  -files/xbox-sources.CAN-2004-0497.patch,
+  -files/xbox-sources.IPTables-RDoS.patch,
+  -files/xbox-sources.ProcPerms.patch:
+  Fix for the 2.4 kNFSd security vulnerability and the 2.6 /dev/ptmx DoS, bug
+  #62524. Also fixed CAN-2004-0814 for 2.4 and 2.6, bug #68421. Removing
+  old versions.
 
 *xbox-sources-2.6.8.1-r1 (04 Nov 2004)
 
diff --git a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r1 b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r1
deleted file mode 100644
index cc4a1628a374..000000000000
--- a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
-MD5 6236760189c6c17affecb47768bf143c xbox-sources-2.4.27-r0.patch.bz2 133155
diff --git a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r2 b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r3
index 37b388c313df..a0e063cdcda9 100644
--- a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r2
+++ b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.27-r3
@@ -1,3 +1,4 @@
 MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
 MD5 6236760189c6c17affecb47768bf143c xbox-sources-2.4.27-r0.patch.bz2 133155
 MD5 a68b51962e4bd9349749d2ca167e97ab xbox-sources-2.4.27.squashfs.patch.bz2 13033
+MD5 2f6a60e03ececd400a454509ebb4ece4 linux-2.4.27-CAN-2004-0814.patch 83118
diff --git a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.7-r5 b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.7-r5
deleted file mode 100644
index d364692037ae..000000000000
--- a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.7-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
-MD5 8ff14d264817d81b1b4bdd6e93e16708 xboxpatches-2.6-7.20040629.tar.bz2 142768
-MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
diff --git a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.8.1 b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.8.1
deleted file mode 100644
index d1c418ef8f17..000000000000
--- a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.8.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
-MD5 f3a9915a3c060513d906179804df422b xboxpatches-2.6.8.1-20041016.tar.bz2 143532
diff --git a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.8.1-r2 b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.8.1-r2
new file mode 100644
index 000000000000..b72068a243fd
--- /dev/null
+++ b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.6.8.1-r2
@@ -0,0 +1,2 @@
+MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
+MD5 6c4a83a0acc1c9f3120d8829a554fc69 xboxpatches-2.6.8.1-20041104.tar.bz2 155697
diff --git a/sys-kernel/xbox-sources/files/xbox-sources-2.4.27.XDRWrapFix.patch b/sys-kernel/xbox-sources/files/xbox-sources-2.4.27.XDRWrapFix.patch
new file mode 100644
index 000000000000..9a336ab7876a
--- /dev/null
+++ b/sys-kernel/xbox-sources/files/xbox-sources-2.4.27.XDRWrapFix.patch
@@ -0,0 +1,48 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/16 14:50:04-03:00 neilb@cse.unsw.edu.au 
+#   [PATCH] Fixed possibly xdr parsing error if write size exceed 2^31
+#   
+#   xdr_argsize_check needs to cope with the possibility that the
+#   pointer has wrapped and could be below buf->base.
+#   
+#   Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
+#   
+#   ### Diffstat output
+#    ./fs/nfsd/nfs3xdr.c         |    2 +-
+#    ./include/linux/nfsd/xdr3.h |    2 +-
+#    2 files changed, 2 insertions(+), 2 deletions(-)
+# 
+# fs/nfsd/nfs3xdr.c
+#   2004/08/14 00:23:06-03:00 neilb@cse.unsw.edu.au +1 -1
+#   Fixed possibly xdr parsing error if write size exceed 2^31
+# 
+# include/linux/nfsd/xdr3.h
+#   2004/08/15 20:48:43-03:00 neilb@cse.unsw.edu.au +1 -1
+#   Fixed possibly xdr parsing error if write size exceed 2^31
+# 
+diff -Nru a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
+--- a/fs/nfsd/nfs3xdr.c	2004-09-06 11:20:28 -07:00
++++ b/fs/nfsd/nfs3xdr.c	2004-09-06 11:20:28 -07:00
+@@ -273,7 +273,7 @@
+ {
+ 	struct svc_buf	*buf = &rqstp->rq_argbuf;
+ 
+-	return p - buf->base <= buf->buflen;
++	return p >= buf->base && p <= buf->base + buf->buflen ;
+ }
+ 
+ static inline int
+diff -Nru a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
+--- a/include/linux/nfsd/xdr3.h	2004-09-06 11:20:28 -07:00
++++ b/include/linux/nfsd/xdr3.h	2004-09-06 11:20:28 -07:00
+@@ -41,7 +41,7 @@
+ 	__u32			count;
+ 	int			stable;
+ 	__u8 *			data;
+-	int			len;
++	__u32			len;
+ };
+ 
+ struct nfsd3_createargs {
diff --git a/sys-kernel/xbox-sources/files/xbox-sources-2.6.7.CAN-2004-0596.patch b/sys-kernel/xbox-sources/files/xbox-sources-2.6.7.CAN-2004-0596.patch
deleted file mode 100644
index 3e20a2e41372..000000000000
--- a/sys-kernel/xbox-sources/files/xbox-sources-2.6.7.CAN-2004-0596.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 1.13/drivers/net/eql.c	2004-07-21 03:13:40 -07:00
-+++ 1.14/drivers/net/eql.c	2004-07-21 03:13:40 -07:00
-@@ -495,6 +495,8 @@
- 		return -EFAULT;
- 
- 	slave_dev = dev_get_by_name(sc.slave_name);
-+	if (!slave_dev)
-+		return -ENODEV;
- 
- 	ret = -EINVAL;
- 
-@@ -527,11 +529,13 @@
- 	if (copy_from_user(&sc, scp, sizeof (slave_config_t)))
- 		return -EFAULT;
- 
--	eql = dev->priv;
- 	slave_dev = dev_get_by_name(sc.slave_name);
-+	if (!slave_dev)
-+		return -ENODEV;
- 
- 	ret = -EINVAL;
- 
-+	eql = dev->priv;
- 	spin_lock_bh(&eql->queue.lock);
- 	if (eql_is_slave(slave_dev)) {
- 		slave = __eql_find_slave_dev(&eql->queue, slave_dev);
---- 1.14/drivers/net/eql.c	2004-07-21 03:13:33 -07:00
-+++ 1.15/drivers/net/eql.c	2004-07-21 03:13:33 -07:00
-@@ -499,6 +499,8 @@
- 		return -ENODEV;
- 
- 	ret = -EINVAL;
-+	if (!slave_dev)
-+		return ret;
- 
- 	spin_lock_bh(&eql->queue.lock);
- 	if (eql_is_slave(slave_dev)) {
-@@ -534,6 +536,8 @@
- 		return -ENODEV;
- 
- 	ret = -EINVAL;
-+	if (!slave_dev)
-+		return ret;
- 
- 	eql = dev->priv;
- 	spin_lock_bh(&eql->queue.lock);
diff --git a/sys-kernel/xbox-sources/files/xbox-sources-2.6.8.1.devPtmx.patch b/sys-kernel/xbox-sources/files/xbox-sources-2.6.8.1.devPtmx.patch
new file mode 100644
index 000000000000..2312a2bf5e3b
--- /dev/null
+++ b/sys-kernel/xbox-sources/files/xbox-sources-2.6.8.1.devPtmx.patch
@@ -0,0 +1,21 @@
+Index: linux-2.6.5/fs/devpts/inode.c
+===================================================================
+--- linux-2.6.5.orig/fs/devpts/inode.c
++++ linux-2.6.5/fs/devpts/inode.c
+@@ -178,9 +178,13 @@ struct tty_struct *devpts_get_tty(int nu
+ {
+ 	struct dentry *dentry = get_node(number);
+ 	struct tty_struct *tty;
+-
+-	tty = (IS_ERR(dentry) || !dentry->d_inode) ? NULL :
+-			dentry->d_inode->u.generic_ip;
++	
++	tty = NULL;
++	if (!IS_ERR(dentry)) {
++		if (dentry->d_inode)
++			tty = dentry->d_inode->u.generic_ip;
++		dput(dentry);
++	}
+ 
+ 	up(&devpts_root->d_inode->i_sem);
+ 
diff --git a/sys-kernel/xbox-sources/files/xbox-sources.CAN-2004-0497.patch b/sys-kernel/xbox-sources/files/xbox-sources.CAN-2004-0497.patch
deleted file mode 100644
index 41b3196f84ea..000000000000
--- a/sys-kernel/xbox-sources/files/xbox-sources.CAN-2004-0497.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/07/02 20:55:04-07:00 chrisw@osdl.org 
-#   [PATCH] chown permission check fix for ATTR_GID
-#   
-#   SuSE discovered this problem with chown and ATTR_GID.  Make sure user
-#   is authorized to change the group, CAN-2004-0497.
-# 
-# fs/attr.c
-#   2004/07/02 09:07:32-07:00 chrisw@osdl.org +2 -1
-#   chown permission check fix for ATTR_GID
-# 
-diff -Nru a/fs/attr.c b/fs/attr.c
---- a/fs/attr.c	2004-07-08 16:35:57 -07:00
-+++ b/fs/attr.c	2004-07-08 16:35:57 -07:00
-@@ -35,7 +35,8 @@
- 
- 	/* Make sure caller can chgrp. */
- 	if ((ia_valid & ATTR_GID) &&
--	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
-+	    (current->fsuid != inode->i_uid ||
-+	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
- 	    !capable(CAP_CHOWN))
- 		goto error;
- 
diff --git a/sys-kernel/xbox-sources/files/xbox-sources.IPTables-RDoS.patch b/sys-kernel/xbox-sources/files/xbox-sources.IPTables-RDoS.patch
deleted file mode 100644
index 8f89d1605c9a..000000000000
--- a/sys-kernel/xbox-sources/files/xbox-sources.IPTables-RDoS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/ipv4/netfilter/ip_tables.c.orig	2004-04-04 05:36:47.000000000 +0200
-+++ net/ipv4/netfilter/ip_tables.c	2004-06-24 21:24:26.000000000 +0200
-@@ -1461,7 +1461,7 @@
- 		int *hotdrop)
- {
- 	/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
--	char opt[60 - sizeof(struct tcphdr)];
-+	u_int8_t opt[60 - sizeof(struct tcphdr)];
- 	unsigned int i;
- 
- 	duprintf("tcp_match: finding option\n");
diff --git a/sys-kernel/xbox-sources/files/xbox-sources.ProcPerms.patch b/sys-kernel/xbox-sources/files/xbox-sources.ProcPerms.patch
deleted file mode 100644
index d90b8d1815d4..000000000000
--- a/sys-kernel/xbox-sources/files/xbox-sources.ProcPerms.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/07/02 18:48:26-07:00 chrisw@osdl.org 
-#   [PATCH] check attr updates in /proc
-#   
-#   Any proc entry with default proc_file_inode_operations allow unauthorized
-#   attribute updates.  This is very dangerous for proc entries that rely
-#   solely on file permissions for open/read/write.
-#   
-#   Signed-off-by: Chris Wright <chrisw@osdl.org>
-#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-# 
-# fs/proc/generic.c
-#   2004/07/02 15:47:55-07:00 chrisw@osdl.org +14 -7
-#   check attr updates in /proc
-# 
-diff -Nru a/fs/proc/generic.c b/fs/proc/generic.c
---- a/fs/proc/generic.c	2004-07-08 17:03:20 -07:00
-+++ b/fs/proc/generic.c	2004-07-08 17:03:20 -07:00
-@@ -231,14 +231,21 @@
- static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
- {
- 	struct inode *inode = dentry->d_inode;
--	int error = inode_setattr(inode, iattr);
--	if (!error) {
--		struct proc_dir_entry *de = PDE(inode);
--		de->uid = inode->i_uid;
--		de->gid = inode->i_gid;
--		de->mode = inode->i_mode;
--	}
-+	struct proc_dir_entry *de = PDE(inode);
-+	int error;
- 
-+	error = inode_change_ok(inode, iattr);
-+	if (error)
-+		goto out;
-+
-+	error = inode_setattr(inode, iattr);
-+	if (error)
-+		goto out;
-+	
-+	de->uid = inode->i_uid;
-+	de->gid = inode->i_gid;
-+	de->mode = inode->i_mode;
-+out:
- 	return error;
- }
- 
diff --git a/sys-kernel/xbox-sources/xbox-sources-2.4.27-r1.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.4.27-r1.ebuild
deleted file mode 100644
index 85ec2194fe53..000000000000
--- a/sys-kernel/xbox-sources/xbox-sources-2.4.27-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.4.27-r1.ebuild,v 1.1 2004/08/10 01:12:51 plasmaroo Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-XBOX_PATCH="xbox-sources-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-${PR/r1/r0}.patch.bz2"
-
-SRC_URI="${KERNEL_URI}
-	mirror://gentoo/${XBOX_PATCH}"
-DESCRIPTION="Full sources for the Xbox Linux kernel"
-HOMEPAGE="http://www.xbox-linux.org"
-K_NOSETEXTRAVERSION="don't_set_it"
-KEYWORDS="~x86 -*"
-
-UNIPATCH_LIST="
-	${DISTDIR}/${XBOX_PATCH}
-	${FILESDIR}/${P}.cmdlineLeak.patch"
diff --git a/sys-kernel/xbox-sources/xbox-sources-2.4.27-r2.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.4.27-r3.ebuild
index 8d568c7af791..d867713334ed 100644
--- a/sys-kernel/xbox-sources/xbox-sources-2.4.27-r2.ebuild
+++ b/sys-kernel/xbox-sources/xbox-sources-2.4.27-r3.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.4.27-r2.ebuild,v 1.1 2004/08/21 14:15:56 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.4.27-r3.ebuild,v 1.1 2004/11/06 23:12:37 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
 detect_version
 
-XBOX_PATCH="xbox-sources-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-${PR/r2/r0}.patch.bz2"
+XBOX_PATCH="xbox-sources-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-${PR/r3/r0}.patch.bz2"
 
 SRC_URI="${KERNEL_URI}
 	mirror://gentoo/${XBOX_PATCH}
-	mirror://gentoo/${P}.squashfs.patch.bz2"
+	mirror://gentoo/${P}.squashfs.patch.bz2
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
 DESCRIPTION="Full sources for the Xbox Linux kernel"
 HOMEPAGE="http://www.xbox-linux.org"
 K_NOSETEXTRAVERSION="don't_set_it"
@@ -18,5 +19,8 @@ KEYWORDS="x86 -*"
 
 UNIPATCH_LIST="
 	${DISTDIR}/${XBOX_PATCH}
+	${DISTDIR}/${P}.squashfs.patch.bz2
+	${FILESDIR}/${PN}-2.4.26.CAN-2004-0394.patch
 	${FILESDIR}/${P}.cmdlineLeak.patch
-	${DISTDIR}/${P}.squashfs.patch.bz2"
+	${FILESDIR}/${P}.XDRWrapFix.patch
+	${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch"
diff --git a/sys-kernel/xbox-sources/xbox-sources-2.6.7-r5.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.6.7-r5.ebuild
deleted file mode 100644
index 16dccab18117..000000000000
--- a/sys-kernel/xbox-sources/xbox-sources-2.6.7-r5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.6.7-r5.ebuild,v 1.1 2004/08/10 01:12:51 plasmaroo Exp $
-
-ETYPE='sources'
-inherit kernel-2
-detect_version
-
-#version of gentoo patchset
-XPV=7.20040629
-XBOX_PATCHES=xboxpatches-${KV_MAJOR}.${KV_MINOR}-${XPV}.tar.bz2
-
-K_NOSETEXTRAVERSION="don't_set_it"
-KEYWORDS="~x86 -*"
-UNIPATCH_LIST="
-	${DISTDIR}/${XBOX_PATCHES}
-	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
-	${FILESDIR}/${PN}.CAN-2004-0497.patch
-	${FILESDIR}/${PN}.IPTables-RDoS.patch
-	${FILESDIR}/${PN}.ProcPerms.patch
-	${FILESDIR}/${P}.CAN-2004-0596.patch
-	${FILESDIR}/${P}.cmdlineLeak.patch"
-DESCRIPTION='Full sources for the Xbox Linux kernel'
-SRC_URI="${KERNEL_URI}
-	mirror://gentoo/${XBOX_PATCHES}
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
-
-pkg_postinst() {
-	einfo ''
-	einfo 'WARNING: The FATX driver is currently horribly broken. Writing to a FATX partition with this kernel will corrupt it.'
-	einfo ''
-}
diff --git a/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r1.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r2.ebuild
index 632264004f4c..1846b5ba8d81 100644
--- a/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r1.ebuild
+++ b/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r1.ebuild,v 1.1 2004/11/04 09:51:04 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r2.ebuild,v 1.1 2004/11/06 23:12:37 plasmaroo Exp $
 
 ETYPE='sources'
 inherit kernel-2
@@ -12,7 +12,10 @@ XBOX_PATCHES=xboxpatches-2.6.8.1-20041104.tar.bz2
 K_NOSETEXTRAVERSION="don't_set_it"
 KEYWORDS="~x86 -*"
 UNIPATCH_LIST="
-	${DISTDIR}/${XBOX_PATCHES}"
+	${DISTDIR}/${XBOX_PATCHES}
+	${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch
+	${FILESDIR}/${PN}-2.6.7.cmdlineLeak.patch
+	${FILESDIR}/${P}.devPtmx.patch"
 DESCRIPTION='Full sources for the Xbox Linux kernel'
 SRC_URI="${KERNEL_URI}
 	mirror://gentoo/${XBOX_PATCHES}"
diff --git a/sys-kernel/xbox-sources/xbox-sources-2.6.8.1.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.6.8.1.ebuild
deleted file mode 100644
index f707e6419147..000000000000
--- a/sys-kernel/xbox-sources/xbox-sources-2.6.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.6.8.1.ebuild,v 1.2 2004/10/18 09:46:55 chrb Exp $
-
-ETYPE='sources'
-inherit kernel-2
-detect_version
-
-# version of gentoo patchset
-XBOX_PATCHES=xboxpatches-2.6.8.1-20041016.tar.bz2
-
-K_NOSETEXTRAVERSION="don't_set_it"
-KEYWORDS="~x86 -*"
-UNIPATCH_LIST="
-	${DISTDIR}/${XBOX_PATCHES}"
-DESCRIPTION='Full sources for the Xbox Linux kernel'
-SRC_URI="${KERNEL_URI}
-	mirror://gentoo/${XBOX_PATCHES}"
-
-pkg_postinst() {
-	einfo ''
-	einfo 'WARNING: The FATX driver is currently horribly broken. Writing to a FATX partition with this kernel will corrupt it.'
-	einfo ''
-}