9 files changed, 79 insertions, 23 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 845ac4690462..56a17da098d7 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.57 2004/02/08 16:05:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.58 2004/02/16 16:11:59 plasmaroo Exp $
+
+*gentoo-sources-2.4.22-r6 (16 Feb 2004)
+
+  16 Feb 2004; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r12.ebuild,
+  gentoo-sources-2.4.22-r6.ebuild:
+  Added the fix for the ptrace vulnerability for AMD64 platforms. No other
+  functional change is included, so these packages are masked as "~amd64" only.
 
 *gentoo-sources-2.4.20-r11 (08 Feb 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r10 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r10
deleted file mode 100644
index ba471a1c8d80..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 197e927b5fc04c754b039998895b3039 patches-2.4.20-gentoo-r5.tar.bz2 4134962
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r12
new file mode 100644
index 000000000000..41b830eea9bc
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r12
@@ -0,0 +1,2 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 9ceea9d45776eec36c0bca5ff767dc05 patches-2.4.20-gentoo-r11.tar.bz2 4379194
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r6 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r6
new file mode 100644
index 000000000000..a564b8210a40
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r6
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 7f4a97d9c29f7dfc959a7a7efb077e29 gentoo-sources-2.4.22-r5.patch.bz2 3766950
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0001.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0001.patch
new file mode 100644
index 000000000000..bb51f9aa9a62
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0001.patch
@@ -0,0 +1,29 @@
+diff -u linux/arch/x86_64/ia32/ptrace32.c-PTRACE linux/arch/x86_64/ia32/ptrace32.c
+--- linux/arch/x86_64/ia32/ptrace32.c-PTRACE	2003-06-16 13:03:58.000000000 +0200
++++ linux/arch/x86_64/ia32/ptrace32.c	2004-01-07 18:04:43.000000000 +0100
+@@ -25,6 +25,10 @@
+ #include <asm/fpu32.h>
+ #include <linux/mm.h>
+ 
++/* determines which flags the user has access to. */
++/* 1 = access 0 = no access */
++#define FLAG_MASK 0x44dd5UL
++
+ #define R32(l,q) \
+ 	case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break
+ 
+@@ -69,9 +73,12 @@
+ 	R32(eip, rip);
+ 	R32(esp, rsp);
+ 
+-	case offsetof(struct user32, regs.eflags): 
+-		stack[offsetof(struct pt_regs, eflags)/8] = val & 0x44dd5; 
++	case offsetof(struct user32, regs.eflags): { 
++		__u64 *flags = &stack[offsetof(struct pt_regs, eflags)/8];
++		val &= FLAG_MASK;
++		*flags = val | (*flags & ~FLAG_MASK);
+ 		break;
++	}
+ 
+ 	case offsetof(struct user32, u_debugreg[4]): 
+ 	case offsetof(struct user32, u_debugreg[5]):
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild
index ba10bb0c7039..b90704458e4e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild,v 1.1 2004/02/08 16:05:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild,v 1.2 2004/02/16 16:11:59 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -126,6 +126,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
 	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
+	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-rtc_fix.patch || die "Failed to apply RTC fix!"
 
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
index f0bea3462b81..729ab3e299bf 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r10.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r10.ebuild,v 1.1 2004/01/06 15:17:52 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild,v 1.1 2004/02/16 16:11:59 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,10 +30,10 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://gentoo/patches-${KV/10/5}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/12/11}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm"
+KEYWORDS="-* ~amd64"
 SLOT="${KV}"
 
 
@@ -41,10 +41,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/10/5}
-
-	# Move over new iptables-ROUTE patch
-	cp ${FILESDIR}/gentoo-sources-2.4.20-ipt-route.patch 727_iptables-ROUTE
+	cd ${WORKDIR}/${KV/12/11}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -118,24 +115,18 @@ src_unpack() {
 		done
 	fi
 
-	kernel_src_unpack
+	kernel_exclude
+	./addpatches . ${WORKDIR}/linux-${KV} || die "Could not add patches!"
+	kernel_universal_unpack || die "Could not unpack!"
 
 	epatch ${FILESDIR}/security.patch1
 	epatch ${FILESDIR}/security.patch2
 	epatch ${FILESDIR}/security.patch3
 	epatch ${FILESDIR}/security.patch4
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-gcc33.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-cs46xx-gcc33.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-grsec-datasize_fix.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-grsec-disabled.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-sched-interrupt.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-ipt-realm.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-hpt372.patch
 
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
 	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
+	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-rtc_fix.patch || die "Failed to apply RTC fix!"
 
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild
index 705c523c2e01..0d84b2d41f98 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild,v 1.3 2004/01/19 02:21:34 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild,v 1.4 2004/02/16 16:12:00 plasmaroo Exp $
 
-UNIPATCH_LIST="${DISTDIR}/gentoo-sources-${PVR}.patch.bz2"
+UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR}.patch.bz2"
 ETYPE="sources"
 
 inherit kernel-2
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild
new file mode 100644
index 000000000000..51a405cecbc5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild,v 1.1 2004/02/16 16:12:00 plasmaroo Exp $
+
+UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR/6/5}.patch.bz2"
+ETYPE="sources"
+
+inherit kernel-2
+detect_version
+
+#RESTRICT="nomirror"
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the Gentoo Kernel."
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/6/5}.patch.bz2"
+KEYWORDS="~amd64 -*"
+SLOT="${KV}"
+
+K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
+existing bug. Only create a new bug if you have not found one that matches
+your issue. It is best to do an advanced search as the initial search has a
+very low yield. Please assign your bugs to x86-kernel@gentoo.org.
+Please read the ChangeLog and associated docs for more information."
+