Date: Fri, 30 Dec 2011 17:39:57 -0500 (EST) From: Steve Wills <swills@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mbr@FreeBSD.org Subject: ports/163725: [PATCH] emulators/open-vm-tools: Update to latest version 2011.12.20-562307 Message-ID: <201112302239.pBUMdvX8068668@meatwad.mouf.net> Resent-Message-ID: <201112302240.pBUMeCXC032512@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163725
>Category: ports
>Synopsis: [PATCH] emulators/open-vm-tools: Update to latest version 2011.12.20-562307
>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 Dec 30 22:40:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Steve Wills
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #8: Mon Dec 19 15:53:28 EST 2011
>Description:
Attached patch updates port to latest version. This would allow closing PR ports/160941.
If maintainer would like, I can commit it.
Added file(s):
- files/patch-vmblockmounter-Makefile.in
Removed file(s):
- files/patch-services-Makefile
Port maintainer (mbr@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- open-vm-tools-562307.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/Makefile,v
retrieving revision 1.53
diff -u -u -r1.53 Makefile
--- Makefile 7 Nov 2011 04:24:54 -0000 1.53
+++ Makefile 30 Dec 2011 22:37:23 -0000
@@ -8,8 +8,8 @@
PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER}
CATEGORIES= emulators kld
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
-DISTNAME= open-vm-tools-${RELEASE_VER}-${BUILD_VER}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
+DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
MAINTAINER= mbr@FreeBSD.org
COMMENT?= Open VMware tools for FreeBSD VMware guests
@@ -17,10 +17,10 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-RELEASE_VER= 8.6.0
-BUILD_VER= 425873
+RELEASE_DATE= 2011.12.20
+BUILD_VER= 562307
-WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
+WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/distinfo,v
retrieving revision 1.13
diff -u -u -r1.13 distinfo
--- distinfo 14 Oct 2011 20:12:20 -0000 1.13
+++ distinfo 30 Dec 2011 22:37:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (open-vm-tools-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
-SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
+SHA256 (open-vm-tools-2011.12.20-562307.tar.gz) = 421c396d4cc345165d1f4076792c62ae95cbcd06007e5a4e930c021f90fee570
+SIZE (open-vm-tools-2011.12.20-562307.tar.gz) = 3511859
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/pkg-plist,v
retrieving revision 1.27
diff -u -u -r1.27 pkg-plist
--- pkg-plist 14 Oct 2011 20:12:20 -0000 1.27
+++ pkg-plist 30 Dec 2011 22:37:23 -0000
@@ -4,6 +4,8 @@
bin/vmware-xferlogs
bin/vmtoolsd
bin/vmware-toolbox-cmd
+%%X11%%etc/xdg/autostart/vmware-user.desktop
+etc/pam.d/vmtoolsd
%%FUSE%%bin/vmware-vmblock-fuse
lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
@@ -14,7 +16,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 +42,20 @@
include/vmGuestLib/vm_basic_types.h
@exec mkdir -p %D/lib/vmware-tools/modules/input
sbin/mount_vmhgfs
-%%X11%%bin/vmware-toolbox
+sbin/mount_vmblock
%%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/de/toolbox.vmsg
-share/open-vm-tools/messages/ja/toolbox.vmsg
-share/open-vm-tools/messages/zh_CN/toolbox.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,8 +67,11 @@
@dirrmtry lib/vmware-tools/modules
@dirrmtry lib/vmware-tools
@dirrmtry etc/vmware-tools
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
@dirrmtry share/open-vm-tools/messages/de
@dirrmtry share/open-vm-tools/messages/ja
+@dirrmtry share/open-vm-tools/messages/ko
@dirrmtry share/open-vm-tools/messages/zh_CN
@dirrmtry share/open-vm-tools/messages
@dirrmtry share/open-vm-tools/scripts/vmware
Index: files/patch-services-Makefile
===================================================================
RCS file: files/patch-services-Makefile
diff -N files/patch-services-Makefile
--- files/patch-services-Makefile 15 Nov 2010 23:57:51 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
---- services/Makefile.am.orig 2009-02-28 20:48:46.000000000 +0100
-+++ services/Makefile.am 2009-02-28 20:49:28.000000000 +0100
-@@ -20,6 +20,5 @@
- SUBDIRS += plugins
-
- install-exec-local:
-- mkdir -p $(DESTDIR)/etc/vmware-tools
-- ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+ mkdir -p $(prefix)/etc/vmware-tools
-
---- services/Makefile.in.orig 2009-02-28 20:48:52.000000000 +0100
-+++ services/Makefile.in 2009-02-28 20:49:46.000000000 +0100
-@@ -642,8 +642,7 @@
-
-
- install-exec-local:
-- mkdir -p $(DESTDIR)/etc/vmware-tools
-- ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+ mkdir -p $(prefix)/etc/vmware-tools
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
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 30 Dec 2011 22:37:23 -0000
@@ -0,0 +1,15 @@
+--- vmblockmounter/Makefile.in.orig 2011-12-30 22:07:00.000000000 +0000
++++ vmblockmounter/Makefile.in 2011-12-30 22:09:04.000000000 +0000
+@@ -598,9 +598,9 @@
+ @FREEBSD_TRUE@install-exec-hook:
+ @FREEBSD_TRUE@ mv $(DESTDIR)$(sbindir)/mount.vmblock \
+ @FREEBSD_TRUE@ $(DESTDIR)$(sbindir)/mount_vmblock
+-@FREEBSD_TRUE@ -$(MKDIR_P) $(DESTDIR)/sbin
+-@FREEBSD_TRUE@ -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmblock \
+-@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@uninstall-hook:
+ @FREEBSD_TRUE@ rm -f $(DESTDIR)$(sbindir)/mount_vmblock
+ @FREEBSD_FALSE@install-exec-hook:
--- open-vm-tools-562307.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112302239.pBUMdvX8068668>