Attachment 118703 Details for Bug 161001 – open-vm-tools-425873.patch

[patch] open-vm-tools-425873.patch

open-vm-tools-425873.patch (text/plain), 6.56 KB, created by Steve Wills on 2011-09-25 05:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2011-09-25 05:20:01 UTC

Size: 6.56 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/emulators/open-vm-tools/Makefile,v
>retrieving revision 1.50
>diff -u -u -r1.50 Makefile
>--- Makefile	24 Sep 2011 20:08:58 -0000	1.50
>+++ Makefile	25 Sep 2011 04:07:40 -0000
>@@ -7,22 +7,20 @@
> 
> 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}
>+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
>+DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
> 
> MAINTAINER=		mbr@FreeBSD.org
> COMMENT?=		Open VMware tools for FreeBSD VMware guests
> 
>-RELEASE_DATE=		2010.10.18
>-BUILD_VER=		313025
>-
>-BROKEN=			does not compile
>-
> LICENSE=		LGPL21
> LICENSE_FILE=		${WRKSRC}/COPYING
>-WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
>+
>+RELEASE_VER=		8.6.0
>+BUILD_VER=		425873
>+
>+WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
> GNU_CONFIGURE=		yes
> USE_LDCONFIG=		yes
> 
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/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	25 Sep 2011 03:28:03 -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-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
>+SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/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	25 Sep 2011 03:28:03 -0000
>@@ -48,9 +48,9 @@
> 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/toolbox.vmsg
>+share/open-vm-tools/messages/ja/toolbox.vmsg
>+share/open-vm-tools/messages/zh_CN/toolbox.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,6 +62,9 @@
> @dirrmtry lib/vmware-tools/modules
> @dirrmtry lib/vmware-tools
> @dirrmtry etc/vmware-tools
>+@dirrmtry share/open-vm-tools/messages/de
>+@dirrmtry share/open-vm-tools/messages/ja
>+@dirrmtry share/open-vm-tools/messages/zh_CN
> @dirrmtry share/open-vm-tools/messages
> @dirrmtry share/open-vm-tools/scripts/vmware
> @dirrmtry share/open-vm-tools/scripts
>Index: files/patch-hgfsmounter-Makefile.in
>===================================================================
>RCS file: /home/ncvs/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	25 Sep 2011 04:03:43 -0000
>@@ -1,15 +1,22 @@
>---- 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 @@
>+--- hgfsmounter/Makefile.in.orig	2011-09-21 18:25:50.000000000 +0000
>++++ hgfsmounter/Makefile.in	2011-09-25 04:03:22.000000000 +0000
>+@@ -606,14 +606,14 @@
>  @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
>--@FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
>+ @FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
> -@FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
> -@FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
>-+#@FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
> +#@FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
> +#@FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
>  @FREEBSD_TRUE@uninstall-hook:
>  @FREEBSD_TRUE@	rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
>  @FREEBSD_FALSE@install-exec-hook:
>+-@FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
>+-@FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
>+-@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@uninstall-hook:
>+ @FREEBSD_FALSE@	rm -f $(DESTDIR)/sbin/mount.vmhgfs
>+ 
>Index: files/patch-wrapper-Makefile.in
>===================================================================
>RCS file: files/patch-wrapper-Makefile.in
>diff -N files/patch-wrapper-Makefile.in
>--- files/patch-wrapper-Makefile.in	16 Nov 2010 20:59:32 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,21 +0,0 @@
>---- vmware-user-suid-wrapper/Makefile.in.orig	2010-10-20 05:20:08.000000000 +0900
>-+++ vmware-user-suid-wrapper/Makefile.in	2010-11-16 17:52:55.000000000 +0900
>-@@ -301,7 +301,7 @@
>- top_build_prefix = @top_build_prefix@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>--AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\"
>-+AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\" -DVMWARE_KMOD_DIR=\"$(prefix)/lib/vmware-tools/modules/drivers\"
>- vmware_user_suid_wrapper_SOURCES = main.c wrapper-@TARGET_OS@.c
>- vmware_user_suid_wrapper_LDADD = ../lib/vmSignal/libVmSignal.la
>- desktopfile = vmware-user.desktop
>-@@ -583,7 +583,8 @@
>- 
>- info-am:
>- 
>--install-data-am: install-autostartDATA
>-+#install-data-am: install-autostartDATA
>-+install-data-am:
>- 
>- install-dvi: install-dvi-am
>- 
>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;
>-    }

Actions: View | Diff

Attachments on bug 161001: 118703