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

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 16 insertions, 33 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/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