update to 4.1.5

This integrates fixes for all vulnerabilities which were patched
in pkgsrc before.
Among many bug fixes and improvements (around 50 since Xen 4.1.4):
 * ACPI APEI/ERST finally working on production systems
 * Bug fixes for other low level system state handling
 * Support for xz compressed Dom0 and DomU kernels

7 files changed, 7 insertions, 136 deletions

diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile
index f8c21bcb2ce..27bdb99dba5 100644
--- a/sysutils/xentools41/Makefile
+++ b/sysutils/xentools41/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2013/04/29 11:22:42 sborrill Exp $
+# $NetBSD: Makefile,v 1.33 2013/05/03 16:48:38 drochner Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include		"version.mk"
 
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools41-${VERSION}
-PKGREVISION=		4
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index cc5d8918882..992db106227 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.28 2013/04/19 14:03:51 bouyer Exp $
+$NetBSD: distinfo,v 1.29 2013/05/03 16:48:38 drochner Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
 Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
-SHA1 (xen-4.1.4.tar.gz) = d5f1e9c9eeb96202dd827c196750530ffc64baab
-RMD160 (xen-4.1.4.tar.gz) = e3cb379954c985354dfd7dfbed15eae43e73254d
-Size (xen-4.1.4.tar.gz) = 10387283 bytes
+SHA1 (xen-4.1.5.tar.gz) = 38f098cdbcf4612a6e059e6ad332e68bbfc8bf4d
+RMD160 (xen-4.1.5.tar.gz) = 265d6a9faee6cf9314f4ed647604f7b43c327f52
+Size (xen-4.1.5.tar.gz) = 10421420 bytes
 SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808
 SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba
 SHA1 (patch-.._.._ipxe_src_net_tls.c) = c0cfbc2ab2b92c659c146601c4f80d58c951ca62
 SHA1 (patch-.._Config.mk) = 9b971a41f67bb3974d3a4459bb9d96fbbd636c96
-SHA1 (patch-CVE-2012-6075) = 9de84238489875d94245d4f6ce3689629bb318ee
-SHA1 (patch-CVE-2013-0215-1) = 61149c756c6b9314980368cadb09437c64205199
-SHA1 (patch-CVE-2013-0215-2) = 44a86ef7fa85a212fda95e73ef8aefb98af1cc39
 SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada
 SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d
 SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
@@ -51,7 +48,6 @@ SHA1 (patch-ioemu-qemu-xen_hw_pt-graphics.c) = 3c03404f1d711c667559a1332e717a5f1
 SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.c) = 2dcebc65f591988bb95dea74c3b21f7066154a9f
 SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.h) = d1bb1a8ad90d6577056f11df96f5469ffe74a3b0
 SHA1 (patch-ioemu-qemu-xen_xen-hooks.mak) = a00d9a9fd0fbb9fd89788b9dfaf5b389a28d47e2
-SHA1 (patch-libcx_xc__dom__boot.c) = 0507c2d7fe194f2d11a367fb1840b5d36da66cb1
 SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0
 SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9
 SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc
