Bump to 2.6.16.25; Fixing #140444 / CVE-2006-3626

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 82 insertions, 8 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index dd82bea0056b..864bd89a6c22 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.145 2006/07/09 23:32:22 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.146 2006/07/15 15:22:58 phreak Exp $
+
+*ck-sources-2.6.16_p12-r2 (15 Jul 2006)
+
+  15 Jul 2006; Christian Heim <phreak@gentoo.org>
+  +ck-sources-2.6.16_p12-r2.ebuild:
+  Bump to 2.6.16.25; Fixing #140444 / CVE-2006-3626
 
 *ck-sources-2.6.17_p1-r1 (09 Jul 2006)
 *ck-sources-2.6.16_p12-r1 (09 Jul 2006)
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 3efa46daf3fd..26a7e8713ffd 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 DIST genpatches-2.6.16-14.base.tar.bz2 98380 RMD160 55e5a8f6e26941ac711a7de788330ce72df75c14 SHA1 6379348e9a574d5f16a901942f5a9925d283a140 SHA256 d22239c02ca98557cd6e801918d1cd1e5734118bda805295ed32096ef09dab1b
+DIST genpatches-2.6.16-15.base.tar.bz2 98632 RMD160 46e8cfcae8fea262d7599c2e4d3e7fbc8af239b2 SHA1 e0f253ad01a4da388675af4b90223289d9bcd578 SHA256 fb78f2a4d32d1770a34d9ee254686a6a12102fa99c1bb73e9c282ab5f82dddaa
 DIST genpatches-2.6.17-3.base.tar.bz2 12926 RMD160 0f544a97835d33596fba55e49b087eaf02198adf SHA1 07a1f6eff84bad731ce483f98b8ac22684417798 SHA256 6309f3da37f991bf157cbdd903eb7a72135873824d6590b582cef1114640d928
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
 DIST linux-2.6.17.tar.bz2 41272919 RMD160 26aad30c9a6610665c6c7d62401d79bf56a6a699 SHA1 0605c975b9dead2af31a3decf09dd4138fadaf2b SHA256 ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
@@ -13,14 +14,18 @@ EBUILD ck-sources-2.6.16_p12-r1.ebuild 1533 RMD160 e804a6a7e176717b8825feb3c8ff2
 MD5 477cf67c9ac395734bbf0b1546083c62 ck-sources-2.6.16_p12-r1.ebuild 1533
 RMD160 e804a6a7e176717b8825feb3c8ff2ea6755bb489 ck-sources-2.6.16_p12-r1.ebuild 1533
 SHA256 ed831ac87eab82d1c7d48ef23a9503e8545faa33971ec76742acabe09fb42b0f ck-sources-2.6.16_p12-r1.ebuild 1533
+EBUILD ck-sources-2.6.16_p12-r2.ebuild 1531 RMD160 f2f14ea58895b373a573cd9c008e2ced9f6196e4 SHA1 17da318b71037519f89d81e7021ad491a09d6289 SHA256 8ebe4cacff798dbec8c6e290268875ee95eceea452bd8e2292a6f5f962e52866
+MD5 7e78378d134d3b3675815dd77c1d61f0 ck-sources-2.6.16_p12-r2.ebuild 1531
+RMD160 f2f14ea58895b373a573cd9c008e2ced9f6196e4 ck-sources-2.6.16_p12-r2.ebuild 1531
+SHA256 8ebe4cacff798dbec8c6e290268875ee95eceea452bd8e2292a6f5f962e52866 ck-sources-2.6.16_p12-r2.ebuild 1531
 EBUILD ck-sources-2.6.17_p1-r1.ebuild 1527 RMD160 ea4309b5c34261423159f9e3fc3f790229bfaf09 SHA1 395d163fd5606c1281ce785a758fa93b03c686dc SHA256 7170726cd2a29b4837887cf84b9cc5239194dedbb96b11a0b5fd786e3ef390e0
 MD5 a6a05ab71e666ec40b0b91d63d893a94 ck-sources-2.6.17_p1-r1.ebuild 1527
 RMD160 ea4309b5c34261423159f9e3fc3f790229bfaf09 ck-sources-2.6.17_p1-r1.ebuild 1527
 SHA256 7170726cd2a29b4837887cf84b9cc5239194dedbb96b11a0b5fd786e3ef390e0 ck-sources-2.6.17_p1-r1.ebuild 1527
