14 files changed, 21 insertions, 200 deletions
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 00a97b8b6301..508fc3865b21 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,12 +1,7 @@
-MD5 03fef81ca65c5f730043c2c2fd23d34b ck-sources-2.4.22-r2.ebuild 2632
-MD5 f3990b8e6a35f27568b0c43dac3ef281 ck-sources-2.4.22-r1.ebuild 2193
-MD5 991aa3206f9b5b48b9652ed90b8bfce1 ChangeLog 1696
+MD5 e6d869c0e9276d185a22614a3d32b56c ck-sources-2.4.22-r2.ebuild 2632
+MD5 22b810c8d6cb3feba96554d3d972a1fb ck-sources-2.4.22-r1.ebuild 2189
+MD5 fc60b5057b90eac33d550189ecb34c98 ChangeLog 2034
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 b158b725603472e30e52f216600e5101 files/digest-ck-sources-2.4.20-r1 133
-MD5 fc91f35cb1ab07c4283c4f9876dafe27 files/digest-ck-sources-2.4.20-r2 133
-MD5 25ee4a049baf96d63956a0e51dfc8089 files/digest-ck-sources-2.4.20-r3 133
-MD5 245e5edd7489202b100cd540b571fc77 files/digest-ck-sources-2.4.20-r4 133
-MD5 9723426ba61fa56ab9447e17e4fec490 files/digest-ck-sources-2.4.20-r6 133
 MD5 21de1cea06112ebc3b93be74f0cd68cd files/digest-ck-sources-2.4.22-r1 132
 MD5 82966f7b4b6e4528742eb1fb46a62565 files/digest-ck-sources-2.4.22-r2 285
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.20-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.20-r1.ebuild
deleted file mode 100644
index 07416b5e5e0b..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.4.20-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.20-r1.ebuild,v 1.6 2003/07/22 20:00:28 vapier Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-KV="2.4.20-ck1"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="-ck1"
-DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://members.optusnet.com.au/con.man/ck${PR/r/}_${OKV}.patch.bz2"
-
-KEYWORDS="x86 -ppc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	bzcat ${DISTDIR}/ck1_${OKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	kernel_universal_unpack
-}
-
-
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.20-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.20-r2.ebuild
deleted file mode 100644
index 61fa04c5eb26..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.4.20-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.20-r2.ebuild,v 1.4 2003/07/22 20:00:29 vapier Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-KV="2.4.20-ck${PR/r/}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="-ck${PR/r/}"
-DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${PR/r/}_${OKV}.patch.bz2"
-
-KEYWORDS="x86 -ppc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	bzcat ${DISTDIR}/ck${PR/r/}_${OKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	kernel_universal_unpack
-}
-
-
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.20-r3.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.20-r3.ebuild
deleted file mode 100644
index 5bdab60b5b80..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.4.20-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.20-r3.ebuild,v 1.3 2003/07/22 20:00:30 vapier Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-KV="2.4.20-ck${PR/r/}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="-ck${PR/r/}"
-DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${PR/r/}_${OKV}.patch.bz2"
-
-KEYWORDS="x86 -ppc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	bzcat ${DISTDIR}/ck${PR/r/}_${OKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	kernel_universal_unpack
-}
-
-
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.20-r4.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.20-r4.ebuild
deleted file mode 100644
index 566ce6a721bc..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.4.20-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.20-r4.ebuild,v 1.2 2003/07/22 20:00:30 vapier Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-KV="2.4.20-ck${PR/r/}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="-ck${PR/r/}"
-DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${PR/r/}_${OKV}.patch.bz2"
-
-KEYWORDS="x86 -ppc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	bzcat ${DISTDIR}/ck${PR/r/}_${OKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	kernel_universal_unpack
-}
-
-
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.20-r6.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.20-r6.ebuild
deleted file mode 100644
index 6dc220d5f9e7..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.4.20-r6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.20-r6.ebuild,v 1.2 2003/07/22 20:00:30 vapier Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-KV="2.4.20-ck${PR/r/}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="-ck${PR/r/}"
-DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${PR/r/}_${OKV}.patch.bz2"
-
-KEYWORDS="x86 -ppc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	bzcat ${DISTDIR}/ck${PR/r/}_${OKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	kernel_universal_unpack
-}
-
-
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild
index 9591aead2aa8..489becdc2052 100644
--- a/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.4.22-r1.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/ck-sources/ck-sources-2.4.22-r1.ebuild,v 1.2 2003/09/09 08:52:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild,v 1.3 2003/12/01 22:32:55 iggy Exp $
 
 IUSE="build"
 
@@ -61,6 +61,8 @@ src_unpack() {
 
 	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-aa patch failed"
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild
index 443495429f21..888d0e924596 100644
--- a/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.4.22-r2.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/ck-sources/ck-sources-2.4.22-r2.ebuild,v 1.2 2003/10/21 10:37:00 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild,v 1.3 2003/12/01 22:32:55 iggy Exp $
 
 IUSE="build"
 
@@ -68,6 +68,8 @@ src_unpack() {
 	epatch ${DISTDIR}/patch-2.4.22-ck2-fix.patch
 	epatch ${DISTDIR}/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r1
deleted file mode 100644
index ff4d3d4ecb94..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 7bde6009cbdad4aa3eed6c5e50a6de26 ck1_2.4.20.patch.bz2 2199194
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r2
deleted file mode 100644
index 57b11af92678..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 94f771014a4f0de8e1abbd83b0371fa8 ck2_2.4.20.patch.bz2 2210046
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r3 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r3
deleted file mode 100644
index 163e46535321..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 43a8d339958b7f1906df00644f3263d5 ck3_2.4.20.patch.bz2 1397998
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r4 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r4
deleted file mode 100644
index cf16065c56a9..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 711f2443fb471404077403bfe3253f9b ck4_2.4.20.patch.bz2 1429780
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r6 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r6
deleted file mode 100644
index 7f5f55f48ea7..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.20-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 8e9ba29f0304c122099563aedf242b83 ck6_2.4.20.patch.bz2 1282791
diff --git a/sys-kernel/ck-sources/files/do_brk_fix.patch b/sys-kernel/ck-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/ck-sources/files/do_brk_fix.patch
@@ -0,0 +1,12 @@
+--- a/mm/mmap.c Fri Sep 12 06:44:06 2003
++++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
+@@ -1041,6 +1041,9 @@
+	if (!len)
+		return addr;
+ 
++ 	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
++ 		return -EINVAL;
++ 
+	/*
+	 * mlock MCL_FUTURE?
+	 */