diff --git a/sysutils/xentools41/patches/patch-CVE-2012-6075 b/sysutils/xentools41/patches/patch-CVE-2012-6075
deleted file mode 100644
index 24c25eb8091..00000000000
--- a/sysutils/xentools41/patches/patch-CVE-2012-6075
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-CVE-2012-6075,v 1.1 2013/01/20 15:21:55 drochner Exp $
-
-see http://lists.xen.org/archives/html/xen-devel/2013-01/msg01070.html
-
---- ioemu-qemu-xen/hw/e1000.c.orig	2012-11-13 18:25:17.000000000 +0000
-+++ ioemu-qemu-xen/hw/e1000.c
-@@ -55,6 +55,11 @@ static int debugflags = DBGBIT(TXERR) | 
- #define REG_IOADDR 0x0
- #define REG_IODATA 0x4
- 
-+/* this is the size past which hardware will drop packets when setting LPE=0 */
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-+/* this is the size past which hardware will drop packets when setting LPE=1 */
-+#define MAXIMUM_ETHERNET_LPE_SIZE 16384
-+
- /*
-  * HW models:
-  *  E1000_DEV_ID_82540EM works with Windows and Linux
-@@ -628,6 +633,15 @@ e1000_receive(void *opaque, const uint8_
-         return;
-     }
- 
-+    /* Discard oversized packets if !LPE and !SBP. */
-+    if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
-+	(size > MAXIMUM_ETHERNET_VLAN_SIZE
-+	&& !(s->mac_reg[RCTL] & E1000_RCTL_LPE)))
-+	&& !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
-+	DBGOUT(RX, "packet too large for applicable LPE/VLAN size\n");
-+	return;
-+    }
-+
-     if (!receive_filter(s, buf, size))
-         return;
- 
diff --git a/sysutils/xentools41/patches/patch-CVE-2013-0215-1 b/sysutils/xentools41/patches/patch-CVE-2013-0215-1
deleted file mode 100644
index 937b522831f..00000000000
--- a/sysutils/xentools41/patches/patch-CVE-2013-0215-1
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-CVE-2013-0215-1,v 1.1 2013/04/19 14:03:51 bouyer Exp $
-
-http://lists.xen.org/archives/html/xen-announce/2013-02/msg00005.html
-
---- ocaml/libs/xb/partial.ml.orig
-+++ ocaml/libs/xb/partial.ml
-@@ -27,8 +27,15 @@ external header_size: unit -> int = "stub_header_size"
- external header_of_string_internal: string -> int * int * int * int
-          = "stub_header_of_string"
- 
-+let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
-+
- let of_string s =
- 	let tid, rid, opint, dlen = header_of_string_internal s in
-+	(* A packet which is bigger than xenstore_payload_max is illegal.
-+	   This will leave the guest connection is a bad state and will
-+	   be hard to recover from without restarting the connection
-+	   (ie rebooting the guest) *)
-+	let dlen = min xenstore_payload_max dlen in
- 	{
- 		tid = tid;
- 		rid = rid;
-@@ -38,6 +45,7 @@ let of_string s =
- 	}
- 
- let append pkt s sz =
-+	if pkt.len > 4096 then failwith "Buffer.add: cannot grow buffer";
- 	Buffer.add_string pkt.buf (String.sub s 0 sz)
- 
- let to_complete pkt =
diff --git a/sysutils/xentools41/patches/patch-CVE-2013-0215-2 b/sysutils/xentools41/patches/patch-CVE-2013-0215-2
deleted file mode 100644
index c24c8135bb6..00000000000
--- a/sysutils/xentools41/patches/patch-CVE-2013-0215-2
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-CVE-2013-0215-2,v 1.1 2013/04/19 14:03:52 bouyer Exp $
-
-http://lists.xen.org/archives/html/xen-announce/2013-02/msg00005.html
-
---- ocaml/libs/xb/xs_ring_stubs.c.orig
-+++ ocaml/libs/xb/xs_ring_stubs.c
-@@ -39,21 +39,23 @@ static int xs_ring_read(struct mmap_interface *interface,
-                              char *buffer, int len)
- {
- 	struct xenstore_domain_interface *intf = interface->addr;
--	XENSTORE_RING_IDX cons, prod;
-+	XENSTORE_RING_IDX cons, prod; /* offsets only */
- 	int to_read;
- 
--	cons = intf->req_cons;
--	prod = intf->req_prod;
-+	cons = *(volatile uint32*)&intf->req_cons;
-+	prod = *(volatile uint32*)&intf->req_prod;
- 	xen_mb();
- 	if (prod == cons)
- 		return 0;
--	if (MASK_XENSTORE_IDX(prod) > MASK_XENSTORE_IDX(cons)) 
-+	cons = MASK_XENSTORE_IDX(cons);
-+	prod = MASK_XENSTORE_IDX(prod);
-+	if (prod > cons)
- 		to_read = prod - cons;
- 	else
--		to_read = XENSTORE_RING_SIZE - MASK_XENSTORE_IDX(cons);
-+		to_read = XENSTORE_RING_SIZE - cons;
- 	if (to_read < len)
- 		len = to_read;
--	memcpy(buffer, intf->req + MASK_XENSTORE_IDX(cons), len);
-+	memcpy(buffer, intf->req + cons, len);
- 	xen_mb();
- 	intf->req_cons += len;
- 	return len;
-@@ -66,8 +68,8 @@ static int xs_ring_write(struct mmap_interface *interface,
- 	XENSTORE_RING_IDX cons, prod;
- 	int can_write;
- 
--	cons = intf->rsp_cons;
--	prod = intf->rsp_prod;
-+	cons = *(volatile uint32*)&intf->rsp_cons;
-+	prod = *(volatile uint32*)&intf->rsp_prod;
- 	xen_mb();
- 	if ( (prod - cons) >= XENSTORE_RING_SIZE )
- 		return 0;
diff --git a/sysutils/xentools41/patches/patch-libcx_xc__dom__boot.c b/sysutils/xentools41/patches/patch-libcx_xc__dom__boot.c
deleted file mode 100644
index a117a554f79..00000000000
--- a/sysutils/xentools41/patches/patch-libcx_xc__dom__boot.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libcx_xc__dom__boot.c,v 1.1 2013/04/11 19:57:53 joerg Exp $
-
---- libxc/xc_dom_boot.c.orig	2013-03-25 10:12:30.000000000 +0000
-+++ libxc/xc_dom_boot.c
-@@ -265,7 +265,7 @@ int xc_dom_boot_image(struct xc_dom_imag
-         return rc;
- 
-     /* let the vm run */
--    memset(ctxt, 0, sizeof(ctxt));
-+    memset(ctxt, 0, sizeof(*ctxt));
-     if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 )
-         return rc;
-     xc_dom_unmap_all(dom);
diff --git a/sysutils/xentools41/version.mk b/sysutils/xentools41/version.mk
index aeb1baf981c..d6bfc87ef5d 100644
--- a/sysutils/xentools41/version.mk
+++ b/sysutils/xentools41/version.mk
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.5 2013/04/29 11:22:42 sborrill Exp $
+# $NetBSD: version.mk,v 1.6 2013/05/03 16:48:38 drochner Exp $
 
 # Version number is used by xentools41 and xenstoretools
 
-VERSION=	4.1.4
+VERSION=	4.1.5
 VERSION_IPXE=	1.0.0