version bump for do_brk vuln

4 files changed, 87 insertions, 3 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index f04c14e2fb42..ebd66acb08c8 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.12 2003/12/01 22:32:55 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.13 2003/12/02 20:04:46 iggy Exp $
+
+*ck-sources-2.4.22-r3 (02 Dec 2003)
+
+  02 Dec 2003; Brian Jackson <iggy@gentoo.org> ck-sources-2.4.22-r3.ebuild:
+  version bump for do_brk vuln
 
 *ck-sources-2.4.20-r2 (01 Dec 2003)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index e023a8764ae0..e4867f7db432 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 02fcc8d1f52e08d26f71d20e7d441675 ck-sources-2.4.22-r3.ebuild 2645
+MD5 26a42caa31c658da5824ff9848515a8c ck-sources-2.4.22-r3.ebuild 2645
 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 ef81574217e8485a68c268a12bcb0410 ChangeLog 2179
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 21de1cea06112ebc3b93be74f0cd68cd files/digest-ck-sources-2.4.22-r1 132
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r3.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r3.ebuild
new file mode 100644
index 000000000000..43281305f99b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.4.22-r3.ebuild
@@ -0,0 +1,75 @@
+# 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-r3.ebuild,v 1.1 2003/12/02 20:04:46 iggy Exp $
+
+IUSE="build"
+
+# OKV=original kernel version, KV=patched kernel version.  
+
+ETYPE="sources"
+
+inherit kernel
+
+# CKV=con kolivas release version
+CKV=ck${PR/r/}
+# KV=patched kernel version
+KV="${PV/_/-}-${CKV}"
+# OKV=original kernel version as provided by ebuild
+OKV="`echo ${KV} | cut -d- -f1`"
+# OKVLAST=(working) last digit of OKV
+OKVLAST="`echo ${OKV} | cut -d. -f3`"
+# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release)
+OKVLASTPR="`expr ${OKVLAST} - 1`"
+# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac
+PRERC="`echo ${PV}|grep \_`"
+
+# Other working variables
+S=${WORKDIR}/linux-${KV}
+EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
+BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
+
+# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently
+# ourkernel is the stable kernel we'll be working with (previous or current)
+if [ ${PRERC} ]; then
+	OURKERNEL="2.4.${OKVLASTPR}"
+	SRC_URI="mirror:/kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+		http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2
+		mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
+else
+	OURKERNEL="2.4.${OKVLAST}"
+##### Fix Me : grossness until these showstopper bugs are in a full -ck patch
+	SRC_URI="mirror:/kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+		http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2.4.22-ck2-fix.patch
+		http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736
+		http://ck.kolivas.org/patches/2.4/${BASE}/${KV/3/2}/patch-${KV/3/2}.bz2"
+		#http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2"
+fi
+
+DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+
+KEYWORDS="x86 -ppc"
+SLOT="${KV}"
+
+src_unpack() {
+	#sleep 1
+	unpack linux-${OURKERNEL}.tar.bz2
+	mv linux-${OURKERNEL} linux-${KV} || die
+
+	cd linux-${KV}
+
+	# if we need a pre/rc patch, then use it
+	if [ ${PRERC} ]; then
+		bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
+	fi
+
+	bzcat ${DISTDIR}/patch-${KV/3/2}.bz2|patch -p1 || die "-ck patch failed"
+
+	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.22-r3 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r3
new file mode 100644
index 000000000000..0fc27b988908
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r3
@@ -0,0 +1,4 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 ca3a289c94b170aa0f559f18dffc00a8 patch-2.4.22-ck2-fix.patch 2267
+MD5 76983144a5d010166f6b1f5d18ec258e patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 4355
+MD5 3d67f41ed121ebb2a4f71945ae9cfd55 patch-2.4.22-ck2.bz2 813552