commit security vuln fixes

6 files changed, 126 insertions, 9 deletions

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index c4f24ad2040d..21e9b7c3a248 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.17 2004/01/04 22:40:52 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.18 2004/01/05 18:19:56 brad_mssw Exp $
+
+  05 Jan 2004; Brad House <brad_mssw@gentoo.org>
+  gentoo-dev-sources-2.6.1_rc1.ebuild:
+  bump versions for security vulnerabilities
 
   04 Jan 2004; Brad House <brad_mssw@gentoo.org>
   gentoo-dev-sources-2.6.1_rc1.ebuild:
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index abc72f273ae8..8b83ccf04097 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 427c8d30e5489b9f68b5a203ae38f794 ChangeLog 3776
+MD5 1e082240fabab6c9da46fbc67909291c ChangeLog 3910
 MD5 28dbb115d7c9f2c982087a556028a54f gentoo-dev-sources-2.6.0.ebuild 3294
 MD5 3aa2de29714ded6575c28ef08452319c gentoo-dev-sources-2.6.0_beta10-r1.ebuild 3023
 MD5 a4d672f58dc685b5403312ae1e9db563 gentoo-dev-sources-2.6.0_beta10.ebuild 2632
@@ -8,7 +8,8 @@ MD5 e47d675b21d3c3c710142ecebd3b9039 gentoo-dev-sources-2.6.0_beta11.ebuild 3216
 MD5 6f63cb99dc8533aeca57408321c91cd1 gentoo-dev-sources-2.6.0_beta9.ebuild 2352
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
 MD5 438d333157b562dd25e5a83b51941b41 gentoo-dev-sources-2.6.0-r1.ebuild 3300
-MD5 a26b23b7f74d74f748953cfcd72538bb gentoo-dev-sources-2.6.1_rc1.ebuild 4612
+MD5 58da039d101e02b201dee2768a74edaa gentoo-dev-sources-2.6.1_rc1.ebuild 4661
+MD5 0991f5bb469f48fc6c5aaf65b59a6cb8 gentoo-dev-sources-2.6.0-r2.ebuild 3360
 MD5 0bb5e60d954d4e595f357475973e279f files/digest-gentoo-dev-sources-2.6.0 137
 MD5 8ddadf31b5dcf41e4a17ba7b2e7f4ac1 files/digest-gentoo-dev-sources-2.6.0_beta10 144
 MD5 c242a7844916262f087398b60ec62705 files/digest-gentoo-dev-sources-2.6.0_beta10-r1 144
@@ -17,4 +18,5 @@ MD5 1a88dcc33b21c4109ce7cf693b43b974 files/digest-gentoo-dev-sources-2.6.0_beta1
 MD5 d472f52790525a410af311ff82b4e179 files/digest-gentoo-dev-sources-2.6.0_beta11-r2 144
 MD5 2c930a031439b36d073cdbadc16a5bbc files/digest-gentoo-dev-sources-2.6.0_beta9 142
 MD5 8104284047ea615d1ddcd79fa96e65fc files/digest-gentoo-dev-sources-2.6.0-r1 138
-MD5 e27b125e5a8e9dc36a751a35dec63753 files/digest-gentoo-dev-sources-2.6.1_rc1 202
+MD5 049cf3bb4dbeb55995bad1459931c3b5 files/digest-gentoo-dev-sources-2.6.1_rc1 202
+MD5 431365284a32022d85e669a6e204002b files/digest-gentoo-dev-sources-2.6.0-r2 140
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0-r2 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0-r2
new file mode 100644
index 000000000000..790260ffb623
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0-r2
@@ -0,0 +1,2 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
+MD5 904711d4633f5daa38252c40d86e3fe0 genpatches-2.6-0.10.5.tar.bz2 504363
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1_rc1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1_rc1
index 18929e2276b5..59e713763fa0 100644
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1_rc1
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1_rc1
@@ -1,3 +1,3 @@
 MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
 MD5 c3d3c57560c53b86709477f38621d9d5 patch-2.6.1-rc1.bz2 726490
