Pullup ticket #3520 - requested by bouyer

sysutils/xenkernel3: security patch
sysutils/xenkernel33: security patch

Revisions pulled up:
- sysutils/xenkernel3/Makefile                                  1.21
- sysutils/xenkernel3/distinfo                                  1.15
- sysutils/xenkernel3/patches/patch-SA45835                     1.1
- sysutils/xenkernel33/Makefile                                 1.15
- sysutils/xenkernel33/distinfo                                 1.14
- sysutils/xenkernel33/patches/patch-SA45835                    1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Sat Sep 10 18:35:51 UTC 2011

   Modified Files:
   	pkgsrc/sysutils/xenkernel3: Makefile distinfo
   	pkgsrc/sysutils/xenkernel33: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/xenkernel3/patches: patch-SA45835
   	pkgsrc/sysutils/xenkernel33/patches: patch-SA45835

   Log Message:
   Apply patch from http://www.openwall.com/lists/oss-security/2011/09/02/2,
   fixing SA45835.
   Bump pkgrevision

6 files changed, 34 insertions, 6 deletions

diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index 0352ba26f98..19ff899821b 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2011/03/24 12:43:53 drochner Exp $
+# $NetBSD: Makefile,v 1.20.4.1 2011/09/10 23:34:16 tron Exp $
 #
 
 VERSION=	3.1.4
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel3-${VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 4ea9fb6c4ea..62e2c470ea6 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2011/03/24 12:43:53 drochner Exp $
+$NetBSD: distinfo,v 1.13.4.1 2011/09/10 23:34:16 tron Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
 Size (xen-3.1.4.tar.gz) = 6894493 bytes
+SHA1 (patch-SA45835) = 7af53cb3da8720954242c4c90165bceef362c184
 SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
 SHA1 (patch-ac) = 4c237984832ef5532e0451845e8075b95744e48d
 SHA1 (patch-ba) = cadfa6f2626e95c9ccb85ae7e3a8a7f318ea343f
diff --git a/sysutils/xenkernel3/patches/patch-SA45835 b/sysutils/xenkernel3/patches/patch-SA45835
new file mode 100644
index 00000000000..6f957b32b04
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-SA45835
@@ -0,0 +1,13 @@
+$NetBSD: patch-SA45835,v 1.1.2.2 2011/09/10 23:34:16 tron Exp $
+
+--- xen/include/asm-x86/x86_64/uaccess.h.orig	2008-04-25 15:03:12.000000000 +0200
++++ xen/include/asm-x86/x86_64/uaccess.h	2011-09-10 20:26:42.000000000 +0200
+@@ -8,7 +8,7 @@
+  * non-canonical address (and thus fault) before ever reaching VIRT_START.
+  */
+ #define __addr_ok(addr) \
+-    (((unsigned long)(addr) < (1UL<<48)) || \
++    (((unsigned long)(addr) < (1UL<<47)) || \
+      ((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
+ 
+ #define access_ok(addr, size) (__addr_ok(addr))
diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile
index 574375c6550..a15ab09d5ba 100644
--- a/sysutils/xenkernel33/Makefile
+++ b/sysutils/xenkernel33/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2011/04/04 09:07:06 hauke Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2011/09/10 23:34:16 tron Exp $
 #
 
 VERSION=	3.3.2
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel33-${VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 EXTRACT_SUFX=	.tar.gz
diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo
index 7f8dc1d5ad0..347c58a95ee 100644
--- a/sysutils/xenkernel33/distinfo
+++ b/sysutils/xenkernel33/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2011/04/04 09:07:06 hauke Exp $
+$NetBSD: distinfo,v 1.12.2.1 2011/09/10 23:34:16 tron Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
 Size (xen-3.3.2.tar.gz) = 11357576 bytes
+SHA1 (patch-SA45835) = 7d27c26ba947354bb5e279f3add9eb073a151477
 SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7
 SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc
 SHA1 (patch-ac) = ed1dc87e4f1d80112befc63372bc91ee621f57e6
diff --git a/sysutils/xenkernel33/patches/patch-SA45835 b/sysutils/xenkernel33/patches/patch-SA45835
new file mode 100644
index 00000000000..5fd95c35daa
--- /dev/null
+++ b/sysutils/xenkernel33/patches/patch-SA45835
@@ -0,0 +1,13 @@
+$NetBSD: patch-SA45835,v 1.1.2.2 2011/09/10 23:34:16 tron Exp $
+
+--- xen/include/asm-x86/x86_64/uaccess.h.orig	2011-09-10 20:10:52.000000000 +0200
++++ xen/include/asm-x86/x86_64/uaccess.h	2011-09-10 20:11:28.000000000 +0200
+@@ -19,7 +19,7 @@
+  * non-canonical address (and thus fault) before ever reaching VIRT_START.
+  */
+ #define __addr_ok(addr) \
+-    (((unsigned long)(addr) < (1UL<<48)) || \
++    (((unsigned long)(addr) < (1UL<<47)) || \
+      ((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
+ 
+ #define access_ok(addr, size) \