Update xen to 4.2.3

- Add warning if /kern/xen/privcmd is not readable

Fixes the following critical vulnerabilities:
 * CVE-2013-1918 / XSA-45:
    Several long latency operations are not preemptible
 * CVE-2013-1952 / XSA-49:
    VT-d interrupt remapping source validation flaw for bridges
 * CVE-2013-2076 / XSA-52:
    Information leak on XSAVE/XRSTOR capable AMD CPUs
 * CVE-2013-2077 / XSA-53:
    Hypervisor crash due to missing exception recovery on XRSTOR
 * CVE-2013-2078 / XSA-54:
    Hypervisor crash due to missing exception recovery on XSETBV
 * CVE-2013-2194, CVE-2013-2195, CVE-2013-2196 / XSA-55:
    Multiple vulnerabilities in libelf PV kernel handling
 * CVE-2013-2072 / XSA-56:
    Buffer overflow in xencontrol Python bindings affecting xend
 * CVE-2013-2211 / XSA-57:
    libxl allows guest write access to sensitive console related xenstore keys
 * CVE-2013-1432 / XSA-58:
    Page reference counting error due to XSA-45/CVE-2013-1918 fixes
 * XSA-61:
    libxl partially sets up HVM passthrough even with disabled iommu

The following minor vulnerability is also being addressed:
 * CVE-2013-2007 / XSA-51
    qemu guest agent (qga) insecure file permissions

Among many bug fixes and improvements:
 * addressing a regression from the fix for XSA-46
 * bug fixes to low level system state handling, including certain
    hardware errata workarounds

8 files changed, 18 insertions, 69 deletions

diff --git a/sysutils/xenkernel42/Makefile b/sysutils/xenkernel42/Makefile
index 337cebe42f5..6bd928c9e8f 100644
--- a/sysutils/xenkernel42/Makefile
+++ b/sysutils/xenkernel42/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2013/06/19 14:03:41 gdt Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/12 23:37:18 prlw1 Exp $
 #
 
-VERSION=	4.2.2
+VERSION=	4.2.3
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel42-${VERSION}
-PKREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xenkernel42/distinfo b/sysutils/xenkernel42/distinfo
index e58d2b1edd0..4c5d8c97917 100644
--- a/sysutils/xenkernel42/distinfo
+++ b/sysutils/xenkernel42/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.3 2013/07/13 19:43:21 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/09/12 23:37:18 prlw1 Exp $
 
-SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
-RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
-Size (xen-4.2.2.tar.gz) = 15602746 bytes
+SHA1 (xen-4.2.3.tar.gz) = 7c72e1aa870cc938afdc50bd9f2d879118aa8b99
+RMD160 (xen-4.2.3.tar.gz) = da0fbb7bbc0796bd83c223f7d21015ce0d4c8553
+Size (xen-4.2.3.tar.gz) = 15613235 bytes
 SHA1 (patch-Config.mk) = a43ed1b3304d6383dc093acd128a7f373d0ca266
 SHA1 (patch-xen_Makefile) = e0d1b74518b9675ddc64295d1523ded9a8757c0a
 SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
-SHA1 (patch-xen_arch_x86_time.c) = e5ce7e83d1dcbcc1cdffd6921f25fce4d7389ac8
-SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
 SHA1 (patch-xen_include_xen_lib.h) = 36dcaf3874a1b1214babc45d7e19fe3b556c1044
