security fix for CVE-2009-2692, see bug #281391

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 23 insertions, 46 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index a145f01e7b72..646861b7ccd3 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/vserver-sources
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.146 2009/06/28 16:55:33 hollow Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.147 2009/08/25 07:19:05 hollow Exp $
+
+*vserver-sources-2.3.0.36.14-r1 (25 Aug 2009)
+*vserver-sources-2.2.0.7-r1 (25 Aug 2009)
+
+  25 Aug 2009; Benedikt Böhm <hollow@gentoo.org>
+  +vserver-sources-2.2.0.7-r1.ebuild, -vserver-sources-2.3.0.34.ebuild,
+  -vserver-sources-2.3.0.35.6.ebuild, -vserver-sources-2.3.0.36.4.ebuild,
+  +vserver-sources-2.3.0.36.14-r1.ebuild:
+  security fix for CVE-2009-2692, see bug #281391
 
 *vserver-sources-2.3.0.36.14 (28 Jun 2009)
 
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index aaeb06c436b2..5c850fabc4f0 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -1,24 +1,18 @@
 DIST genpatches-2.6.22-11.base.tar.bz2 88451 RMD160 1456b53f9e09b2cd7156eeb512fb36240d467b9e SHA1 1a842f0b0fed20b31c24c2944ba1d6e8f6be713b SHA256 e02778ee0ec141dd84528247cbe49b826df34b2824f7791a71fd3374a3bcd5ca
 DIST genpatches-2.6.22-11.extras.tar.bz2 67967 RMD160 b9257abf735b8a97aa17efb2f6a761ab849c6852 SHA1 3d78df16bdf174cb26450f4bd74d0c337a957fff SHA256 4b39c0ac2873572a006cc38db80279f701982c604627ef192447dbcbb3b13545
-DIST genpatches-2.6.26-3.base.tar.bz2 110317 RMD160 09e71a575ac26ae75b3336d2a5cd11f3c6818c6b SHA1 6b342afe5b9d31d48f1e93e32021c9140a8afd40 SHA256 a858f79088f6c914254a022a9afd6b508a838fc9a7262eb758bc0b97f56610a3
-DIST genpatches-2.6.26-3.extras.tar.bz2 41342 RMD160 1273b577012f1047f2dfff60afc2dfda16756c1e SHA1 cdf5503702804c09251b368ddf4118388020fda1 SHA256 e69683f14fc7155ba2b9049ad08dc59b91d3920caefab82f24d8f843fae350f0
-DIST genpatches-2.6.28-1.base.tar.bz2 7410 RMD160 70f0b01b5e5cae6f01cfa202219b1e5503c6fea2 SHA1 de553ff85be1619f5679c9a6c3eaf867380ead3d SHA256 fedfe7b685786733f259bbed106bf37c85e8561cb4b5a28e3c3902bf9e8bc361
-DIST genpatches-2.6.28-1.extras.tar.bz2 41314 RMD160 58a67311e49d68a62256143af166d362e501f43d SHA1 8219f7c373341bf07651960490a8ec636254ed64 SHA256 a19f6757e0a70c076012f51bfc366efe95f61d5f402d407cac95c13b919397dd
 DIST genpatches-2.6.29-7.base.tar.bz2 100772 RMD160 4f91130b79aebc13691440aa7cbc1115d2002976 SHA1 0c4db5e602991fc183935438102eb09b93250d91 SHA256 05e7e7bffc2a5e10872fdbd23e3eca1b85aeedf618a9ebb2ab90b7d013e4e523
 DIST genpatches-2.6.29-7.extras.tar.bz2 24650 RMD160 83ff041d4116b2364ab0dc1942c16c8395f9e08c SHA1 e3b480ff3c4b34907df9c21759c9e594774a700e SHA256 056665a12ef74884943c5e933cf68468f4101da4f9786c8db0222fe374b8273f
