ports/160941: [PATCH] emulators/open-vm-tools: upgrade to release 2011.08.21

Fri Sep 23 14:50:06 UTC 2011

>Number:         160941
>Category:       ports
>Synopsis:       [PATCH] emulators/open-vm-tools: upgrade to release 2011.08.21
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 23 14:50:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jimmy Olgeni
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD backoffice 8.2-STABLE FreeBSD 8.2-STABLE #1: Sun May 15 20:37:17 CEST 2011
>Description:
The current open-vm-tools in ports is broken due to a recent X11 library upgrade:

In file included from /usr/local/include/X11/extensions/render.h:29,
                 from /usr/local/include/X11/extensions/Xrender.h:33,
                 from /usr/local/include/X11/extensions/Xrandr.h:33,
                 from resolutionX11.c:32:
/usr/local/include/X11/Xdefs.h:47: error: conflicting types for 'Bool'
/usr/ports/emulators/open-vm-tools/work/open-vm-tools-2010.10.18-313025/lib/include/vm_basic_types.h:86: error: previous declaration of 'Bool' was here
resolutionX11.c:116: error: conflicting types for 'ResolutionBackendInit'
resolutionInt.h:73: error: previous declaration of 'ResolutionBackendInit' was here
resolutionX11.c:170: error: conflicting types for 'ResolutionSetResolution'
resolutionInt.h:76: error: previous declaration of 'ResolutionSetResolution' was here
resolutionX11.c:207: error: conflicting types for 'ResolutionSetTopology'
resolutionInt.h:81: error: previous declaration of 'ResolutionSetTopology' was here
*** Error code 1

The attached patch upgrades it to release 2011.08.21:

- pkg-plist was tested with tinderbox

- I didn't touch the portlint warnings to avoid building a confusing patch

- The X11 part is untested, so beware :)

I'm not a heavy VMware user so there might still be some rough edges I didn't bump into yet.

Added file(s):
- files/patch-vmblockmounter_Makefile.in

Removed file(s):
- files/patch-wrapper-wrapper-freebsd.c

