security bump for 2.6.14 and new ck1 for 2.6.15

Package-Manager: portage-2.0.51.22-r3

7 files changed, 85 insertions, 16 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index b30605c80398..5174b8a1d2e3 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/ck-sources
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.127 2005/12/29 21:12:23 marineam Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.128 2006/01/05 08:42:12 marineam Exp $
+
+*ck-sources-2.6.15_p1 (05 Jan 2006)
+*ck-sources-2.6.14_p8 (05 Jan 2006)
+
+  05 Jan 2006; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.14_p7.ebuild, +ck-sources-2.6.14_p8.ebuild,
+  +ck-sources-2.6.15_p1.ebuild:
+  Bump to 2.6.14-ck8+genpatches-8 for security bug #103553. The security fix
+  is the only change as I had already included 2.6.14.5 with ck7.
+  Add 2.6.15-ck1+genpatches-1, Closes bug #116484.
 
 *ck-sources-2.6.14_p7 (29 Dec 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 3e4b15de0e32..b5acf9bc1b99 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 ba3cc48a50597a216a92fa1b9abc33c2 ck-sources-2.6.14_p8.ebuild 1517
 MD5 42426056220aa97c9dc53264baad870f ck-sources-2.6.13_p8.ebuild 1531
-MD5 1419d8e9e16c3bec7145fdf8b39df6df ck-sources-2.6.14_p7.ebuild 1542
-MD5 4f594c8ed7b80b52f160309a95b86c89 ChangeLog 28662
+MD5 5a803d0035c0ad5a6e81031dd25fde35 ChangeLog 29078
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
+MD5 ead45cc76912876e6017c8bf63347990 ck-sources-2.6.15_p1.ebuild 1517
 MD5 a457c5f0415080b6b16dad6f8d700fcf files/digest-ck-sources-2.6.13_p8 278
-MD5 5c6134b9fc5d20c48b883d607e40e68c files/digest-ck-sources-2.6.14_p7 272
+MD5 f3634247bd8dca4785a68f4dfccfcc77 files/digest-ck-sources-2.6.14_p8 272
+MD5 952dac91a0bdf0ab9a6d7a62ba45b66b files/digest-ck-sources-2.6.15_p1 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDtFFEiP+LossGzjARAsvAAJ0YQPt8rrktN8iK4X7cy4Kxzp+QigCgo3cx
-+oGfKUL+E1gj64dyIRHKGKo=
-=tGlX
+iD8DBQFDvNvyiP+LossGzjARAuL/AJ4xHDrg902G+r65QmcxIMmCznaL/gCgsUvB
+/GcDQAid6UrGAl4Y9NK9Iw8=
+=8oO9
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.14_p7.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.14_p8.ebuild
index 6cf2a8932cfc..e8b96ef50462 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.14_p7.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.14_p8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.14_p7.ebuild,v 1.1 2005/12/29 21:12:23 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.14_p8.ebuild,v 1.1 2006/01/05 08:42:12 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 K_NOUSENAME="yes"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="7"
+K_GENPATCHES_VER="8"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -29,7 +29,7 @@ fi
 
 UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
 # Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
-UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10*_1_ 10*_2_ 10*_3_ 10*_4_"
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10"
 
 DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high
 performance patchset and Gentoo's basic patchset."
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.15_p1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.15_p1.ebuild
new file mode 100644
index 000000000000..f16be3f07eb0
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.6.15_p1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.15_p1.ebuild,v 1.1 2006/01/05 08:42:12 marineam Exp $
+
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+# A few hacks to set ck version via _p instead of -r
+MY_P=${P/_p*/}
+MY_PR=${PR/r/-r}
+MY_PR=${MY_PR/-r0/}
+EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
+KV_FULL=${OKV}${EXTRAVERSION}
+KV_CK=${KV_FULL/-r*/}
+detect_version
+
+IUSE="ck-server"
+if use ck-server; then
+	CK_PATCH="patch-${KV_CK/ck/cks}.bz2"
+else
+	CK_PATCH="patch-${KV_CK}.bz2"
+fi
+
+UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
+# Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10"
+
+DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high
+performance patchset and Gentoo's basic patchset."
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
+	ck-server? (
+	http://ck.kolivas.org/patches/cks/patch-${KV_CK/ck/cks}.bz2
+	)
+	!ck-server? (
+	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+pkg_postinst() {
+	postinst_sources
+
+	einfo "The ck patchset is tuned for desktop usage."
+	einfo "To better tune the kernel for server applications add"
+	einfo "ck-server to your use flags and reemerge ck-sources"
+}
+
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p7 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p7
deleted file mode 100644
index 300e77b21b4a..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-MD5 6089934d545add3a13cda2b32127af95 genpatches-2.6.14-7.base.tar.bz2 52548
-MD5 cbef4baff12056098aeebc413767517e patch-2.6.14-cks7.bz2 44772
-MD5 ebd3bdd50f17601b4d8a073e87ec9325 patch-2.6.14-ck7.bz2 45512
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8
new file mode 100644
index 000000000000..4832a898f111
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8
@@ -0,0 +1,4 @@
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+MD5 ff911a951afb455c13fd22f8a15a7444 genpatches-2.6.14-8.base.tar.bz2 53291
+MD5 72237aff0f784d2a97aa4415032a068e patch-2.6.14-cks8.bz2 48831
+MD5 83ce46bbff5f0c3f984afa013c334f83 patch-2.6.14-ck8.bz2 48802
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p1
new file mode 100644
index 000000000000..25c92b28a69f
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p1
@@ -0,0 +1,4 @@
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+MD5 2bbead9c7758b5180b2798fb8173659f genpatches-2.6.15-1.base.tar.bz2 2450
+MD5 3af70243e199fb70d5c80a05dfe0e904 patch-2.6.15-cks1.bz2 26504
+MD5 be4cddaf044718cd7f4103f38cd187c7 patch-2.6.15-ck1.bz2 39668