+DIST genpatches-2.6.29-9.base.tar.bz2 135068 RMD160 8c41c8e6565cbca33fda343da66c5d576f8a9443 SHA1 86f57548dcc187af6e3f8e106963e723191f5511 SHA256 3ec240d83349750aad60fda06189987a6665778052835c81dde5318ee75ed67f
+DIST genpatches-2.6.29-9.extras.tar.bz2 24668 RMD160 c76d657aefd4df783991d70d5ffc60c9e61d4e91 SHA1 fe482457234c728381f387af4eb3789c3a1db2f5 SHA256 e6c0f62e63f7e924827a38672fc631e58950bf37c4c8f34028ab50a95a0f4133
 DIST linux-2.6.22.tar.bz2 45119878 RMD160 c4b2ca5ee8e71c0f8f1c95f3c9c5f261f2785912 SHA1 39401f195a618f397312d6d84ff9aebe28d99381 SHA256 73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
-DIST linux-2.6.26.tar.bz2 49441874 RMD160 57c37e81afa48e7c05e1a933d390a12ac2921255 SHA1 3f44384bf84f27add3b6c43ec68f974d7f7e9c67 SHA256 666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a
-DIST linux-2.6.28.tar.bz2 52665364 RMD160 47e8925220e29e239f9478228fc53543c1f7b300 SHA1 4f40f8bf3fd110b0cc6e1fea5f539c98f9959e94 SHA256 ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 DIST linux-2.6.29.tar.bz2 56579370 RMD160 e0e8c0635665ed34618b04fe1140015a4b6ff806 SHA1 0640a2f4bea3fc272541f322b74ea365ad7f2349 SHA256 58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
+DIST vserver-patches-2.6.22_2.2.0.7-r1.tar.bz2 184914 RMD160 a1d8645d182371de26285ce98a5f4c3d75f00ae5 SHA1 33e447574faec18f581c83840a12b1ea681ae81c SHA256 99485af76172f3f2b2f20ee6040790c25203fc966242b0342f59c5c56c6730c5
 DIST vserver-patches-2.6.22_2.2.0.7.tar.bz2 184153 RMD160 662e2d5002c73911bd67bc2270ce8b85c89805c4 SHA1 6a0a77489738e29e96e582bebc07e458d659790a SHA256 3a007c5edbe33665b0cbe8344200de8c7df7d8515f83823c12497e147b577de8
-DIST vserver-patches-2.6.22_2.3.0.34.tar.bz2 195265 RMD160 13c497641f367347ede8efa8521bb741c1313bac SHA1 bd8bf4a8ae8b7d679e1898452c957c800a727fab SHA256 35fac909702a6cc583467639bd9c0b91ed26600fe2a948114de7d04721a1cb25
-DIST vserver-patches-2.6.26_2.3.0.35.6.tar.bz2 141193 RMD160 c5620c2933382156c01f1803be8a69abe749b712 SHA1 f7314667c730f310bd39b340c7a2193f358c79aa SHA256 91e207690a874b992b5a4d9432056b8e05190ddfde3a7cee254ac715fb003002
-DIST vserver-patches-2.6.28_2.3.0.36.4.tar.bz2 139965 RMD160 9e2e4defb43690b89eda247ecd464d347c49a36b SHA1 b855f5d9b60444eb98fb2ffd421205ae04a9807c SHA256 20c452d41dc43c3593fa492e89e00f6b83cef35341b495dc4a65d8331216cbe9
+DIST vserver-patches-2.6.29_2.3.0.36.14-r1.tar.bz2 142088 RMD160 36c4ea4093d2272a273e3c569296f153326a0e21 SHA1 df4ee85674710673e306905cf898b265573a94f1 SHA256 64048ead1ba1c24b14e0ef46b719321b8c09cca1d3f018c3c66e34929c45984f
 DIST vserver-patches-2.6.29_2.3.0.36.14.tar.bz2 141432 RMD160 4b078da1c6bb52b3e8264908b72a15611b945e03 SHA1 041d5dec642603e1861e8072aa5cbaefab16d492 SHA256 926f20f05d04ce2823af76f40c6a6ba0bff6d57ff24b508490ed309f4cbdbfba
+EBUILD vserver-sources-2.2.0.7-r1.ebuild 871 RMD160 7c3cf074e81d37e9d953c44b4b3bb0a745369a78 SHA1 ead27175e35955298ffffa3c5ef3bdd6354805da SHA256 85407884823b2dd5d756e43ba3c912798e66efc7af758dda1e9e9b877f4ca049
 EBUILD vserver-sources-2.2.0.7.ebuild 865 RMD160 af353b6e536f021639526956f986183128fe9e68 SHA1 272cc6fb87017e40c17044834f80a664dce95f74 SHA256 8e7b1797e1ebc28c9ac6d21e5a35db319d461c1f7af1fee096fdc219ae302f86
