Minor version bump

(Portage version: 2.1.3.9)

7 files changed, 41 insertions, 66 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index 4fbfca8c195c..60c6d919cfd4 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.52 2007/10/15 23:50:58 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.53 2007/11/19 22:24:10 marineam Exp $
+
+*xen-sources-2.6.18-r8 (19 Nov 2007)
+
+  19 Nov 2007; Michael Marineau <marineam@gentoo.org>
+  -files/xen-sources-2.6.16.52-ipt-reject-fix.patch,
+  -files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch,
+  -xen-sources-2.6.16.52.ebuild, +xen-sources-2.6.18-r8.ebuild:
+  Bump 2.6.18 to latest Xen patch from 3.1.2. Remove old 2.6.16 kernel.
 
 *xen-sources-2.6.20-r6 (15 Oct 2007)
 
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.52 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.52
deleted file mode 100644
index 7f34cac89771..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.52
+++ /dev/null
@@ -1,9 +0,0 @@
-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 a45805635c1e1f53edebe01486761ecc patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-RMD160 5c595e8b4c6565de241a5b3a31f2e34afb24face patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-SHA256 0ce11436602401447763688819c4f62db87cac644e093304b7522b073693f9da patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-MD5 f3b8ec81456d4d23a369f4a0b89ee069 patch-2.6.16.52.bz2 315299
-RMD160 a0e70a8b10511b69bbb8585fb930523e9950d2dc patch-2.6.16.52.bz2 315299
-SHA256 282f0bee51e854882860e3a1a1a5486479e49a7926835a839f208d0312ea767d patch-2.6.16.52.bz2 315299
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r8 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r8
new file mode 100644
index 000000000000..bf73e877d785
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r8
@@ -0,0 +1,9 @@
+MD5 7e3eaba91aa76d2b88ed7bb20f64d4c9 genpatches-2.6.18-10.base.tar.bz2 113483
+RMD160 9f19f7147c50650369afddec946b281aff817a48 genpatches-2.6.18-10.base.tar.bz2 113483
+SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2 genpatches-2.6.18-10.base.tar.bz2 113483
+MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
+RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
+SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
+MD5 3a7a3fdc2a4e4ca4123b554560a5bd75 xen-patches-2.6.18-8.tar.bz2 643614
+RMD160 e6f4c3673412484d091b35d9a323c465643ce321 xen-patches-2.6.18-8.tar.bz2 643614
+SHA256 462554d70cf271efd8a728ef23e3c63da7613fb2d67ec00d6255621cacc1af91 xen-patches-2.6.18-8.tar.bz2 643614
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch
deleted file mode 100644
index 88c95beb2e73..000000000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rpu linux-2.6.16.52-xen.orig/net/ipv4/netfilter/ipt_REJECT.c linux-2.6.16.52-xen/net/ipv4/netfilter/ipt_REJECT.c
---- linux-2.6.16.52-xen.orig/net/ipv4/netfilter/ipt_REJECT.c	2007-07-10 10:52:39.000000000 -0700
-+++ linux-2.6.16.52-xen/net/ipv4/netfilter/ipt_REJECT.c	2007-07-10 10:50:03.000000000 -0700
-@@ -159,8 +159,8 @@ static void send_reset(struct sk_buff *o
- 	nskb->nf_bridge = NULL;
- #endif
- 
--	skb_shinfo(nskb)->tso_size = 0;
--	skb_shinfo(nskb)->tso_segs = 0;
-+	skb_shinfo(nskb)->gso_size = 0;
-+	skb_shinfo(nskb)->gso_segs = 0;
- 
- 	tcph = (struct tcphdr *)((u_int32_t*)nskb->nh.iph + nskb->nh.iph->ihl);
- 
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch
deleted file mode 100644
index 431fc96936ff..000000000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup linux-2.6.16.52-xen.orig/net/sctp/input.c linux-2.6.16.52-xen/net/sctp/input.c
---- linux-2.6.16.52-xen.orig/net/sctp/input.c	2007-07-15 10:07:12.000000000 -0700
-+++ linux-2.6.16.52-xen/net/sctp/input.c	2007-07-15 10:42:38.000000000 -0700
-@@ -134,7 +134,7 @@ int sctp_rcv(struct sk_buff *skb)
- 
- 	SCTP_INC_STATS_BH(SCTP_MIB_INSCTPPACKS);
- 
--	if (skb_linearize(skb, GFP_ATOMIC))
-+	if (skb_linearize(skb))
- 		goto discard_it;
- 
- 	sh = (struct sctphdr *) skb->h.raw;
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild
deleted file mode 100644
index e8eb2070e87c..000000000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild
+++ /dev/null
@@ -1,30 +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.16.52.ebuild,v 1.2 2007/07/15 18:00:11 marineam Exp $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-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/"
-
-XEN_VERSION="3.0.4_1"
-XEN_BASE_KV="2.6.16.33"
-XEN_PATCH="patch-${XEN_BASE_KV}_to_xen-${XEN_VERSION}.bz2"
-PATCH_URI="mirror://gentoo/${XEN_PATCH}"
-SRC_URI="${KERNEL_URI} ${PATCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
-	${FILESDIR}/${P}-ipt-reject-fix.patch
-	${FILESDIR}/${P}-sctp-skb_linearize-fix.patch"
-
-KEYWORDS="~x86 ~amd64"
-
-pkg_postinst() {
-	postinst_sources
-
-	elog "This kernel uses the linux patches released with Xen 3.0.4"
-	elog "It claims to have a 3.0.2 compatibility option but it may not work."
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18-r8.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r8.ebuild
new file mode 100644
index 000000000000..6e8dad6e8504
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.18-r8.ebuild
@@ -0,0 +1,23 @@
+# 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.18-r8.ebuild,v 1.1 2007/11/19 22:24:10 marineam Exp $
+
+ETYPE="sources"
+UNIPATCH_STRICTORDER="1"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="10"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
+HOMEPAGE="http://xen.xensource.com/"
+
+KEYWORDS="~x86 ~amd64"
+
+XENPATCHES_VER="8"
+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}"