Update the Xen3 packages to 3.1.2.

Package changes:
  point HOMEPAGE to http://xen.org/
  looks like the Xen peoples won't put a tarball on their http server
  for this; I built one from their repository and put it in
  ${MASTER_SITE_LOCAL}
Summary of changes since 3.1.0:
  some of our patches have been integrated upstream, thanks to Christoph Egger
  various performances improvements and bug fixes, including some security
    fixes, and one bug that would lead to floating point register
    leak/corruption from HVM to PV guests on Intel VMX CPUs.

8 files changed, 57 insertions, 54 deletions

diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index 9599f3adbd6..c6155eb40b5 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2007/11/17 16:45:32 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/03 21:54:30 bouyer Exp $
 #
 
-VERSION=		3.1.0
+VERSION=		3.1.2
 DISTNAME=		xen-${VERSION}-src
 PKGNAME=		xentools3-${VERSION}
 CATEGORIES=		sysutils
-MASTER_SITES=		http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
-			http://bits.xensource.com/oss-xen/release/${VERSION}/src.tgz/
+MASTER_SITES=		${MASTER_SITES_LOCAL}
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		bouyer@NetBSD.org
-HOMEPAGE=		http://www.cl.cam.ac.uk/research/srg/netos/xen/
+HOMEPAGE=		http://xen.org/
 COMMENT=		Userland Tools for Xen
 
 #DEPENDS+=		${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
diff --git a/sysutils/xentools3/buildlink3.mk b/sysutils/xentools3/buildlink3.mk
index 414fa2d7561..8cd141a9eee 100644
--- a/sysutils/xentools3/buildlink3.mk
+++ b/sysutils/xentools3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/12/03 21:54:30 bouyer Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XENTOOLS3_BUILDLINK3_MK:=	${XENTOOLS3_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xentools3
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools3
 
 .if ${XENTOOLS3_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xentools3+=	xentools3>=3.1.0
+BUILDLINK_API_DEPENDS.xentools3+=	xentools3>=3.1.2
 BUILDLINK_PKGSRCDIR.xentools3?=	../../sysutils/xentools3
 .endif	# XENTOOLS3_BUILDLINK3_MK
 
diff --git a/sysutils/xentools3/distinfo b/sysutils/xentools3/distinfo
index c2abd3f29f5..a21c65bd9d5 100644
--- a/sysutils/xentools3/distinfo
+++ b/sysutils/xentools3/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2007/11/17 16:45:32 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2007/12/03 21:54:30 bouyer Exp $
 
-SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
-RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
-Size (xen-3.1.0-src.tgz) = 6831094 bytes
+SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e
+RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad
+Size (xen-3.1.2-src.tgz) = 6975860 bytes
 SHA1 (patch-aa) = 86a6c9c2a43da76a5746835e13646b24e6992070
-SHA1 (patch-ab) = dda7b5fefec4136f9d4b39a9598bc7a965ba3937
+SHA1 (patch-ab) = 424d8cc3e41d128a221f0277c1cb1d8779e97241
 SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855
 SHA1 (patch-ad) = ec36d712925ddf06aac7d6393ad818a51c4363f3
 SHA1 (patch-al) = da759ccbb2c4b48f42178cff47ace7ef42466814
@@ -31,17 +31,17 @@ SHA1 (patch-cd) = 8fc057e9dc98e356ba46cdf183a8891c59c005b8
 SHA1 (patch-cf) = 05c5e86d33d31a2216c2751a2bf684c8d5d06746
 SHA1 (patch-cg) = 36073c7327f187702203108b3e7596178aac3327
 SHA1 (patch-ch) = ebe2aedf1ecd1dce66f4a8a25ef5e83ee1d4c60d
-SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577
 SHA1 (patch-cj) = 166e2190a31bba842da1111310ba7b1ad35a5d81
 SHA1 (patch-ck) = 3783d9b4b9344670bae2f35e2ac7f11e2ec9ce7b
 SHA1 (patch-cm) = 802d395f1dc391a827487bbc9fcfe2bbd6af07de
 SHA1 (patch-cn) = 40ae04194cca94b112133e962d4cf7487412925a
-SHA1 (patch-co) = 470535c84115dc3d96ec7e30d1e5c2380af27133
+SHA1 (patch-co) = 44594dee06dcc6754760e73e7b5490dd81b96c41
 SHA1 (patch-cp) = 1f774a6636ce6646fc83bab304e84ce2d8886db5
 SHA1 (patch-cq) = 9d45b395050b47d3d2b98487673d37feb35df80c
 SHA1 (patch-cr) = d5ccaddebdbe266ca2136b82a8e6968f636a2799
-SHA1 (patch-cs) = f3932e1b49870078532316ccb1dfa64378c3e8e4
+SHA1 (patch-cs) = 62b9f23e0172a59b9b23ae06ae147fb439029550
 SHA1 (patch-ct) = 14259d4c223b12218a07f2a2860e2706d40157b8
 SHA1 (patch-cu) = 90b4a39a037c6f2aeb694e1df8e7a7165b51cdbc
 SHA1 (patch-cv) = 1fea2a1cd139e2e46655622ad5f02b37e1501e0b
 SHA1 (patch-cw) = 7fad0847bb87beddb9330d067132d1f7fc784222
+SHA1 (patch-cx) = eed56d9e4535f19a6fc2474765d85135fce15e63
diff --git a/sysutils/xentools3/patches/patch-ab b/sysutils/xentools3/patches/patch-ab
index 9dd4bc16bd7..1f94b0d2bb0 100644
--- a/sysutils/xentools3/patches/patch-ab
+++ b/sysutils/xentools3/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/03 21:54:30 bouyer Exp $
 
---- /dev/null	2007-05-27 15:18:39.000000000 +0200
-+++ libxc/xc_netbsd.c	2007-05-27 16:01:23.000000000 +0200
+--- libxc/xc_netbsd.c.orig	2007-12-03 12:46:01.000000000 +0100
++++ libxc/xc_netbsd.c	2007-12-03 12:48:59.000000000 +0100
 @@ -0,0 +1,268 @@
 +/******************************************************************************
 + *
@@ -173,7 +173,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
 +    return ioctl(xce_handle, IOCTL_EVTCHN_NOTIFY, &notify);
 +}
 +
-+evtchn_port_t xc_evtchn_bind_interdomain(int xce_handle, int domid,
++evtchn_port_or_error_t xc_evtchn_bind_interdomain(int xce_handle, int domid,
 +    evtchn_port_t remote_port)
 +{
 +    struct ioctl_evtchn_bind_interdomain bind;
@@ -198,7 +198,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
 +    return ioctl(xce_handle, IOCTL_EVTCHN_UNBIND, &unbind);
 +}
 +
-+evtchn_port_t xc_evtchn_bind_virq(int xce_handle, unsigned int virq)
++evtchn_port_or_error_t xc_evtchn_bind_virq(int xce_handle, unsigned int virq)
 +{
 +    struct ioctl_evtchn_bind_virq bind;
 +    int err;
@@ -237,7 +237,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
 +    return 0;
 +}
 +
-+evtchn_port_t xc_evtchn_pending(int xce_handle)
++evtchn_port_or_error_t xc_evtchn_pending(int xce_handle)
 +{
 +    evtchn_port_t port;
 +
diff --git a/sysutils/xentools3/patches/patch-ci b/sysutils/xentools3/patches/patch-ci
deleted file mode 100644
index d51add40ba5..00000000000
--- a/sysutils/xentools3/patches/patch-ci
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ci,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
-
---- ../xen/include/public/arch-x86/xen.h.orig	2007-04-25 19:25:41.000000000 +0200
-+++ ../xen/include/public/arch-x86/xen.h	2007-04-25 19:25:43.000000000 +0200
-@@ -35,9 +35,10 @@
- #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-     typedef type * __guest_handle_ ## name
- #endif
-+#define __XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
- 
- #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
--#define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
-+#define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)
- #define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
- #ifdef __XEN_TOOLS__
- #define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
diff --git a/sysutils/xentools3/patches/patch-co b/sysutils/xentools3/patches/patch-co
index a8386e29419..56d75ff08a0 100644
--- a/sysutils/xentools3/patches/patch-co
+++ b/sysutils/xentools3/patches/patch-co
@@ -1,17 +1,17 @@
-$NetBSD: patch-co,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
+$NetBSD: patch-co,v 1.2 2007/12/03 21:54:31 bouyer Exp $
 
---- ../docs/man/xm.pod.1.orig	2007-01-08 16:00:44.000000000 +0100
-+++ ../docs/man/xm.pod.1	2007-04-28 19:21:52.000000000 +0200
-@@ -72,7 +72,7 @@
- Name=Value combinations.
+--- ../docs/man/xm.pod.1.orig	2007-11-15 00:35:27.000000000 +0100
++++ ../docs/man/xm.pod.1	2007-12-03 12:44:09.000000000 +0100
+@@ -76,7 +76,7 @@
+ I<name>=I<value> combinations.
  
- Configfile can either be an absolute path to a file, or a relative
+ I<configfile> can either be an absolute path to a file, or a relative
 -path to a file located in /etc/xen.
 +path to a file located in @XENDCONFDIR@.
  
  Create will return B<as soon> as the domain is started.  This B<does
  not> mean the guest OS in the domain has actually booted, or is
-@@ -97,7 +97,7 @@
+@@ -101,7 +101,7 @@
  
    xm create Fedora4
  
@@ -20,16 +20,16 @@ $NetBSD: patch-co,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
  soon as it is run.
  
  =item I<without config file>
-@@ -798,7 +798,7 @@
- name pre-fix for the policy xml file. The preceding name parts are
- translated into the local path pointing to the policy xml file
+@@ -836,7 +836,7 @@
+ name pre-fix for the policy XML file. The preceding name parts are
+ translated into the local path pointing to the policy XML file
  relative to the global policy root directory
 -(/etc/xen/acm-security/policies). For example,
 +(@XENDCONFDIR@/acm-security/policies). For example,
  example.chwall_ste.client_v1 denotes the policy file
  example/chwall_ste/client_v1-security_policy.xml relative to the
  global policy root directory.
-@@ -889,7 +889,7 @@
+@@ -927,7 +927,7 @@
  =over 4
  
  This step creates client_v1.map and client_v1.bin files in
diff --git a/sysutils/xentools3/patches/patch-cs b/sysutils/xentools3/patches/patch-cs
index 6e1d453fb0d..b8ae240c998 100644
--- a/sysutils/xentools3/patches/patch-cs
+++ b/sysutils/xentools3/patches/patch-cs
@@ -1,7 +1,7 @@
-$NetBSD: patch-cs,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
+$NetBSD: patch-cs,v 1.2 2007/12/03 21:54:31 bouyer Exp $
 
---- misc/xen-python-path.orig	2007-05-18 16:45:21.000000000 +0200
-+++ misc/xen-python-path	2007-05-27 17:07:21.000000000 +0200
+--- misc/xen-python-path.orig	2007-11-15 00:35:27.000000000 +0100
++++ misc/xen-python-path	2007-12-03 12:45:29.000000000 +0100
 @@ -22,14 +22,14 @@
  # take the first installed instance of auxbin that we find, and then run it
  # to determine the correct path, appending that to sys.path.
@@ -16,6 +16,6 @@ $NetBSD: patch-cs,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
  for p in ['python%s' % sys.version[:3], 'python']:
 -    for l in ['/usr/lib64', '/usr/lib']:
 +    for l in ['@PREFIX@/lib']:
-         d = os.path.join(l, p)
-         if os.path.exists(os.path.join(d, AUXBIN)):
-             sys.path.append(d)
+         for k in ['', 'site-packages/']:
+             d = os.path.join(l, p, k)
+             if os.path.exists(os.path.join(d, AUXBIN)):
diff --git a/sysutils/xentools3/patches/patch-cx b/sysutils/xentools3/patches/patch-cx
new file mode 100644
index 00000000000..f1a76eca092
--- /dev/null
+++ b/sysutils/xentools3/patches/patch-cx
@@ -0,0 +1,20 @@
+$NetBSD: patch-cx,v 1.1 2007/12/03 21:54:31 bouyer Exp $
+
+--- python/xen/xend/balloon.py.orig	2007-11-15 00:35:27.000000000 +0100
++++ python/xen/xend/balloon.py	2007-12-03 16:34:28.000000000 +0100
+@@ -96,7 +96,6 @@
+     xoptions = XendOptions.instance()
+     dom0 = XendDomain.instance().privilegedDomain()
+     xc = xen.lowlevel.xc.xc()
+-    dom0_start_alloc_mb = get_dom0_current_alloc() / 1024
+ 
+     try:
+         dom0_min_mem = xoptions.get_dom0_min_mem() * 1024
+@@ -159,6 +158,7 @@
+                 (need_mem, dom0_min_mem, dom0_min_mem,
+                  free_mem + scrub_mem + dom0_alloc - dom0_min_mem))
+         else:
++	    dom0_start_alloc_mb = get_dom0_current_alloc() / 1024
+             dom0.setMemoryTarget(dom0_start_alloc_mb)
+             raise VmError(
+                 ('Not enough memory is available, and dom0 cannot'