ports/118566: ports/vmware-guestd5 can't install to 8-current guest

[Tomoyuki Okazaki]

>Number:         118566
>Category:       ports
>Synopsis:       ports/vmware-guestd5 can't install to 8-current guest
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 12 06:30:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Tomoyuki Okazaki
>Release:        8-current
>Organization:
NTT Software Corp.
>Environment:
FreeBSD current 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Fri Nov 30 19:00:39 JST 2007     okazaki at current:/usr/obj/usr/src/sys/CURRENT  i386

>Description:
I'm using vmware 5.5.5 for windows (and vmware-server 1.0.4 for linux) with 8-current guest OS.
And I can't install vmware-tools for 8-current guest.
('Bad system call' and core dumps)


>How-To-Repeat:
On vmware 5.5.5, just cd /usr/ports/emulators/vmware-guestd5; make install

>Fix:
Use 6.0 binaries for 6.0-RELEASE or later.
I made a patch for it, but can't test 64bit-guests.
Please check it.


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/Makefile,v
retrieving revision 1.38
diff -u -8 -p -r1.38 Makefile
--- Makefile	7 Oct 2007 02:56:17 -0000	1.38
+++ Makefile	12 Dec 2007 06:03:32 -0000
@@ -2,17 +2,17 @@
 # Date created:		10 Aug 2000
 # Whom:			matusita at jp.FreeBSD.org
 #
 # $FreeBSD: ports/emulators/vmware-guestd5/Makefile,v 1.38 2007/10/07 02:56:17 edwin Exp $
 #
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?=	3
+PORTREVISION?=	1
 CATEGORIES=	emulators kld
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-guestd
 DISTNAME=	vmware-freebsd-tools
 
 MAINTAINER=	matusita at FreeBSD.org
 COMMENT?=VMware guest OS supporting daemon (VMware Workstation 5.x, FreeBSD version)
 
@@ -32,59 +32,71 @@ IS_INTERACTIVE=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 .if defined(WITH_VMWARE_GTK)
 PLIST_SUB+=	INSTALLXGTKTOOL:=""
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	glib12 gtk12
+.if (${OSVERSION} >= 600000)
+LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+.else
 LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
+.endif
 .else
 PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
 .endif
 .else
 USE_RC_SUBR=	vmware-guestd.sh
 .endif
 
 RESTRICTED=	"Not sure if we can redistribute this."
 NO_PACKAGE=	${RESTRICTED}
 
-VMWARE_VER=	5.5.1
-BUILD_VER=	19175
+VMWARE_VER=	5.5.5
+BUILD_VER=	56455
 
 .include <bsd.port.pre.mk>
 
 MOUNT_DEV?=	/dev/acd0
 MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
 .if ${ARCH} == i386
+.if (${OSVERSION} >= 600000)
+BITS?=		32-6
+.else
 BITS?=		32
+.endif
 .else # ${ARCH} == amd64
+.if (${OSVERSION} >= 600000)
+BITS?=		64-6
+.else
 BITS?=		64
 .endif
+.endif
 
 .if defined(VMWARE_X_PORTS)
 
 .if ${X_WINDOW_SYSTEM:L} == xfree86-4
 PLIST_SUB+=	INSTALLXSERVER4:=""
 .else
 PLIST_SUB+=	INSTALLXSERVER4:="@comment "
 .endif
 
 .else
 
 VMWARE_KMODDIR=	${PREFIX}/lib/vmware-tools/modules
 
 .if !defined(WITHOUT_VMWARE_VMMEMCTL) && exists(/usr/src/sys/Makefile)
 WITH_VMWARE_VMMEMCTL=YES
 .endif
-.if !defined(WITHOUT_VMWARE_VMXNET) && (${BITS} == 32)
+.if !defined(WITHOUT_VMWARE_VMXNET) && ((${BITS} == 32) || (${BITS} == 32-6))
 WITH_VMWARE_VMXNET=YES
 .endif
 
 .if defined(WITH_VMWARE_VMMEMCTL)
 PLIST_SUB+=	VMWARE_VMMEMCTL:=""
 .else
 PLIST_SUB+=	VMWARE_VMMEMCTL:="@comment "
 .endif
@@ -93,19 +105,22 @@ PLIST_SUB+=	VMWARE_VMMEMCTL:="@comment "
 .if (${OSVERSION} < 600000)
 PLIST_SUB+=	VMWARE_VMXNET:=""
 .if ${BITS} == 32
 VMWARE_VMXNET_PATH=	5.3-i386/vmxnet.ko
 .else
 VMWARE_VMXNET_PATH=	5.3-amd64/vmxnet.ko
 .endif
 .else
-# VMware doesn't provide vmxnet.ko for other versions
-.undef WITH_VMWARE_VMXNET
-PLIST_SUB+=	VMWARE_VMXNET:="@comment "
+PLIST_SUB+=	VMWARE_VMXNET:=""
+.if ${BITS} == 32-6
+VMWARE_VMXNET_PATH=	6.0-i386/vmxnet.ko
+.else
+VMWARE_VMXNET_PATH=	6.0-amd64/vmxnet.ko
+.endif
 .endif
 .else
 PLIST_SUB+=	VMWARE_VMXNET:="@comment "
 .endif
 
 .if defined(WITH_VMWARE_VMMEMCTL) || defined(WITH_VMWARE_VMXNET)
 PLIST_SUB+=	VMWARE_KMODDIR:=""
 .else
@@ -159,25 +174,25 @@ do-install:
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
 .if ${X_WINDOW_SYSTEM:L} == xfree86-4
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 	if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/drivers ; \
 	fi
-.if ${BITS} == 32
+.if ${BITS} == 32 || ${BITS} == 32-6
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .else
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .endif
 .else
-.if ${BITS} == 32
+.if ${BITS} == 32 || ${BITS} == 32-6
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .else
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .endif
 .endif
 	-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
 
 .else


>Release-Note:
>Audit-Trail:
>Unformatted: