Version bumped, cleaned old pre-releases, and added the fix for the ptrace vulnerability for AMD64 platforms.

8 files changed, 42 insertions, 101 deletions

diff --git a/sys-kernel/vanilla-prepatch-sources/ChangeLog b/sys-kernel/vanilla-prepatch-sources/ChangeLog
index 79373993d4eb..18475b969a17 100644
--- a/sys-kernel/vanilla-prepatch-sources/ChangeLog
+++ b/sys-kernel/vanilla-prepatch-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/vanilla-prepatch-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/ChangeLog,v 1.27 2004/02/12 09:42:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/ChangeLog,v 1.28 2004/02/16 15:36:06 plasmaroo Exp $
+
+*vanilla-prepatch-sources-2.4.25_rc3 (16 Feb 2004)
+
+  16 Feb 2004; <plasmaroo@gentoo.org>
+  vanilla-prepatch-sources-2.4.25_pre*.ebuild removed,
+  vanilla-prepatch-sources-2.4.25_rc3.ebuild added,
+  files/vanilla-prepatch-sources.CAN-2004-0001.patch:
+  Version bump, removed stale pre-releases and added the fix for the ptrace
+  vulnerability for AMD64 platforms.
 
 *vanilla-prepatch-sources-2.4.25_rc2 (12 Feb 2004)
 
diff --git a/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre7 b/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre7
deleted file mode 100644
index d4e9e6894f5b..000000000000
--- a/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 c43e058204fac051318a8e7844b38605 patch-2.4.25-pre7.bz2 1722306
diff --git a/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre8 b/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre8
deleted file mode 100644
index 1945a6bf4a04..000000000000
--- a/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 1cc7ebb245a2ce12fb1de519837473fe patch-2.4.25-pre8.bz2 1848890
diff --git a/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre4 b/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_rc3
index e5d048e5aad1..4f2057e3352e 100644
--- a/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_pre4
+++ b/sys-kernel/vanilla-prepatch-sources/files/digest-vanilla-prepatch-sources-2.4.25_rc3
@@ -1,2 +1,2 @@
 MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 b692251fb1f0852621dd2408485caab5 patch-2.4.25-pre4.bz2 1353580
+MD5 7ef89b79d6f4832e305e0a31500214d6 patch-2.4.25-rc3.bz2 1853950
diff --git a/sys-kernel/vanilla-prepatch-sources/files/vanilla-prepatch-sources.CAN-2004-0001.patch b/sys-kernel/vanilla-prepatch-sources/files/vanilla-prepatch-sources.CAN-2004-0001.patch
new file mode 100644
index 000000000000..bb51f9aa9a62
--- /dev/null
+++ b/sys-kernel/vanilla-prepatch-sources/files/vanilla-prepatch-sources.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/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre4.ebuild b/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre4.ebuild
deleted file mode 100644
index 4ccb0c7682be..000000000000
--- a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre4.ebuild,v 1.1 2004/01/07 16:07:18 plasmaroo Exp $
-
-IUSE="build"
-
-ETYPE="sources"
-inherit kernel
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-OKV=2.4.24
-KV="${PV/_/-}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for the prerelease vanilla Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="${KV}"
-
-# We'll see how not mirroring kernels goes over with the mirrors
-restrict="nomirror"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "Failed to apply patch!"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	einfo "Prepatches are the equivalent to alpha releases for Linux."
-	einfo "They may be poorly tested, and may not work at all."
-	einfo "Prepatches with -rc in the name are release candidates and"
-	einfo "may become full versions.  It is particularly important"
-	einfo "that these are thoroughly tested and bugs are reported back"
-	einfo "upstream (and not to the Gentoo team)."
-}
diff --git a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre8.ebuild b/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre8.ebuild
deleted file mode 100644
index 2ef57d16e472..000000000000
--- a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre8.ebuild,v 1.1 2004/01/30 23:54:03 spock Exp $
-
-IUSE="build"
-
-ETYPE="sources"
-inherit kernel
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-OKV=2.4.24
-KV="${PV/_/-}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for the prerelease vanilla Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="${KV}"
-
-# We'll see how not mirroring kernels goes over with the mirrors
-restrict="nomirror"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "Failed to apply patch!"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	einfo "Prepatches are the equivalent to alpha releases for Linux."
-	einfo "They may be poorly tested, and may not work at all."
-	einfo "Prepatches with -rc in the name are release candidates and"
-	einfo "may become full versions.  It is particularly important"
-	einfo "that these are thoroughly tested and bugs are reported back"
-	einfo "upstream (and not to the Gentoo team)."
-}
diff --git a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre7.ebuild b/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_rc3.ebuild
index 7bcf5436244d..e8100977f7ae 100644
--- a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre7.ebuild
+++ b/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_rc3.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/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_pre7.ebuild,v 1.1 2004/01/26 11:12:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.25_rc3.ebuild,v 1.1 2004/02/16 15:36:06 plasmaroo Exp $
 
 IUSE="build"
 
@@ -33,6 +33,7 @@ src_unpack() {
 
 	cd linux-${KV}
 	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "Failed to apply patch!"
+	patch -p1 -f < ${FILESDIR}/${PN}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
 
 	kernel_universal_unpack
 }