diff --git a/sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c b/sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c
deleted file mode 100644
index a523223bc07..00000000000
--- a/sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/06/13 21:49:59 joerg Exp $
-
---- xen/arch/x86/time.c.orig	2013-04-23 16:42:55.000000000 +0000
-+++ xen/arch/x86/time.c
-@@ -107,7 +107,7 @@ static inline u32 mul_frac(u32 multiplic
- {
-     u32 product_int, product_frac;
-     asm (
--        "mul %3"
-+        "mull %3"
-         : "=a" (product_frac), "=d" (product_int)
-         : "0" (multiplicand), "r" (multiplier) );
-     return product_int;
-@@ -131,10 +131,10 @@ static inline u64 scale_delta(u64 delta,
- 
- #ifdef CONFIG_X86_32
-     asm (
--        "mul  %5       ; "
-+        "mull  %5       ; "
-         "mov  %4,%%eax ; "
-         "mov  %%edx,%4 ; "
--        "mul  %5       ; "
-+        "mull  %5       ; "
-         "xor  %5,%5    ; "
-         "add  %4,%%eax ; "
-         "adc  %5,%%edx ; "
-@@ -142,7 +142,7 @@ static inline u64 scale_delta(u64 delta,
-         : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (scale->mul_frac) );
- #else
-     asm (
--        "mul %2 ; shrd $32,%1,%0"
-+        "mulq %2 ; shrd $32,%1,%0"
-         : "=a" (product), "=d" (delta)
-         : "rm" (delta), "0" ((u64)scale->mul_frac) );
- #endif
diff --git a/sysutils/xenkernel42/patches/patch-xen_common_libelf_libelf-private.h b/sysutils/xenkernel42/patches/patch-xen_common_libelf_libelf-private.h
deleted file mode 100644
index 42ae5bf395d..00000000000
--- a/sysutils/xenkernel42/patches/patch-xen_common_libelf_libelf-private.h
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-xen_common_libelf_libelf-private.h,v 1.1 2013/07/13 19:43:21 joerg Exp $
-
---- xen/common/libelf/libelf-private.h.orig	2013-07-12 18:07:36.000000000 +0000
-+++ xen/common/libelf/libelf-private.h
-@@ -1,4 +1,4 @@
--#ifndef __LIBELF_PRIVATE_H__
-+#ifndef __LIBELF_PRIVATE_H_
- #define __LIBELF_PRIVATE_H_
- 
- #ifdef __XEN__
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile
index a84f651fe55..4e99872d7a8 100644
--- a/sysutils/xentools42/Makefile
+++ b/sysutils/xentools42/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2013/06/17 13:55:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2013/09/12 23:37:18 prlw1 Exp $
 #
-# VERSION is set in version.mk as it is shared with other packages
-.include		"version.mk"
+
+VERSION=	4.2.3
+VERSION_IPXE=	1.0.0
 
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools42-${VERSION}
-PKGREVISION=		3
 CATEGORIES=		sysutils
-MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
+MASTER_SITES=		http://bits.xensource.com/oss-xen/release/${VERSION}/
 
 DISTFILES=		${DISTNAME}.tar.gz
 DISTFILES+=		ipxe-git-v${VERSION_IPXE}.tar.gz
diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo
index 0c6ea42e9d9..72f8631d99b 100644
--- a/sysutils/xentools42/distinfo
+++ b/sysutils/xentools42/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2013/06/17 13:54:02 wiz Exp $
+$NetBSD: distinfo,v 1.7 2013/09/12 23:37:18 prlw1 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.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
-RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
-Size (xen-4.2.2.tar.gz) = 15602746 bytes
+SHA1 (xen-4.2.3.tar.gz) = 7c72e1aa870cc938afdc50bd9f2d879118aa8b99
+RMD160 (xen-4.2.3.tar.gz) = da0fbb7bbc0796bd83c223f7d21015ce0d4c8553
+Size (xen-4.2.3.tar.gz) = 15613235 bytes
 SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb
 SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808
 SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b
diff --git a/sysutils/xentools42/files/xencommons.sh b/sysutils/xentools42/files/xencommons.sh
index 8472031ec58..4d2797d67ec 100644
--- a/sysutils/xentools42/files/xencommons.sh
+++ b/sysutils/xentools42/files/xencommons.sh
@@ -29,6 +29,9 @@ xen_precmd()
 xen_startcmd()
 {
 	printf "Starting xenservices: xenstored, xenconsoled.\n"
+	if test ! -r ${required_files}; then
+		warn "${required_files} is not readable."
+	fi
 	XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}"
 	if [ -n "${XENSTORED_TRACE}" ]; then
 		XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log"
diff --git a/sysutils/xentools42/version.mk b/sysutils/xentools42/version.mk
deleted file mode 100644
index b16d9c58b1d..00000000000
--- a/sysutils/xentools42/version.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: version.mk,v 1.1 2013/05/15 06:58:50 jnemeth Exp $
-
-# Version number is used by xentools41 and xenstoretools
-
-VERSION=	4.2.2
-VERSION_IPXE=	1.0.0