-EBUILD vserver-sources-2.3.0.34.ebuild 866 RMD160 5a3375854ba8c2a5bb636b61b9a0e05d4aabf800 SHA1 41de221c563f2df5b89159965f971a56606955a4 SHA256 9a1b02088b7354eb0f9c6b6593f3d69e17df8dcd2d8c3adf7ea3a5d12e77db92
-EBUILD vserver-sources-2.3.0.35.6.ebuild 809 RMD160 5066d60296010f4421fb6811100468b97526fded SHA1 f35e670d50ff1e5d3467a3281a19ab02389ccc6f SHA256 c751e35e9413086a2c17acd1e25e15f0309769b199d70239f3ec46daeac43d6c
+EBUILD vserver-sources-2.3.0.36.14-r1.ebuild 813 RMD160 421b5b5a4f56ddb0a86b8bad10c8bab8fc0c8e62 SHA1 4c179f24a0b6d6c14fff6011b3fe97053b2a6718 SHA256 2baa5f156754c52c9f4f0ef315483ab18916c68668dccc0e4b21a348bf7b0538
 EBUILD vserver-sources-2.3.0.36.14.ebuild 810 RMD160 c10c8f310be48082404f591e2d2b5f9d8a19d9c1 SHA1 8cee427e986ff69d20e3313b6135d0be551fdd97 SHA256 c0be6eb30908411facc9a2f19731043c8700916f82218f9ed57f90740047e385
-EBUILD vserver-sources-2.3.0.36.4.ebuild 809 RMD160 51b09c78d9cafde0f3ad53dc2c3c54bfdb479826 SHA1 773c899f3fddd49aff4a909fb7d03bb468587031 SHA256 08419f62bd1d5aa5536e9a413eb55e76e9e3bef0e434b56f374e78c1473fe3e0
-MISC ChangeLog 28918 RMD160 8a6b543ff31a985ab5052cf49202799474320c30 SHA1 d5447d13f4c01cfb62a963d993adca674b738526 SHA256 6963ebe1196a782b5a499ce1533f28621eaa98c153456d3f300b94e8d4ce2af9
+MISC ChangeLog 29296 RMD160 81f067bcddab828ef73443e6f836a0f79cc7c662 SHA1 71f2673daa4c9d2a6f12b993d3ef1872bc584162 SHA256 e9720e78562da12b899082e36738df257771a9ae9767493cf7319571e36f4f42
 MISC metadata.xml 456 RMD160 298005e42ae8445208200cd5a54d5008dfa9a5b1 SHA1 5917aecd12c522a0ccc8918e1d727aa719187d0a SHA256 8ad9e241ba27c913e73030b30cba4b0430555c6be193cf71d4ff65a11c9892aa
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.0.34.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.2.0.7-r1.ebuild
index 79f9c37b80f0..6651484294ca 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.0.34.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.3.0.34.ebuild,v 1.2 2008/05/13 14:36:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.2.0.7-r1.ebuild,v 1.1 2009/08/25 07:19:05 hollow Exp $
 
 ETYPE="sources"
 CKV="2.6.22"
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.0.35.6.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.0.35.6.ebuild
deleted file mode 100644
index eba7558b1e6c..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.0.35.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.3.0.35.6.ebuild,v 1.1 2008/10/21 21:32:25 hollow Exp $
-
-ETYPE="sources"
-CKV="2.6.26"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-MY_PN=${PN/-sources/-patches}
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Gentoo and Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree."
-HOMEPAGE="http://www.gentoo.org/proj/en/vps/"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-	http://dev.gentoo.org/~hollow/distfiles/${MY_PN}-${CKV}_${PVR}.tar.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.4.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.14-r1.ebuild
index d2178dba33b8..42571eb88c1c 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.4.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.14-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.4.ebuild,v 1.1 2009/01/05 16:13:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.14-r1.ebuild,v 1.1 2009/08/25 07:19:05 hollow Exp $
 
 ETYPE="sources"
-CKV="2.6.28"
+CKV="2.6.29"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="9"
 
 K_USEPV=1
 K_NOSETEXTRAVERSION=1