Xen 4.1.1 (maintenance release)

 *   Security fixes including CVE-2011-1583 CVE-2011-1898
 *   Enhancements to guest introspection (VM single stepping support for very fine-grained access control)
 *   Many stability improvements, such as: PV-on-HVM stability fixes (fixing some IRQ issues), XSAVE cpu feature support for PV guests (allows safe use of latest multimedia instructions), RAS fixes for high availability, fixes for offlining bad pages and changes to libxc, mainly of benefit to libvirt
 *   Compatibility fixes for newer Linux guests, newer compilers, some old guest savefiles, newer Python, grub2, some hardware/BIOS bugs.

5 files changed, 8 insertions, 56 deletions

diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile
index 02a33b28b05..7a9eba742f5 100644
--- a/sysutils/xenkernel41/Makefile
+++ b/sysutils/xenkernel41/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/04/06 09:05:53 cegger Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/16 10:28:47 cegger Exp $
 #
 
-VERSION=	4.1.0
+VERSION=	4.1.1
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel41-${VERSION}
 #PKGREVISION=	1
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	cegger@NetBSD.org
 HOMEPAGE=	http://xen.org/
-COMMENT=	Xen 4.1.0 Kernel
+COMMENT=	Xen 4.1.1 Kernel
 
 LICENSE=        gnu-gpl-v2
 
@@ -29,7 +29,7 @@ PYTHON_FOR_BUILD_ONLY=	# empty
 PY_PATCHPLIST=		NO
 
 # XXX Why does this not work?
-# See work/xen-4.1.0/Config.mk:41 why PYTHON must be set and what for
+# See work/xen-4.1.1/Config.mk:41 why PYTHON must be set and what for
 MAKE_ENV+=	PYTHON=${PYTHONBIN:Q}
 MAKE_ENV+=	OCAML_TOOLS=no
 
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo
index ec638bef30a..6f44e32459d 100644
--- a/sysutils/xenkernel41/distinfo
+++ b/sysutils/xenkernel41/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/05/07 07:11:22 tnn Exp $
+$NetBSD: distinfo,v 1.3 2011/06/16 10:28:48 cegger Exp $
 
-SHA1 (xen-4.1.0.tar.gz) = 4295e67524746ce155ff991db5fd2a611be27f67
-RMD160 (xen-4.1.0.tar.gz) = e9ef987b24503d6c993bccfd203be5af9f104f48
-Size (xen-4.1.0.tar.gz) = 10348539 bytes
-SHA1 (patch-aa) = a93592a78fd7050aee9d522e22cec182d75bbbfa
-SHA1 (patch-xen_common_libelf_libelf-loader.c) = a38b484080115077cfb12bcfff8bad642e9413ee
-SHA1 (patch-xen_include_xen_stdarg.h) = 26975533b5b63a2b9d559b9ab2018a4609767e26
+SHA1 (xen-4.1.1.tar.gz) = f1b5ef4b663c339faf9c77fc895327cfbcc9776c
+RMD160 (xen-4.1.1.tar.gz) = 4b3c0641b0f098889f627662aa6b8fea00c5b636
+Size (xen-4.1.1.tar.gz) = 10355625 bytes
diff --git a/sysutils/xenkernel41/patches/patch-aa b/sysutils/xenkernel41/patches/patch-aa
deleted file mode 100644
index 4b83c5510cd..00000000000
--- a/sysutils/xenkernel41/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/04/06 09:05:53 cegger Exp $
-
---- xen/arch/x86/boot/build32.mk.orig	2011-03-25 10:42:58.000000000 +0000
-+++ xen/arch/x86/boot/build32.mk
-@@ -10,7 +10,8 @@ CFLAGS += -Werror -fno-builtin -msoft-fl
- # NB. awk invocation is a portable alternative to 'head -n -1'
- %.S: %.bin
- 	(od -v -t x $< | awk 'NR > 1 {print s} {s=$$0}' | \
--	sed 's/ /,0x/g' | sed 's/^[0-9]*,/ .long /') >$@
-+	sed 's/  */, 0x/g' | sed 's/, 0x$$//' | \
-+	sed 's/^[0-9]*,/ .long /') >$@
- 
- %.bin: %.lnk
- 	$(OBJCOPY) -O binary $< $@
diff --git a/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c b/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c
deleted file mode 100644
index 6747c44ee3a..00000000000
--- a/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xen_common_libelf_libelf-loader.c,v 1.1 2011/05/07 07:11:22 tnn Exp $
-
---- xen/common/libelf/libelf-loader.c.orig	2011-03-25 10:43:00.000000000 +0000
-+++ xen/common/libelf/libelf-loader.c
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
--#include <stdarg.h>
-+#include "../../include/xen/stdarg.h"
- 
- #include "libelf-private.h"
- 
diff --git a/sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h b/sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h
deleted file mode 100644
index efdaff0f6d2..00000000000
--- a/sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-xen_include_xen_stdarg.h,v 1.1 2011/05/07 07:11:22 tnn Exp $
-
---- xen/include/xen/stdarg.h.orig	2011-03-25 10:43:01.000000000 +0000
-+++ xen/include/xen/stdarg.h
-@@ -1,5 +1,13 @@
-+#ifndef _XEN_STDARG_H_
-+#define _XEN_STDARG_H_
- #if defined(__OpenBSD__)
- #  include "/usr/include/stdarg.h"
-+#elif defined(__NetBSD__)
-+typedef __builtin_va_list va_list;
-+#define va_start(ap, last)	__builtin_stdarg_start((ap), (last))
-+#define va_end(ap)		__builtin_va_end(ap)
-+#define va_arg			__builtin_va_arg
- #else
- #  include <stdarg.h>
- #endif
-+#endif /* _XEN_STDARG_H_ */