Import of pkgsrc-2016Q3

sysutils/xenkernel33/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/09/22 11:55:59 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2016/07/09 13:04:08 wiz Exp $
 
 VERSION=	3.3.2
 DISTNAME=	xen-${VERSION}
@@ -27,7 +27,7 @@ USE_TOOLS+=	gmake
 
 PYTHON_FOR_BUILD_ONLY=	yes
 PY_PATCHPLIST=		NO
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.3.2
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 3.3.2
 
 SUBST_CLASSES+=		py
 SUBST_STAGE.py=		pre-build
@@ -53,6 +53,9 @@ EXTRA_CFLAGS+=	-Qunused-arguments -no-integrated-as -Wno-error=format \
 		-Wno-error=tautological-compare -Wno-error=unused-function \
 		-Wno-error=unused-local-typedef
 BUILDLINK_TRANSFORM+=	rm:-fno-reorder-blocks
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+EXTRA_CFLAGS+=	-Wno-error=unused-but-set-variable \
+		-Wno-error=unused-local-typedefs
 .endif
 
 do-build:

sysutils/xenkernel33/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2013/07/13 19:43:21 joerg Exp $
+$NetBSD: distinfo,v 1.20 2016/03/01 20:09:04 joerg Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
+SHA512 (xen-3.3.2.tar.gz) = e080dd9599a6bdd91be924c87316ac1ed825040d258c07ebf6035d84f909b5f81b7b0e4383b358b561a5aba6bff6940d2e8013f6e2ca503f428bdf377820911c
 Size (xen-3.3.2.tar.gz) = 11357576 bytes
 SHA1 (patch-CVE-2012-3432) = aed03164e9d05379c0a768bf29643c3e94eefce1
 SHA1 (patch-Config.mk) = a70e4e1f19d8a8f935a3f2b1b9d24e23e845b920
@@ -15,4 +16,5 @@ SHA1 (patch-compat_memory_c) = f45daded92c0dac30213d6d7dcc81ac72ead7c47
 SHA1 (patch-include_xen_compat_h) = 96ba96ba31792f48c989f033f7706f09fd1171c2
 SHA1 (patch-xen_Makefile) = 30d27b40fb8f5c4ee663a6a82abf36db3b7ebd1c
 SHA1 (patch-xen_arch_x86_Rules.mk) = 81bdc8a653b57b5fcb9ae7d835f0284ab800dc21
+SHA1 (patch-xen_arch_x86_x86__64_entry.S) = 9bb46e2b8ba173725c62b39aba2941463d85245d
 SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a

sysutils/xenkernel33/patches/patch-xen_arch_x86_x86__64_entry.S

@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_arch_x86_x86__64_entry.S,v 1.1 2016/03/01 20:09:04 joerg Exp $
+
+--- xen/arch/x86/x86_64/entry.S.orig	2016-03-01 12:46:35.754573228 +0000
++++ xen/arch/x86/x86_64/entry.S
+@@ -54,7 +54,7 @@ restore_all_guest:
+         addq  $8,%rsp
+         popq  %rcx                    # RIP
+         popq  %r11                    # CS
+-        cmpw  $FLAT_USER_CS32,%r11
++        cmpw  $FLAT_USER_CS32,%r11w
+         popq  %r11                    # RFLAGS
+         popq  %rsp                    # RSP
+         je    1f