Update to Xen 3.3.2.

This is a mainenance release with a number of stability fixes.

12 files changed, 61 insertions, 206 deletions

diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile
index 3708023f4a5..67ed6c4d81f 100644
--- a/sysutils/xenkernel33/Makefile
+++ b/sysutils/xenkernel33/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2009/02/18 20:31:29 cegger Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/07 12:43:46 cegger Exp $
 #
 
-VERSION=	3.3.1
+VERSION=	3.3.2
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel33-${VERSION}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	cegger@NetBSD.org
 HOMEPAGE=	http://xen.org/
-COMMENT=	Xen 3.3.1 Kernel
+COMMENT=	Xen 3.3.2 Kernel
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo
index c27fe68e6f6..4d0b395d52e 100644
--- a/sysutils/xenkernel33/distinfo
+++ b/sysutils/xenkernel33/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/01/13 13:48:33 cegger Exp $
+$NetBSD: distinfo,v 1.9 2009/08/07 12:43:46 cegger Exp $
 
-SHA1 (xen-3.3.1.tar.gz) = fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9
-RMD160 (xen-3.3.1.tar.gz) = 31d3e801b4eec37715900c6247be403aaafdd5e1
-Size (xen-3.3.1.tar.gz) = 11329774 bytes
+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-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index 8e300e26be7..86d4accab81 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2009/02/20 23:22:47 cegger Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/07 12:49:21 cegger Exp $
 #
 
-VERSION=		3.3.1
+VERSION=		3.3.2
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools33-${VERSION}
-PKGREVISION=		6
+#PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 EXTRACT_SUFX=		.tar.gz
diff --git a/sysutils/xentools33/PLIST b/sysutils/xentools33/PLIST
index 1aa1e768413..cace582c824 100644
--- a/sysutils/xentools33/PLIST
+++ b/sysutils/xentools33/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:16:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/08/07 12:49:21 cegger Exp $
 bin/lsevtchn
 bin/pygrub
 bin/readnotes
@@ -482,7 +482,6 @@ sbin/blktapctrl
 sbin/flask-loadpolicy
 sbin/fs-backend
 sbin/img2qcow
-sbin/netfix
 sbin/qcow-create
 sbin/qcow2raw
 sbin/tapdisk
diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo
index 95e3aa2dafc..554813cd2fb 100644
--- a/sysutils/xentools33/distinfo
+++ b/sysutils/xentools33/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.16 2009/02/20 23:22:47 cegger Exp $
+$NetBSD: distinfo,v 1.17 2009/08/07 12:49:21 cegger Exp $
 
-SHA1 (xen-3.3.1.tar.gz) = fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9
-RMD160 (xen-3.3.1.tar.gz) = 31d3e801b4eec37715900c6247be403aaafdd5e1
-Size (xen-3.3.1.tar.gz) = 11329774 bytes
+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-aa) = 74c3023e39baf488f8bae060e93f6175b32df61a
 SHA1 (patch-ab) = a6244d421dc995c9bcbc9959de422972f9d46b6d
 SHA1 (patch-ac) = 70af1b1a787b9dad9e41a2ffe14d595c6797b4d7
 SHA1 (patch-ad) = 323e854e5872e770580068fa93a74bd0b1531025
 SHA1 (patch-ae) = bb7116a71bf6637591b639511f055836a13d9887
-SHA1 (patch-af) = c39bd79ebb409e6e0bfc45b9c048fbf77863d7a0
+SHA1 (patch-af) = 0d4cd2bc3c56934bd072bc72b34e5ed677d04969
 SHA1 (patch-ag) = 6b6c26c5fbb28b9cc37e76b250cc90fed111e78a
 SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549
 SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d
@@ -21,7 +21,7 @@ SHA1 (patch-be) = 7567a4430b18399cd69f9088803567dfe7b20c9a
 SHA1 (patch-bf) = 51f4b08ccaa3e6c062a489d8e4a7a6a5ccdb221a
 SHA1 (patch-bg) = 0121c07ddc67b6801cdd15488bc681378a466949
 SHA1 (patch-bh) = a072c1e2dd21aa284303b5fcc7eae5ff841a5fbc
-SHA1 (patch-bi) = 6012614ffb424119d0219fd14085d97c2a9f5e26
+SHA1 (patch-bi) = 49c1b77b451b63cfe3a1fded7f6d0410d4c3cf92
 SHA1 (patch-bj) = 4c6b6a73d3ea5fb2c57b12dd4651f59024119276
 SHA1 (patch-bk) = a79256edc3dc2a5f4bcdbe1a2d14037ad74f11de
 SHA1 (patch-ca) = b62ec8f0db5e65d737d1aaf3bd44580f5969328b