-MD5 28eab055adc46230cb3b62dbe505bf8d genpatches-2.6-1.11.tar.bz2 495158
+MD5 9d48ab85c8e7a4af8fa70633d24e5d7a genpatches-2.6-1.12.tar.bz2 495009
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r2.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r2.ebuild
new file mode 100644
index 000000000000..7c5502407345
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r2.ebuild
@@ -0,0 +1,109 @@
+# 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-dev-sources/gentoo-dev-sources-2.6.0-r2.ebuild,v 1.1 2004/01/05 18:19:56 brad_mssw Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+
+#Original Kernel Version before Patches
+# eg: 2.6.0-test8
+OKV=${PV/_beta/-test}
+OKV=${OKV/-r*//}
+
+#version of gentoo patchset
+GPV=0.10.5
+
+[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
+KV=${OKV}${EXTRAVERSION}
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/DO_NOT_UPLOAD_TO_MIRRORS_WITHOUT_ASKING_ME_FIRST/genpatches-2.6-${GPV}.tar.bz2"
+#GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+	 ${GPV_SRC}"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-*"
+#KEYWORDS="-* ~x86 ~amd64 ~mips ~hppa ~sparc ~alpha"
+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.
+	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
+	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
+		 sys-devel/make
+		 sys-apps/module-init-tools"
+fi
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack genpatches-2.6-${GPV}.tar.bz2
+	unpack linux-${OKV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
+	cd ${S}
+
+	# apply gentoo patches
+	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
+	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
+	for file in ${PATCHES}
+	do
+		epatch $file
+	done
+
+	# Our EXTRAVERSION needs to be appended to the end for the Makefile
+	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
+	-e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1${EXTRAVERSION}:" Makefile > Makefile.new
+
+#	rm -f Makefile
+#	mv Makefile.new Makefile
+
+	kernel_universal_unpack
+
+	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
+	rm -f Makefile
+	mv Makefile.new Makefile
+}
+
+pkg_install() {
+	kernel_src_install
+}
+
+pkg_postinst() {
+	kernel_pkg_postinst
+
+	if [ ! -h "/usr/src/linux-beta" ]
+	then
+		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux-beta
+	fi
+
+	if [ ! -h "/usr/src/linux" ]
+	then
+		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux
+	fi
+
+	# Don't forget to make directory for sysfs
+	if [ ! -d "/sys" ]
+	then
+		mkdir /sys
+	fi
+
+	echo
+	eerror "IMPORTANT:"
+	eerror "ptyfs support has now been dropped from devfs and as a"
+	eerror "result you are now required to compile this support into"
+	eerror "the kernel. You can do so by enabling the following option"
+	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
+	echo
+	eerror "To prevent the problem while uncompressing the kernel image"
+	eerror "you should also enable:"
+	eerror "	Input Devices (Input Device Support -> Input Devices),"
+	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
+	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
+	eerror "	vt_console (Character Devices -> Support for Console...)."
+	echo
+}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild
index d40c8efaa873..77dab3912d2b 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild,v 1.3 2004/01/04 22:40:52 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild,v 1.4 2004/01/05 18:19:56 brad_mssw Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -27,7 +27,7 @@ fi
 
 #version of gentoo patchset
 # set to 0 for no patchset
-GPV=1.11
+GPV=1.12
 
 [ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
 KV=${OKV}${EXTRAVERSION}
@@ -39,7 +39,7 @@ HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 
 if [ "${GPV}" != "0" ]
 then
-	GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/genpatches-2.6-${GPV}.tar.bz2"
+	GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/DO_NOT_UPLOAD_TO_MIRRORS_WITHOUT_ASKING_ME_FIRST/genpatches-2.6-${GPV}.tar.bz2"
 #	GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
 fi
 if [ "${KEXT}" != "" ]