Removed old -test7, bumped to -rc1 to close #37310 and added the mremap(2) patch against -rc1 for security.

5 files changed, 54 insertions, 32 deletions

diff --git a/sys-kernel/development-sources/Manifest b/sys-kernel/development-sources/Manifest
index 736bafef92b1..c1b3f4e53e40 100644
--- a/sys-kernel/development-sources/Manifest
+++ b/sys-kernel/development-sources/Manifest
@@ -1,6 +1,6 @@
-MD5 a00f5613bfc1d1ea3ee533715f6fe768 ChangeLog 12109
+MD5 3a9de5ec1cd4843d11e0e1477f9650a9 ChangeLog 12112
 MD5 854abf2bdb617fe8c7de18312a60bb85 metadata.xml 442
-MD5 667eea19cc0881372b88ac92d49f5887 development-sources-2.6.1_rc1.ebuild 3502
+MD5 9785db32a3baed11804b3bfb074c9bb8 development-sources-2.6.1_rc1.ebuild 3506
 MD5 10cf70f8a5d46152c2b7bd3fa17ff7b2 development-sources-2.6.0_beta11.ebuild 4929
 MD5 fc184c339b6e767b30196b8bdbe72113 development-sources-2.6.0.ebuild 4220
 MD5 b058d2842425a7a4bad9688d9e694309 files/digest-development-sources-2.6.0 66
diff --git a/sys-kernel/development-sources/development-sources-2.6.0_beta7.ebuild b/sys-kernel/development-sources/development-sources-2.6.1_rc1.ebuild
index 9e4cf445fadb..3e4b42ab4825 100644
--- a/sys-kernel/development-sources/development-sources-2.6.0_beta7.ebuild
+++ b/sys-kernel/development-sources/development-sources-2.6.1_rc1.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/development-sources-2.6.0_beta7.ebuild,v 1.3 2004/01/02 20:28:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/development-sources-2.6.1_rc1.ebuild,v 1.1 2004/01/05 21:12:59 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
-OKV=${PV/_beta/-test}
-KV=${PV/_beta/-test}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
+OKV=${PV/_rc/-rc}
 
-# What's in this kernel?
+KV=${PV/_beta/-test}
+KV=${KV/_rc/-rc}
 
-# INCLUDED:
-# beta ${PV} linux kernel sources with
+GPV=0
+ETYPE="sources"
+S=${WORKDIR}/linux-${OKV}
 
 DESCRIPTION="Full sources for the Development Branch of the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 ${PATCH_URI}"
-PROVIDE="virtual/linux-sources"
-[ -n "$(use alsa)" ] && PROVIDE="${PROVIDE} virtual/alsa"
+
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="~x86 ~ppc ~amd64 ~alpha"
+KEYWORDS="-* x86 amd64"
+PROVIDE="virtual/linux-sources virtual/alsa"
 
 if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
 then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
+	# console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
 	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
 	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
 		 sys-devel/make
@@ -37,17 +36,25 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack linux-${OKV}.tar.bz2
 
-	cd ${S}
+	if [ ! ${KV} == ${OKV} ]
+	then
+		mv linux-${OKV} linux-${KV}
+		S=${WORKDIR}/linux-${KV}
+	fi
 
+	cd ${S}
 	unset ARCH
-	#sometimes we have icky kernel symbols; this seems to get rid of them
+
+	# Patch
+	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch
+
+	# Sometimes we have icky kernel symbols; this seems to get rid of them
 	make mrproper || die
 
-	#fix silly permissions in tarball
+	# Fix silly permissions in tarball
 	cd ${WORKDIR}
 	chown -R 0:0 *
 	chmod -R a+r-w+X,u+w *
-
 }
 
 src_compile() {
@@ -84,19 +91,18 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux-beta ]
-	then
 
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
+	[ "$ETYPE" = "headers" ] && return
+	[ ! ${GPV} == 0 ] && KV="${KV}-patchset-${GPV}"
+	[ ! -e "${ROOT}usr/src/linux-beta" ] && ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
+	[ ! -e "${ROOT}usr/src/linux" ] && ln -sf linux-${KV} ${ROOT}/usr/src/linux
+	mkdir -p ${ROOT}sys
 
-	echo
 	ewarn "Please note that ptyfs support has been removed from devfs"
-	ewarn "in the later 2.5.x kernels, and you have to compile it in now,"
-	ewarn "or else you will get errors when trying to open a pty."
-	ewarn "The option is File systems->Pseudo filesystems->/dev/pts"
-	ewarn "filesystem."
+	ewarn "and you have to compile it in now, or else you will get"
+	ewarn "errors when trying to open a pty. The options are:"
+	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
+	ewarn "File systems -> Pseudo filesystems -> /dev/pts filesystem."
 	echo
 	ewarn "Also, note that you must compile in support for"
 	ewarn "input devices (Input device support->Input devices),"
@@ -106,7 +112,10 @@ pkg_postinst() {
 	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""
 	ewarn "error."
 	echo
-	einfo "Consult http://www.codemonkey.org.uk/post-halloween-2.5.txt"
-	einfo "for more info about the development series."
+	einfo "This kernel is patched against the mremap(2) vulnerability..."
 	echo
+	ewarn "PLEASE NOTE THIS IS NOT OFFICIALLY SUPPORTED BY GENTOO."
+	echo
+	sleep 5
+
 }
diff --git a/sys-kernel/development-sources/files/development-sources-2.6.1_rc1.CAN-2003-0985.patch b/sys-kernel/development-sources/files/development-sources-2.6.1_rc1.CAN-2003-0985.patch
new file mode 100644
index 000000000000..eb1c9d26b3d5
--- /dev/null
+++ b/sys-kernel/development-sources/files/development-sources-2.6.1_rc1.CAN-2003-0985.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -270,6 +270,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!(old_len | new_len))
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/development-sources/files/digest-development-sources-2.6.0_beta7 b/sys-kernel/development-sources/files/digest-development-sources-2.6.0_beta7
deleted file mode 100644
index 6abde0336f6a..000000000000
--- a/sys-kernel/development-sources/files/digest-development-sources-2.6.0_beta7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5418d065d8669c5ce9924eb4cf49024 linux-2.6.0-test7.tar.bz2 33139549
diff --git a/sys-kernel/development-sources/files/digest-development-sources-2.6.1_rc1 b/sys-kernel/development-sources/files/digest-development-sources-2.6.1_rc1
new file mode 100644
index 000000000000..46bb1fe9bfc5
--- /dev/null
+++ b/sys-kernel/development-sources/files/digest-development-sources-2.6.1_rc1
@@ -0,0 +1 @@
+MD5 5b8cbd68b11ec012a52b07cfed404a20 linux-2.6.1-rc1.tar.bz2 33173647