@@ -31,11 +31,11 @@ SHA1 (patch-cd) = 5563a72e203e789a86f4166c71ddb3fcff5215c6
 SHA1 (patch-ce) = 24d71f68a93b59bd5c5441c257d34862e7302040
 SHA1 (patch-cf) = 055af260b497cbfaa5732f05267526e9fb1d1536
 SHA1 (patch-cg) = 1f6ec716a101256274b6fff47b825271403a1ee0
-SHA1 (patch-da) = b775dc2ba49bd2d3e044f7393294e2194d8c6b60
+SHA1 (patch-da) = f05d504ea9160af781f82652308fbb98c7925a8f
 SHA1 (patch-db) = 6e9e9d0e06716990c1532968aed97fe8a3877869
 SHA1 (patch-dc) = fdbe8e8c5f4f00b6c5212d429e830af5dc51d92b
-SHA1 (patch-dd) = 343e7af31a0801ee71fb4943b61220bf52718a94
-SHA1 (patch-de) = 0f2b717b2ae14ce128c361e7b3fbb570615090c2
+SHA1 (patch-dd) = e94a0ff0c0d30f7441675f52b5f13e575f09dff8
+SHA1 (patch-de) = 3e08b61cc625cfd1a4eaacbd4a325a28ce315919
 SHA1 (patch-df) = 46b99d00c6562c41e5fd96df8dbcb0653c1baa46
 SHA1 (patch-ea) = 4c5cd6bd798488c13a264b567a67aa7cb5f8a2e4
 SHA1 (patch-eb) = cf63c43ccbc6b7b435be871e392f9729bd392ab4
@@ -49,5 +49,3 @@ SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141
 SHA1 (patch-fc) = 37c9b0897182de93a01f9620ef6346ef68157770
 SHA1 (patch-fd) = cb4741bf33050d72cfbcd2eff4a8632d976de643
 SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3
-SHA1 (patch-ga) = 12b32e7af51d49f068e2e6533bec901d9d128e9c
-SHA1 (patch-gb) = b4ff4785791112077bfb4160fb88642aa4b2b346
diff --git a/sysutils/xentools33/patches/patch-af b/sysutils/xentools33/patches/patch-af
index 5662953c8c9..1883b01a0d1 100644
--- a/sysutils/xentools33/patches/patch-af
+++ b/sysutils/xentools33/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2009/01/13 13:48:33 cegger Exp $
+$NetBSD: patch-af,v 1.3 2009/08/07 12:49:21 cegger Exp $
 
---- misc/Makefile.orig	2009-01-05 11:26:59.000000000 +0000
+--- misc/Makefile.orig	2009-08-06 14:56:36.000000000 +0200
 +++ misc/Makefile
 @@ -14,17 +14,21 @@ TARGETS-y := xenperf
  TARGETS-$(CONFIG_X86) += xen-detect xenpm
@@ -12,15 +12,15 @@ $NetBSD: patch-af,v 1.2 2009/01/13 13:48:33 cegger Exp $
  SUBDIRS := $(SUBDIRS-y)
  
 -INSTALL_BIN-y := xencons
-+INSTALL_BIN-y := 
++INSTALL_BIN-y :=
 +INSTALL_BIN_SCRIPT-y := xencons
  INSTALL_BIN-$(CONFIG_X86) += xen-detect
  INSTALL_BIN := $(INSTALL_BIN-y)
 +INSTALL_BIN_SCRIPT := $(INSTALL_BIN_SCRIPT-y)
  
--INSTALL_SBIN-y := netfix xm xen-bugtool xen-python-path xend xenperf xsview
+-INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview
 +INSTALL_SBIN-y := xenperf
-+INSTALL_SBIN_SCRIPT-y := netfix xm xen-bugtool xen-python-path xend xsview
++INSTALL_SBIN_SCRIPT-y := xm xen-bugtool xen-python-path xend xsview
  INSTALL_SBIN-$(CONFIG_X86) += xenpm
  INSTALL_SBIN := $(INSTALL_SBIN-y)
 +INSTALL_SBIN_SCRIPT := $(INSTALL_SBIN_SCRIPT-y)
