Update xen-sources to xen-patches 3.

(Portage version: 2.1.3.9)

6 files changed, 20 insertions, 47 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index 021c0a80e828..f06773470bec 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/xen-sources
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.48 2007/09/26 21:18:03 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.49 2007/10/10 22:07:43 marineam Exp $
+
+*xen-sources-2.6.20-r5 (10 Oct 2007)
+
+  10 Oct 2007; Michael Marineau <marineam@gentoo.org>
+  -xen-sources-2.6.20-r3.ebuild, -xen-sources-2.6.20-r4.ebuild,
+  +xen-sources-2.6.20-r5.ebuild:
+  Disable CONFIG_HIGHPTE and fix CVE-2007-4573.
 
 *xen-sources-2.6.20-r4 (26 Sep 2007)
 
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r3 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r3
deleted file mode 100644
index 7220f0d1dbfe..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 c2cfd59003729827fd1d2fefd8af4cbd genpatches-2.6.20-14.base.tar.bz2 122757
-RMD160 a796aa78a0049bc08257ea792f50b169cf6e5089 genpatches-2.6.20-14.base.tar.bz2 122757
-SHA256 27ca4b3eee185cecc6825f4d298ec82e4b8e49ba75a32da0dd5d15e24ba59a2e genpatches-2.6.20-14.base.tar.bz2 122757
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 b8c68ab5d8ffdf230d1cb41b20b8e3ff xen-patches-2.6.20-2.tar.bz2 514425
-RMD160 2c4cc2aa453fce93adb3206ac4f86e795aa9ffcc xen-patches-2.6.20-2.tar.bz2 514425
-SHA256 6b56c94a2311f2211f6d8d8780fa5822abe7e5793251b64fb4b62a9dccc4c9c1 xen-patches-2.6.20-2.tar.bz2 514425
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r4 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r4
deleted file mode 100644
index 7cc75395796a..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0ce2af543b67ef5ae2f2046f3ba0e483 genpatches-2.6.20-18.base.tar.bz2 137072
-RMD160 2c37e5e8fcbf65f97dd93aaaff5772a7c415c498 genpatches-2.6.20-18.base.tar.bz2 137072
-SHA256 68f91c09a6bca48446e6e924255e965af1540455d89ef1ca8afb74c1166ccf0c genpatches-2.6.20-18.base.tar.bz2 137072
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 b8c68ab5d8ffdf230d1cb41b20b8e3ff xen-patches-2.6.20-2.tar.bz2 514425
-RMD160 2c4cc2aa453fce93adb3206ac4f86e795aa9ffcc xen-patches-2.6.20-2.tar.bz2 514425
-SHA256 6b56c94a2311f2211f6d8d8780fa5822abe7e5793251b64fb4b62a9dccc4c9c1 xen-patches-2.6.20-2.tar.bz2 514425
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r5 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r5
new file mode 100644
index 000000000000..3db8629accd2
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r5
@@ -0,0 +1,9 @@
+MD5 ac8fc1febc4951a2f9296b09f870ec80 genpatches-2.6.20-19.base.tar.bz2 137184
+RMD160 b8492ed0b61e75873623c2526b50420614dacf37 genpatches-2.6.20-19.base.tar.bz2 137184
+SHA256 5b3ae1dc77b5ea9cbcc4052f9b89e861408e70bffbafefe19ad521608d19957d genpatches-2.6.20-19.base.tar.bz2 137184
+MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
+RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
+SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
+MD5 5e3faf12f16fd2aaad3729a55a6a0d79 xen-patches-2.6.20-3.tar.bz2 515006
+RMD160 06537f71517c185d65fefbb6b1120a05d97d2c3f xen-patches-2.6.20-3.tar.bz2 515006
+SHA256 e510cfe851f0a09946e04740154ac2c9090f997f911503b2d7bb610b29755173 xen-patches-2.6.20-3.tar.bz2 515006
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20-r4.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r4.ebuild
deleted file mode 100644
index 5fca609971c6..000000000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.20-r4.ebuild
+++ /dev/null
@@ -1,25 +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/xen-sources/xen-sources-2.6.20-r4.ebuild,v 1.1 2007/09/26 21:18:03 marineam Exp $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="18"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-
-KEYWORDS="~x86 ~amd64"
-
-XENPATCHES_VER="2"
-XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
-XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${XENPATCHES_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XENPATCHES}"
-
-DEPEND="${DEPEND} >=sys-devel/binutils-2.17"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20-r3.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r5.ebuild
index 68ba69c393cb..05862b26c288 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.20-r3.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.20-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.20-r3.ebuild,v 1.1 2007/09/06 03:58:30 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.20-r5.ebuild,v 1.1 2007/10/10 22:07:43 marineam Exp $
 
 ETYPE="sources"
 UNIPATCH_STRICTORDER="1"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="14"
+K_GENPATCHES_VER="19"
 inherit kernel-2
 detect_version
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xensource.com/xen/xen/"
 
 KEYWORDS="~x86 ~amd64"
 
-XENPATCHES_VER="2"
+XENPATCHES_VER="3"
 XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
 XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"