Update to 3.2.1pl1nb2.

- Depend on vmware-module-3.2.1.8 or greater.
- Add an programm to binary patch the vmware executeable to fix a problem
  with newer glibcs. Fixes PR 27268.
- Disable this package for NetBSD 3.0, because there is a kernel problem,
  which was fixed in current.
- Add a note that a tmpfs /tmp doesn't work.

4 files changed, 41 insertions, 5 deletions

diff --git a/emulators/vmware3/MESSAGE.NetBSD b/emulators/vmware3/MESSAGE.NetBSD
index 348571feda5..f30e230196e 100644
--- a/emulators/vmware3/MESSAGE.NetBSD
+++ b/emulators/vmware3/MESSAGE.NetBSD
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2004/10/16 15:20:01 jdolecek Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.2 2006/03/26 21:37:12 veego Exp $
 
 NetBSD had problem with emulation of Linux SVID shared memory handling,
 which caused black screen in VMware 3.x when the guest OS switched
@@ -8,4 +8,6 @@ to graphics mode. The problem has been fixed in NetBSD 2.99.9 and
 
 If you experience this problem, setting your DISPLAY environment variable
 to "localhost:0" should help.
+
+VMware fails to start if you use a tmpfs for /tmp.
 ===========================================================================
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 2b8406cc6a9..1cd4e813429 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/26 21:37:12 veego Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://download3.vmware.com/software/wkst/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -16,7 +16,15 @@ COMMENT=	VMware emulator 3.x
 
 CONFLICTS=	vmware-2.*
 
-DEPENDS+=	vmware-module-3.*:../../emulators/vmware-module3
+# Binary patch to fix an problem with the nice(3) interface in an
+# newer glibc (>= v2.3.3)
+VMWARE_BIN_PATCH=	vmware-any-any-update99
+
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	${VMWARE_BIN_PATCH}.tar.gz
+SITES.${VMWARE_BIN_PATCH}.tar.gz=	ftp://ftp.cvut.cz/vmware/
+
+DEPENDS+=	vmware-module>=3.2.1.8:../../emulators/vmware-module3
 DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
@@ -25,6 +33,8 @@ WRKSRC=		${WRKDIR}/vmware-distrib
 CHECK_SHLIBS=	NO
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
+# There is a kernel bug in NetBSD 3.0 for vmware.
+NOT_FOR_PLATFORM=	NetBSD-3.0*-i386
 
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -43,6 +53,11 @@ INSTALLATION_DIRS=	bin man/man1
 
 do-build:
 	${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
+	cd ${WRKDIR}/${VMWARE_BIN_PATCH} &&	\
+	${RM} -f update &&			\
+	${CC} ${CFLAGS} -o update update.c &&	\
+	${CHMOD} u+w ${WRKSRC}/bin/vmware && 	\
+	./update vmware ${WRKSRC}/bin/vmware
 
 do-install: do-install-dirs do-install-binaries do-install-docs \
 		do-install-share
diff --git a/emulators/vmware3/distinfo b/emulators/vmware3/distinfo
index d72310cea8d..36623e2a59d 100644
--- a/emulators/vmware3/distinfo
+++ b/emulators/vmware3/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:49:22 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/03/26 21:37:12 veego Exp $
 
 SHA1 (VMware-workstation-3.2.1-2242.tar.gz) = 3f3c8539270707087525e220264a38639bf17547
 RMD160 (VMware-workstation-3.2.1-2242.tar.gz) = f2a6c3cc38f3c3851446e8902237b958367293a1
 Size (VMware-workstation-3.2.1-2242.tar.gz) = 12577292 bytes
+SHA1 (vmware-any-any-update99.tar.gz) = ac2a6621fdaacfe40422d71fe27d567826635dd7
+RMD160 (vmware-any-any-update99.tar.gz) = e22e0530d248dde2922283683573eaa02cdbc567
+Size (vmware-any-any-update99.tar.gz) = 296093 bytes
+SHA1 (patch-aa) = 85d8d8da295c3cfb733b93f32bd2b6f6a25d13ac
diff --git a/emulators/vmware3/patches/patch-aa b/emulators/vmware3/patches/patch-aa
new file mode 100644
index 00000000000..598cd9f1e9e
--- /dev/null
+++ b/emulators/vmware3/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2006/03/26 21:37:12 veego Exp $
+
+--- ../vmware-any-any-update99/update.c.orig	2006-02-19 09:51:39.000000000 +0100
++++ ../vmware-any-any-update99/update.c
+@@ -508,8 +508,10 @@ static int trypatch2242(struct file* fd,
+ "\xEB\x26\xFF\x73\x14\xE8";
+ 	return trypatch(fd, name, (off_t)0x12930, oldcodeNICE,        newcodeNICE,        sizeof(newcodeNICE) - 1,
+ 				  (off_t)0x1299A, oldcodeNICE2,       newcodeNICE2,       sizeof(newcodeNICE2) - 1,
++/*
+ 				  (off_t)416460,  oldcodeALLOCLOWMEM, newcodeALLOCLOWMEM, sizeof(newcodeALLOCLOWMEM) - 1,
+ 				  (off_t)0x65CE4, oldcodeFREELOWMEM,  newcodeFREELOWMEM,  sizeof(newcodeFREELOWMEM) - 1,
++*/
+ 				  (off_t)0);
+ }
+