diff --git a/sysutils/xentools33/patches/patch-bi b/sysutils/xentools33/patches/patch-bi
index 3014c1b3ced..c948a34932a 100644
--- a/sysutils/xentools33/patches/patch-bi
+++ b/sysutils/xentools33/patches/patch-bi
@@ -1,8 +1,8 @@
-$NetBSD: patch-bi,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
+$NetBSD: patch-bi,v 1.2 2009/08/07 12:49:21 cegger Exp $
 
---- xenstore/Makefile.orig	2008-08-01 16:38:07.000000000 +0200
+--- xenstore/Makefile.orig	2009-08-06 14:56:38.000000000 +0200
 +++ xenstore/Makefile
-@@ -94,24 +94,24 @@ tarball: clean
+@@ -90,24 +90,24 @@ tarball: clean
  
  .PHONY: install
  install: all
@@ -39,5 +39,5 @@ $NetBSD: patch-bi,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
 +	$(BSD_INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR)
 +	$(BSD_INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR)
  
- -include $(DEP)
+ -include $(DEPS)
  
diff --git a/sysutils/xentools33/patches/patch-da b/sysutils/xentools33/patches/patch-da
index 058b6dda183..24c4f0bba42 100644
--- a/sysutils/xentools33/patches/patch-da
+++ b/sysutils/xentools33/patches/patch-da
@@ -1,17 +1,17 @@
-$NetBSD: patch-da,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
+$NetBSD: patch-da,v 1.2 2009/08/07 12:49:21 cegger Exp $
 
---- libfsimage/common/Makefile.orig	2008-08-01 16:38:07.000000000 +0200
+--- libfsimage/common/Makefile.orig	2009-08-06 14:56:35.000000000 +0200
 +++ libfsimage/common/Makefile
-@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
+@@ -4,6 +4,8 @@ include $(XEN_ROOT)/tools/Rules.mk
  MAJOR = 1.0
  MINOR = 0
  
--CFLAGS += -Werror -Wp,-MD,.$(@F).d
-+CFLAGS += -Werror -Wp,-MD,.$(@F).d -DFSIMAGE_FSDIR=\"$(LIBDIR)/fs\"
- DEPS = .*.d
- 
++CFLAGS += -DFSIMAGE_FSDIR=\"$(LIBDIR)/fs\"
++
  LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
-@@ -22,14 +22,14 @@ all: $(LIB)
+ LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+ LDFLAGS = $(LDFLAGS-y)
+@@ -19,14 +21,14 @@ all: $(LIB)
  
  .PHONY: install
  install: all
diff --git a/sysutils/xentools33/patches/patch-dd b/sysutils/xentools33/patches/patch-dd
index c44855cba01..c430c17b731 100644
--- a/sysutils/xentools33/patches/patch-dd
+++ b/sysutils/xentools33/patches/patch-dd
@@ -1,8 +1,8 @@
-$NetBSD: patch-dd,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
+$NetBSD: patch-dd,v 1.2 2009/08/07 12:49:21 cegger Exp $
 
---- flask/loadpolicy/Makefile.orig	2008-08-01 16:38:07.000000000 +0200
+--- flask/loadpolicy/Makefile.orig	2009-08-06 14:56:33.000000000 +0200
 +++ flask/loadpolicy/Makefile
-@@ -51,8 +51,8 @@ print-end:
+@@ -48,8 +48,8 @@ print-end:
  
  .PHONY: install
  install: all
@@ -11,5 +11,5 @@ $NetBSD: patch-dd,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
 +	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(SBINDIR)
 +	$(BSD_INSTALL_PROGRAM) $(CLIENTS) $(DESTDIR)$(SBINDIR)
  
- -include $(PROG_DEP)
+ -include $(DEPS)
  
diff --git a/sysutils/xentools33/patches/patch-de b/sysutils/xentools33/patches/patch-de
index 33f35716feb..cd912645149 100644
--- a/sysutils/xentools33/patches/patch-de
+++ b/sysutils/xentools33/patches/patch-de
@@ -1,6 +1,6 @@
-$NetBSD: patch-de,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
+$NetBSD: patch-de,v 1.2 2009/08/07 12:49:21 cegger Exp $
 
---- examples/Makefile.orig	2008-08-07 10:56:22.000000000 +0200
+--- examples/Makefile.orig	2009-08-06 14:56:33.000000000 +0200
 +++ examples/Makefile
 @@ -7,7 +7,7 @@ XENDOMAINS_INITD = init.d/xendomains
  XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