-MISC ChangeLog 33143 RMD160 ac1de52cc7c9a60bd0612c831896909c9f9ee2cf SHA1 2324110c78dd0e0db21cf538e772721f45261306 SHA256 6de0ed373353b940d37459a740a014be8dea66ea16151c543113f70e276cbb5d
-MD5 7788689edc487c87749893658212074c ChangeLog 33143
-RMD160 ac1de52cc7c9a60bd0612c831896909c9f9ee2cf ChangeLog 33143
-SHA256 6de0ed373353b940d37459a740a014be8dea66ea16151c543113f70e276cbb5d ChangeLog 33143
+MISC ChangeLog 33321 RMD160 7f913a00a8c9e1ec30bdc7246cdfa3aa875a4dc6 SHA1 d7983ce7d700ddc0eb168694605628786ace1a56 SHA256 97f24902cbf62f22b5d4452e66fd3b3da9d45a8f971d86752ae625f69f295cc1
+MD5 adbf5dd734076c5f2ce7766a2b5fdcf3 ChangeLog 33321
+RMD160 7f913a00a8c9e1ec30bdc7246cdfa3aa875a4dc6 ChangeLog 33321
+SHA256 97f24902cbf62f22b5d4452e66fd3b3da9d45a8f971d86752ae625f69f295cc1 ChangeLog 33321
 MISC metadata.xml 421 RMD160 0fcd518d1a8ce5429bf05c108efeeabdc1384455 SHA1 91780b56a17c2e23e009d6970980b0d5143eb0b7 SHA256 d13ea243d1f31a49843f5187e923286ef023553d27dfee057a75ad93394bec66
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 RMD160 0fcd518d1a8ce5429bf05c108efeeabdc1384455 metadata.xml 421
@@ -28,13 +33,16 @@ SHA256 d13ea243d1f31a49843f5187e923286ef023553d27dfee057a75ad93394bec66 metadata
 MD5 39dda1fe7e4c0a58de00f4a153fc8305 files/digest-ck-sources-2.6.16_p12-r1 1015
 RMD160 083e32b2474a0bca4a3e213fd695f9c760953f97 files/digest-ck-sources-2.6.16_p12-r1 1015
 SHA256 ef4daf010ebf769c2a8124e34cb861a92004f6a970570501dfbf8358066f105a files/digest-ck-sources-2.6.16_p12-r1 1015
+MD5 02838fa39660274e5b7b54cca19e92a7 files/digest-ck-sources-2.6.16_p12-r2 1015
+RMD160 b81196b8967d18ade4fadd47402155d54206ed97 files/digest-ck-sources-2.6.16_p12-r2 1015
+SHA256 82066b1a88466f747befe6e5852f6119359e0ee874da68a38b475c4ab1efd5ca files/digest-ck-sources-2.6.16_p12-r2 1015
 MD5 923b9b4cc75651360a0f5f1de5c5780a files/digest-ck-sources-2.6.17_p1-r1 1000
 RMD160 85a38ee8c980a310ef91680c4f2479ea92d8354f files/digest-ck-sources-2.6.17_p1-r1 1000
 SHA256 cec5826d0fb363adfa2f45fe220c5768e6e743e3cd3d5c3ab1e78b2d7afefb25 files/digest-ck-sources-2.6.17_p1-r1 1000
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsZIgiP+LossGzjARAhGTAKCIPOaOKV+yc+3O5paRMfJJ4UVevgCfR7ww
-rGu9UaRIpqAAwzGPBTqQy7k=
-=kELX
+iD8DBQFEuQhoflZ8QqxhrsMRAuTeAKC1gaYsC3lqW7/qlThJGgBsmIWJtwCgxixY
+oS2yyHq1sM12aDR//NCbHGE=
+=eW6u
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.16_p12-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.16_p12-r2.ebuild
new file mode 100644
index 000000000000..49a063ba3f9a
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.6.16_p12-r2.ebuild
@@ -0,0 +1,48 @@
+# 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.16_p12-r2.ebuild,v 1.1 2006/07/15 15:22:58 phreak Exp $
+
+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/"
+IUSE="ck-server"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+K_NOUSENAME="yes"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="15"
+ETYPE="sources"
+inherit kernel-2
+
+detect_version
+# A few hacks to set ck version via _p instead of -r
+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*/}
+
+if use ck-server; then
+	UNIPATCH_LIST="${DISTDIR}/patch-${KV_CK/ck/cks}.bz2"
+else
+	UNIPATCH_LIST="${DISTDIR}/patch-${KV_CK}.bz2"
+fi
+
+# Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
+# new order of patches means some additional excludes.
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 100 101"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
+	ck-server? (
+	mirror://kernel/linux/kernel/people/ck/patches/cks/patch-${KV_CK/ck/cks}.bz2
+	)
+	!ck-server? (
+	mirror://kernel/linux/kernel/people/ck/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
+
+
+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.16_p12-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.16_p12-r2
new file mode 100644
index 000000000000..b6d0f262e5a9
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.16_p12-r2
@@ -0,0 +1,12 @@
+MD5 80f99e02526b3c82be494970c6e5925a genpatches-2.6.16-15.base.tar.bz2 98632
+RMD160 46e8cfcae8fea262d7599c2e4d3e7fbc8af239b2 genpatches-2.6.16-15.base.tar.bz2 98632
+SHA256 fb78f2a4d32d1770a34d9ee254686a6a12102fa99c1bb73e9c282ab5f82dddaa genpatches-2.6.16-15.base.tar.bz2 98632
+MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
+RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
+SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
+MD5 69e0f62d1b83d37529a487709b92eb64 patch-2.6.16-ck12.bz2 105490
+RMD160 79f84083f71bd575c115036e09201d03fb7b8248 patch-2.6.16-ck12.bz2 105490
+SHA256 357147717d0f3eaa0f6adf346e3d0ad8227fa4dbefe2b2ffe5659c0465863b33 patch-2.6.16-ck12.bz2 105490
+MD5 7995bce37441904fe9c750eefbe9c16d patch-2.6.16-cks12.bz2 105255
+RMD160 3362273f89cb0be0c187aa943abf2ec970f9c1ff patch-2.6.16-cks12.bz2 105255
+SHA256 ad29252917f9427f0b408d06983eeb521f02d56120b1ae7b82176c30403815ba patch-2.6.16-cks12.bz2 105255