version bump for do_brk vuln

6 files changed, 232 insertions, 7 deletions

diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 183a66d22c89..b945ca0674ce 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,11 +1,11 @@
 MD5 f44bfa5126842e2f7868d584c7f9e6ea gentoo-sources-2.4.19-r10.ebuild 2357
-MD5 07f0fe1bd7907def41c2dc74f2c3395d gentoo-sources-2.4.20-r9.ebuild 5557
-MD5 c6d50d524d6105f3db59216a1429b41d gentoo-sources-2.4.22.ebuild 1916
+MD5 b1e426b49be86a5bf70077df574640f8 gentoo-sources-2.4.20-r9.ebuild 5557
+MD5 1af785c8a3f44b880753f316bb4970f3 gentoo-sources-2.4.22.ebuild 1911
 MD5 7288efba37e71ffde0785010a2d2433f gentoo-sources-2.4.20-r6.ebuild 4955
 MD5 32c2163cad1c7253c80be7b369602b92 gentoo-sources-2.4.20-r8.ebuild 5557
 MD5 688100a8740a8219b8cb91cb4b235abb gentoo-sources-2.4.20-r5.ebuild 4802
-MD5 c6d50d524d6105f3db59216a1429b41d gentoo-sources-2.4.22-r1.ebuild 1916
-MD5 b122032c469005da933e9db77f01e7ea ChangeLog 11733
+MD5 e78c1e83b00ba40b7000d7cf9fdd565c gentoo-sources-2.4.22-r1.ebuild 1915
+MD5 3e1e659a39ed17b0568a16e1942660ff ChangeLog 11953
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
 MD5 e762158a2758ae895aa519f6d3ccda00 gentoo-sources-2.4.20-r7.ebuild 5377
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r9 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r9
new file mode 100644
index 000000000000..ba471a1c8d80
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r9
@@ -0,0 +1,2 @@
+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.22-r1 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r1
new file mode 100644
index 000000000000..8adb5f50d147
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r1
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 e249d31ed9ea7a45ddeea35b3757fba7 gentoo-sources-2.4.22-r1.patch.bz2 3361146
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild
new file mode 100644
index 000000000000..3f32eca5be8c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2003 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-r9.ebuild,v 1.1 2003/12/02 19:41:26 iggy Exp $
+
+IUSE="build crypt evms2 aavm usagi"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
+# *evms*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+
+inherit kernel
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the Gentoo Kernel."
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${KV/9/5}.tar.bz2"
+HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
+LICENSE="GPL-2"
+KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
+SLOT="${KV}"
+
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
+
+	cd ${WORKDIR}/${KV/9/5}
+
+	# Move over new iptables-ROUTE patch
+	cp ${FILESDIR}/gentoo-sources-2.4.20-ipt-route.patch 727_iptables-ROUTE
+
+	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
+	if [ -z "`use aavm`" ]; then
+		einfo "Setting up kernel for rmap support(default)."
+		for file in *.aavm ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Setting up kernel for aavm support."
+		for file in *.rmap ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
+	# If the compiler isn't gcc>3.1 drop the gcc>=3.1 patches
+	if [[ "${COMPILER}" == "gcc3" ]]; then
+		einfo "Enabling gcc > 3.1 processor optimizations..."
+		einfo "To use them, choose the processor families labelled with (gcc>31)"
+		einfo "in \"Processor type and features -> Processor Family\""
+	else
+		einfo "Your compiler is not gcc3, dropping patches..."
+		for file in *gcc3*;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
+	# This is the *ratified* evms2 USE flag, enables evms2 support
+	if [ -z "`use evms2`" ]; then
+		einfo "Setting up kernel for EVMS 1.2.1 support (default)..."
+		for file in 2* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Setting up kernel for EVMS 2.0.1 support..."
+		ewarn "This is very beta. Please read the 'evms2' doc provided with this kernel."
+		ewarn "It is the install doc from the evms 2.0.1 tarball."
+		for file in 1* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
+	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
+	if [ -z "`use crypt`" ]; then
+		einfo "No Cryptographic support, dropping patches..."
+		for file in 6* 8* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Cryptographic patches will be applied."
+	fi
+
+	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-jari}
+	# Using USAGI will also cause you to drop all iptables ipv6 patches
+	if [ -z "`use usagi`" ]; then
+		einfo "Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI"
+		for file in 6* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Keeping USAGI patch, dropping {superfreeswan/patch-int/loop-jari}"
+		for file in *.ipv6 8* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
+	kernel_src_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}/do_brk_fix.patch
+
+}
+
+pkg_postinst() {
+
+	kernel_pkg_postinst
+
+	echo
+	ewarn "There is no xfs support in this kernel."
+	ewarn "If you need xfs support, emerge xfs-sources."
+	echo
+	ewarn "If iptables/netfilter behaves abnormally, such as 'Invalid Argument',"
+	ewarn "you will need to re-emerge iptables to restore proper functionality."
+	echo
+	einfo "This set contains the ptrace patch as part of grsecurity."
+	echo
+	einfo "If there are issues with it, read the docs and associated help provided."
+	einfo "Next you should check http://forums.gentoo.org/ for assistance."
+	echo
+	einfo "Otherwise check http://bugs.gentoo.org/ for an existing bug."
+	einfo "Only create a new bug if you have not found one that matches your issue."
+	einfo "It is best to do an advanced search to increase search yield."
+	echo
+	einfo "Please assign bugs to x86-kernel@gentoo.org"
+	echo
+	einfo "Please read the ChangeLog and associated docs for more information."
+	echo
+
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild
new file mode 100644
index 000000000000..ff965f197bae
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 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-r1.ebuild,v 1.1 2003/12/02 19:41:26 iggy Exp $
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+
+inherit kernel
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
+
+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}.patch.bz2"
+HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
+LICENSE="GPL-2"
+KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm ~amd64 ~ia64"
+SLOT="${KV}"
+
+
+src_unpack() {
+	unpack ${A}
+
+	mv linux-${OKV} linux-${KV} \
+		|| die "Error moving kernel source tree to linux-${KV}"
+
+	cd linux-${KV}
+
+	bzcat ${DISTDIR}/gentoo-sources-${PVR}.patch.bz2 | patch -p1 \
+		|| die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
+
+	#epatch ${FILESDIR}/do_brk_fix.patch
+
+	cd ${S}
+	make mrproper || die "make mrproper failed"
+	make include/linux/version.h || die "make include/linux/version.h failed"
+}
+
+pkg_postinst() {
+
+	kernel_pkg_postinst
+
+	einfo "If there are issues with this kernel, search http://bugs.gentoo.org/ for an"
+	einfo "existing bug. Only create a new bug if you have not found one that matches your"
+	einfo "issue. It is best to do an advanced search as the initial search has a very low"
+	einfo "yield. Assign bugs to x86-kernel@gentoo.org"
+	echo
+	einfo "Please read the changelog and associated docs for more information."
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild
index 05376db641da..70d0393433d8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.2 2003/12/01 21:59:51 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild,v 1.3 2003/12/02 19:41:26 iggy Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -19,7 +19,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	dev.gentoo.org/~iggy/gentoo-test-sources-${PVR}.patch.bz2"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR}.patch.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm ~amd64 ~ia64"
@@ -34,7 +34,7 @@ src_unpack() {
 
 	cd linux-${KV}
 
-	bzcat ${DISTDIR}/gentoo-test-sources-${PVR}.patch.bz2 | patch -p1 \
+	bzcat ${DISTDIR}/gentoo-sources-${PVR}.patch.bz2 | patch -p1 \
 		|| die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
 
 	epatch ${FILESDIR}/do_brk_fix.patch