summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-02-13 14:27:12 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-02-13 14:27:12 +0000
commit05e113a9e9b75496a582152279e8bcb8a1660578 (patch)
tree61bcb038df2e4bd3791d8f628b6b1df1826e587c /sys-kernel
parentAdd ~x86 keyword, bug #209995 (diff)
downloadgentoo-2-05e113a9e9b75496a582152279e8bcb8a1660578.tar.gz
gentoo-2-05e113a9e9b75496a582152279e8bcb8a1660578.tar.bz2
gentoo-2-05e113a9e9b75496a582152279e8bcb8a1660578.zip
fix CVE-2008-0600; cleanup
(Portage version: 2.1.4.1)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/vserver-sources/ChangeLog11
-rw-r--r--sys-kernel/vserver-sources/metadata.xml3
-rw-r--r--sys-kernel/vserver-sources/vserver-sources-2.2.0.6.ebuild (renamed from sys-kernel/vserver-sources/vserver-sources-2.2.0.4.ebuild)12
-rw-r--r--sys-kernel/vserver-sources/vserver-sources-2.3.0.27.ebuild29
4 files changed, 14 insertions, 41 deletions
diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index 4578df9f63e4..feace8ee175d 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-kernel/vserver-sources
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.137 2007/11/06 19:09:28 hollow Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.138 2008/02/13 14:27:12 hollow Exp $
+
+*vserver-sources-2.2.0.6 (13 Feb 2008)
+
+ 13 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+ -vserver-sources-2.2.0.4.ebuild, +vserver-sources-2.2.0.6.ebuild,
+ -vserver-sources-2.3.0.27.ebuild:
+ fix CVE-2008-0600; cleanup
*vserver-sources-2.3.0.29 (06 Nov 2007)
*vserver-sources-2.2.0.5 (06 Nov 2007)
diff --git a/sys-kernel/vserver-sources/metadata.xml b/sys-kernel/vserver-sources/metadata.xml
index 3220af993950..df32a26a6a1c 100644
--- a/sys-kernel/vserver-sources/metadata.xml
+++ b/sys-kernel/vserver-sources/metadata.xml
@@ -2,9 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vserver</herd>
- <maintainer>
- <email>vserver-devs@gentoo.org</email>
- </maintainer>
<longdescription>
The basic concept of the Linux-VServer solution is to separate the
user-space environment into distinct units (sometimes called Virtual Private
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.2.0.4.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.2.0.6.ebuild
index 86b72b387bb7..8764d14f6da2 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.2.0.4.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.2.0.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2.0.4.ebuild,v 1.1 2007/10/20 15:14:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.2.0.6.ebuild,v 1.1 2008/02/13 14:27:12 hollow Exp $
ETYPE="sources"
CKV="2.6.22"
K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="11"
K_USEPV=1
K_NOSETEXTRAVERSION=1
@@ -21,9 +21,7 @@ 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/~chtekk/distfiles/${MY_PN}-${CKV}_${PV}.tar.bz2
- http://dev.gentoo.org/~hollow/distfiles/${MY_PN}-${CKV}_${PV}.tar.bz2
- http://dev.gentoo.org/~phreak/distfiles/${PN}/${MY_PN}-${CKV}_${PV}.tar.bz2"
+ http://dev.gentoo.org/~hollow/distfiles/${MY_PN}-${CKV}_${PV}.tar.bz2"
-UNIPATCH_STRICTORDER=1
+UNIPATCH_EXCLUDE="2400_atl1-disable-broken-64-bit-DMA.patch"
UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PV}.tar.bz2"
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.0.27.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.0.27.ebuild
deleted file mode 100644
index 704317c3b7ae..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.0.27.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 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.27.ebuild,v 1.1 2007/10/20 15:14:28 hollow Exp $
-
-ETYPE="sources"
-CKV="2.6.22"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-MY_PN=${PN/-sources/-patches}
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~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/~chtekk/distfiles/${MY_PN}-${CKV}_${PVR}.tar.bz2
- http://dev.gentoo.org/~hollow/distfiles/${MY_PN}-${CKV}_${PVR}.tar.bz2
- http://dev.gentoo.org/~phreak/distfiles/${PN}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"