Port maintainer (mbr at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- open-vm-tools-471295.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/Makefile,v
retrieving revision 1.48
diff -u -u -r1.48 Makefile
--- Makefile	23 Aug 2011 18:39:04 -0000	1.48
+++ Makefile	23 Sep 2011 14:40:56 -0000
@@ -7,7 +7,6 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		4
 CATEGORIES=		emulators kld
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
 DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
@@ -15,8 +14,8 @@
 MAINTAINER=		mbr at FreeBSD.org
 COMMENT?=		Open VMware tools for FreeBSD VMware guests
 
-RELEASE_DATE=		2010.10.18
-BUILD_VER=		313025
+RELEASE_DATE=		2011.08.21
+BUILD_VER=		471295
 
 LICENSE=		LGPL21
 LICENSE_FILE=		${WRKSRC}/COPYING
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/distinfo,v
retrieving revision 1.12
diff -u -u -r1.12 distinfo
--- distinfo	25 Dec 2010 16:55:29 -0000	1.12
+++ distinfo	23 Sep 2011 14:40:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (open-vm-tools-2010.10.18-313025.tar.gz) = cbf3f1a7e5229309a8440a424969dfe523c307a183d6aff9aa56a7d0d8e05d3c
-SIZE (open-vm-tools-2010.10.18-313025.tar.gz) = 3565621
+SHA256 (open-vm-tools-2011.08.21-471295.tar.gz) = d17c5bcba50ddad495c56b06805f6d8061a1a11553fef67ee8dcaec42f26e83a
+SIZE (open-vm-tools-2011.08.21-471295.tar.gz) = 3671447
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/pkg-plist,v
retrieving revision 1.26
diff -u -u -r1.26 pkg-plist
--- pkg-plist	15 Nov 2010 23:57:51 -0000	1.26
+++ pkg-plist	23 Sep 2011 14:40:56 -0000
@@ -1,9 +1,10 @@
+bin/vmtoolsd
 bin/vmware-checkvm
 bin/vmware-hgfsclient
 bin/vmware-rpctool
-bin/vmware-xferlogs
-bin/vmtoolsd
 bin/vmware-toolbox-cmd
+bin/vmware-xferlogs
+sbin/mount_vmblock
 %%FUSE%%bin/vmware-vmblock-fuse
 lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
@@ -14,7 +15,6 @@
 lib/open-vm-tools/plugins/common/libvix.so
 lib/open-vm-tools/plugins/common/libvix.la
 %%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
-%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
 %%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
 %%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
 lib/libhgfs.a
@@ -41,16 +41,19 @@
 include/vmGuestLib/vm_basic_types.h
 @exec mkdir -p %D/lib/vmware-tools/modules/input
 sbin/mount_vmhgfs
-%%X11%%bin/vmware-toolbox
 %%X11%%bin/vmware-user-suid-wrapper
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-share/open-vm-tools/messages/toolboxcmd_de.vmsg
-share/open-vm-tools/messages/toolboxcmd_ja.vmsg
-share/open-vm-tools/messages/toolboxcmd_zh_CN.vmsg
+share/open-vm-tools/messages/de/toolboxcmd.vmsg
+share/open-vm-tools/messages/de/vmtoolsd.vmsg
+share/open-vm-tools/messages/ja/toolboxcmd.vmsg
+share/open-vm-tools/messages/ja/vmtoolsd.vmsg
+share/open-vm-tools/messages/ko/toolboxcmd.vmsg
+share/open-vm-tools/messages/ko/vmtoolsd.vmsg
+share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
 share/vmware-tools/statechange.subr
 share/vmware-tools/scripts/vmware/network
 @exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
@@ -62,14 +65,18 @@
 @dirrmtry lib/vmware-tools/modules
 @dirrmtry lib/vmware-tools
 @dirrmtry etc/vmware-tools
- at dirrmtry share/open-vm-tools/messages
- at dirrmtry share/open-vm-tools/scripts/vmware
- at dirrmtry share/open-vm-tools/scripts
- at dirrmtry share/open-vm-tools/tests
- at dirrmtry share/open-vm-tools
 @dirrmtry share/vmware-tools/scripts/vmware
 @dirrmtry share/vmware-tools/scripts
 @dirrmtry share/vmware-tools
+ at dirrmtry share/open-vm-tools/tests
+ at dirrmtry share/open-vm-tools/scripts/vmware
+ at dirrmtry share/open-vm-tools/scripts
+ at dirrmtry share/open-vm-tools/messages/zh_CN
+ at dirrmtry share/open-vm-tools/messages/ko
+ at dirrmtry share/open-vm-tools/messages/ja
+ at dirrmtry share/open-vm-tools/messages/de
+ at dirrmtry share/open-vm-tools/messages
+ at dirrmtry share/open-vm-tools
 @dirrmtry libdata/pkgconfig
 %%X11%%@dirrmtry share/applications
 @dirrm lib/open-vm-tools/plugins/common
Index: files/patch-hgfsmounter-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in,v
retrieving revision 1.2
diff -u -u -r1.2 patch-hgfsmounter-Makefile.in
--- files/patch-hgfsmounter-Makefile.in	2 Jan 2010 16:29:44 -0000	1.2
+++ files/patch-hgfsmounter-Makefile.in	23 Sep 2011 14:40:56 -0000
@@ -1,9 +1,12 @@
---- hgfsmounter/Makefile.in.orig	2009-04-06 17:24:30.000000000 -0400
-+++ hgfsmounter/Makefile.in	2009-04-06 17:26:09.000000000 -0400
-@@ -569,9 +569,9 @@
+
+$FreeBSD$
+
+--- hgfsmounter/Makefile.in.orig
++++ hgfsmounter/Makefile.in
+@@ -612,15 +612,15 @@
+ @FREEBSD_TRUE at install-exec-hook:
  @FREEBSD_TRUE@	mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
  @FREEBSD_TRUE@		$(DESTDIR)$(sbindir)/mount_vmhgfs
- @FREEBSD_TRUE@@WITH_ROOT_PRIVILEGES_TRUE@	chmod u+s $(DESTDIR)$(sbindir)/mount_vmhgfs
 - at FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
 - at FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
 - at FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
@@ -13,3 +16,12 @@
  @FREEBSD_TRUE at uninstall-hook:
  @FREEBSD_TRUE@	rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
  @FREEBSD_FALSE at install-exec-hook:
+- at FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
+- at FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
+- at FREEBSD_FALSE@		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
++#@FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
++#@FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
++#@FREEBSD_FALSE@		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
+ @FREEBSD_FALSE at uninstall-hook:
+ @FREEBSD_FALSE@	rm -f $(DESTDIR)/sbin/mount.vmhgfs
+ 
Index: files/patch-vmblockmounter_Makefile.in
===================================================================
RCS file: files/patch-vmblockmounter_Makefile.in
diff -N files/patch-vmblockmounter_Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-vmblockmounter_Makefile.in	23 Sep 2011 14:40:56 -0000
@@ -0,0 +1,27 @@
+
+$FreeBSD$
+
+--- vmblockmounter/Makefile.in.orig
++++ vmblockmounter/Makefile.in
+@@ -606,15 +606,15 @@
+ @FREEBSD_TRUE at install-exec-hook:
+ @FREEBSD_TRUE@	mv $(DESTDIR)$(sbindir)/mount.vmblock \
+ @FREEBSD_TRUE@		$(DESTDIR)$(sbindir)/mount_vmblock
+- at FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
+- at FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmblock \
+- at FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmblock &> /dev/null
++#@FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
++#@FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmblock \
++#@FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmblock &> /dev/null
+ @FREEBSD_TRUE at uninstall-hook:
+ @FREEBSD_TRUE@	rm -f $(DESTDIR)$(sbindir)/mount_vmblock
+ @FREEBSD_FALSE at install-exec-hook:
+- at FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
+- at FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmblock \
+- at FREEBSD_FALSE@		$(DESTDIR)/sbin/mount.vmblock &> /dev/null
++#@FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
++#@FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmblock \
++#@FREEBSD_FALSE@		$(DESTDIR)/sbin/mount.vmblock &> /dev/null
+ @FREEBSD_FALSE at uninstall-hook:
+ @FREEBSD_FALSE@	rm -f $(DESTDIR)/sbin/mount.vmblock
+ 
Index: files/patch-wrapper-wrapper-freebsd.c
===================================================================
RCS file: files/patch-wrapper-wrapper-freebsd.c
diff -N files/patch-wrapper-wrapper-freebsd.c
--- files/patch-wrapper-wrapper-freebsd.c	16 Nov 2010 20:37:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- vmware-user-suid-wrapper/wrapper-freebsd.c.orig	2010-10-20 05:19:54.000000000 +0900
-+++ vmware-user-suid-wrapper/wrapper-freebsd.c	2010-11-16 17:52:55.000000000 +0900
-@@ -116,7 +116,7 @@
-    /*
-     * Kldload(2) will handle module search paths for us.
-     */
--   if (kldload(MODULE_NAME) == -1) {
-+   if (kldload(VMWARE_KMOD_DIR "/" MODULE_NAME ".ko") == -1) {
-       Error("failed to load vmblock: %s\n", strerror(errno));
-       return FALSE;
-    }
--- open-vm-tools-471295.patch ends here ---

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