@@ -20,7 +20,7 @@ $NetBSD: patch-de,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
  XEN_SCRIPTS = network-bridge vif-bridge
  XEN_SCRIPTS += network-route vif-route
  XEN_SCRIPTS += network-nat vif-nat
-@@ -41,10 +41,10 @@ XEN_SCRIPT_DATA += xen-hotplug-common.sh
+@@ -41,7 +41,7 @@ XEN_SCRIPT_DATA += xen-hotplug-common.sh
  XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
  XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl
  
@@ -28,12 +28,27 @@ $NetBSD: patch-de,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
 +XEN_HOTPLUG_DIR = ${PKG_SYSCONFDIR}/hotplug
  XEN_HOTPLUG_SCRIPTS = xen-backend.agent
  
+ UDEVVER = 0
+@@ -52,7 +52,7 @@ ifeq ($(shell [ -x /usr/bin/udevinfo ] &
+ UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
+ endif
+ 
 -UDEV_RULES_DIR = /etc/udev
 +UDEV_RULES_DIR = ${PKG_SYSCONFDIR}/udev
  UDEV_RULES = xen-backend.rules
  
  DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
-@@ -79,52 +79,47 @@ install-readmes:
+@@ -79,60 +79,55 @@ install: all install-readmes install-ini
+ .PHONY: install-readmes
+ install-readmes:
+ 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
+-		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
++		$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
+ 	set -e; for i in $(XEN_READMES); \
+ 	    do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
+-	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
++	    $(BSD_INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
+ 	done
  
  .PHONY: install-initd
  install-initd:
diff --git a/sysutils/xentools33/patches/patch-ga b/sysutils/xentools33/patches/patch-ga
deleted file mode 100644
index 7347700fa9b..00000000000
--- a/sysutils/xentools33/patches/patch-ga
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-ga,v 1.3 2009/02/20 23:22:47 cegger Exp $
-
---- python/xen/xend/XendBootloader.py.orig	2009-01-05 11:26:59.000000000 +0000
-+++ python/xen/xend/XendBootloader.py
-@@ -67,9 +67,23 @@ def bootloader(blexec, disk, dom, quiet 
-     # listening on the bootloader's fifo for the results.
- 
-     (m1, s1) = pty.openpty()
--    tty.setraw(m1);
--    fcntl.fcntl(m1, fcntl.F_SETFL, os.O_NDELAY);
--    os.close(s1)
-+
-+    # On Solaris, the pty master side will get cranky if we try
-+    # to write to it while there is no slave. To work around this,
-+    # keep the slave descriptor open until we're done. Set it
-+    # to raw terminal parameters, otherwise it will echo back
-+    # characters, which will confuse the I/O loop below.
-+    # Furthermore, a raw master pty device has no terminal
-+    # semantics on Solaris, so don't try to set any attributes
-+    # for it.
-+    if os.uname()[0] != 'SunOS' and os.uname()[0] != 'NetBSD':
-+        tty.setraw(m1)
-+        os.close(s1)
-+    else:
-+        tty.setraw(s1)
-+
-+    fcntl.fcntl(m1, fcntl.F_SETFL, os.O_NDELAY)
-+
-     slavename = ptsname.ptsname(m1)
-     dom.storeDom("console/tty", slavename)
- 
-@@ -108,7 +122,11 @@ def bootloader(blexec, disk, dom, quiet 
-     # record that this domain is bootloading
-     dom.bootloader_pid = child
- 
--    tty.setraw(m2);
-+    # On Solaris, the master pty side does not have terminal semantics,
-+    # so don't try to set any attributes, as it will fail.
-+    if os.uname()[0] != 'SunOS':
-+        tty.setraw(m2);
-+
-     fcntl.fcntl(m2, fcntl.F_SETFL, os.O_NDELAY);
-     while True:
-         try:
-@@ -117,32 +135,55 @@ def bootloader(blexec, disk, dom, quiet 
-             if e.errno == errno.EINTR:
-                 continue
-         break
-+
-+    fcntl.fcntl(r, fcntl.F_SETFL, os.O_NDELAY);
-+
-     ret = ""
-     inbuf=""; outbuf="";
-+    # filedescriptors:
-+    #   r - input from the bootloader (bootstring output)
-+    #   m1 - input/output from/to xenconsole
-+    #   m2 - input/output from/to pty that controls the bootloader
-+    # The filedescriptors are NDELAY, so it's ok to try to read
-+    # bigger chunks than may be available, to keep e.g. curses
-+    # screen redraws in the bootloader efficient. m1 is the side that
-+    # gets xenconsole input, which will be keystrokes, so a small number
-+    # is sufficient. m2 is pygrub output, which will be curses screen
-+    # updates, so a larger number (1024) is appropriate there.
-+    #
-+    # For writeable descriptors, only include them in the set for select
-+    # if there is actual data to write, otherwise this would loop too fast,
-+    # eating up CPU time.
-+
-     while True:
--        sel = select.select([r, m1, m2], [m1, m2], [])
-+        wsel = []
-+        if len(outbuf) != 0:
-+            wsel = wsel + [m1]
-+        if len(inbuf) != 0:
-+            wsel = wsel + [m2]
-+        sel = select.select([r, m1, m2], wsel, [])
-         try: 
-             if m1 in sel[0]:
--                s = os.read(m1, 1)
-+                s = os.read(m1, 16)
-                 inbuf += s
--            if m2 in sel[1] and len(inbuf) != 0:
--                os.write(m2, inbuf[0])
--                inbuf = inbuf[1:]
-+            if m2 in sel[1]:
-+                n = os.write(m2, inbuf)
-+                inbuf = inbuf[n:]
-         except OSError, e:
-             if e.errno == errno.EIO:
-                 pass
-         try:
-             if m2 in sel[0]:
--                s = os.read(m2, 1)
-+                s = os.read(m2, 1024)
-                 outbuf += s
--            if m1 in sel[1] and len(outbuf) != 0:
--                os.write(m1, outbuf[0])
--                outbuf = outbuf[1:]
-+            if m1 in sel[1]:
-+                n = os.write(m1, outbuf)
-+                outbuf = outbuf[n:]
-         except OSError, e:
-             if e.errno == errno.EIO:
-                 pass
-         if r in sel[0]:
--            s = os.read(r, 1)
-+            s = os.read(r, 128)
-             ret = ret + s
-             if len(s) == 0:
-                 break
-@@ -152,6 +193,8 @@ def bootloader(blexec, disk, dom, quiet 
-     os.close(r)
-     os.close(m2)
-     os.close(m1)
-+    if os.uname()[0] == 'SunOS' or os.uname()[0] == 'NetBSD':
-+        os.close(s1)
-     os.unlink(fifo)
- 
-     # Re-acquire the lock to cover the changes we're about to make
diff --git a/sysutils/xentools33/patches/patch-gb b/sysutils/xentools33/patches/patch-gb
deleted file mode 100644
index 3128cc8bac5..00000000000
--- a/sysutils/xentools33/patches/patch-gb
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-gb,v 1.3 2009/02/20 23:22:47 cegger Exp $
-
---- console/daemon/io.c.orig	2009-01-05 11:26:58.000000000 +0000
-+++ console/daemon/io.c
-@@ -402,9 +402,7 @@ static int domain_create_tty(struct doma
- 	assert(dom->slave_fd == -1);
- 	assert(dom->master_fd == -1);
- 
--	cfmakeraw(&term);
--
--	if (openpty(&dom->master_fd, &dom->slave_fd, NULL, &term, NULL) < 0) {
-+	if (openpty(&dom->master_fd, &dom->slave_fd, NULL, NULL, NULL) < 0) {
- 		err = errno;
- 		dolog(LOG_ERR, "Failed to create tty for domain-%d "
- 		      "(errno = %i, %s)",
-@@ -412,6 +410,22 @@ static int domain_create_tty(struct doma
- 		return 0;
- 	}
- 
-+	if (tcgetattr(dom->slave_fd, &term) < 0) {
-+		err = errno;
-+		dolog(LOG_ERR, "Failed to get tty attributes for domain-%d "
-+			"(errno = %i, %s)",
-+			dom->domid, err, strerror(err));
-+		goto out;
-+	}
-+	cfmakeraw(&term);
-+	if (tcsetattr(dom->slave_fd, TCSANOW, &term) < 0) {
-+		err = errno;
-+		dolog(LOG_ERR, "Failed to set tty attributes for domain-%d "
-+			"(errno = %i, %s)",
-+			dom->domid, err, strerror(err));
-+		goto out;
-+	}
-+
- 	if ((slave = ptsname(dom->master_fd)) == NULL) {
- 		err = errno;
- 		dolog(LOG_ERR, "Failed to get slave name for domain-%d "