Attachment 190998 Details for Bug 226204 – patch-open-vm-tools

[patch] patch-open-vm-tools

open-vm-tools_20180225.diff (text/plain), 5.85 KB, created by Olli Hauer on 2018-02-25 18:39:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2018-02-25 18:39:26 UTC

Size: 5.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 462967)
>+++ Makefile	(working copy)
>@@ -21,8 +21,8 @@
> RELEASE_VER=		10.2.0
> BUILD_VER=		7253323
> 
>-OPTIONS_DEFINE=		DNET LIBNOTIFY OPENSSL X11
>-OPTIONS_DEFAULT=	DNET LIBNOTIFY OPENSSL X11
>+OPTIONS_DEFINE=		DNET LIBNOTIFY OPENSSL X11 FUSE
>+OPTIONS_DEFAULT=	DNET LIBNOTIFY OPENSSL X11 FUSE
> 
> OPTIONS_SUB=
> 
>@@ -38,11 +38,12 @@
> DNET_CONFIGURE_WITH=	dnet
> DNET_LIB_DEPENDS=	libdnet.so:net/libdnet
> OPENSSL_CONFIGURE_WITH=	ssl
>+FUSE_USES=		fuse
> 
> WRKSRC_SUBDIR=		open-vm-tools
> 
> GNU_CONFIGURE=		yes
>-USES=			autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig
>+USES=			autoreconf gettext-runtime kmod libtool localbase pathfix pkgconfig
> USE_GNOME=		glib20
> 
> USE_GITHUB=		yes
>@@ -55,6 +56,9 @@
> 
> CONFIGURE_ARGS+=	--without-icu \
> 			--disable-vgauth \
>+			--disable-grabbitmqproxy \
>+			--without-procps \
>+			--disable-deploypkg \
> 			--sysconfdir=${PREFIX}/etc
> 
> CONFLICTS+=		vmware-guestd[0-9]* vmware-tools[0-9]*
>@@ -80,7 +84,7 @@
> 		${WRKSRC}/lib/guestApp/guestApp.c
> 
> post-build:
>-	cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
>+	(cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS})
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
>@@ -88,9 +92,7 @@
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d
>+	${INSTALL_DATA} ${FILESDIR}/tools.conf.sample ${STAGEDIR}${PREFIX}/share/vmware-tools/
> 
> .include <bsd.port.post.mk>
>Index: files/tools.conf.sample
>===================================================================
>--- files/tools.conf.sample	(nonexistent)
>+++ files/tools.conf.sample	(working copy)
>@@ -0,0 +1,3 @@
>+[logging]
>+vmsvc.level=error
>+
>
>Property changes on: files/tools.conf.sample
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/vmware-kmod.in
>===================================================================
>--- files/vmware-kmod.in	(revision 462967)
>+++ files/vmware-kmod.in	(working copy)
>@@ -16,7 +16,7 @@
> vmware_mod_load()
> {
> 	echo -n "Loading $1 kernel module: "
>-	kldstat -n %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko >/dev/null 2>&1
>+	kldstat -qn %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko
> 	if [ "$?" = "0" ]; then
> 		echo "already loaded."
> 	else
>@@ -32,7 +32,7 @@
> vmware_mod_status()
> {
> 	echo -n "Checking $1 kernel module: "
>-	kldstat -n %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko >/dev/null 2>&1
>+	kldstat -qn %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko
> 	if [ "$?" = "0" ]; then
> 		echo "loaded."
> 	else
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 462967)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,4 @@
>-bin/vmhgfs-fuse
>+%%FUSE%%bin/vmhgfs-fuse
> bin/vmtoolsd
> bin/vmware-checkvm
> bin/vmware-hgfsclient
>@@ -5,11 +5,11 @@
> bin/vmware-namespace-cmd
> bin/vmware-rpctool
> bin/vmware-toolbox-cmd
>-bin/vmware-vmblock-fuse
> %%X11%%bin/vmware-user
> %%X11%%bin/vmware-user-suid-wrapper
>-%%X11%%etc/xdg/autostart/vmware-user.desktop
>+%%FUSE%%bin/vmware-vmblock-fuse
> bin/vmware-xferlogs
>+etc/pam.d/vmtoolsd
> include/vmGuestLib/includeCheck.h
> include/vmGuestLib/vmGuestLib.h
> include/vmGuestLib/vmSessionId.h
>@@ -26,7 +26,6 @@
> lib/libvmtools.so
> lib/libvmtools.so.0
> lib/libvmtools.so.0.0.0
>-@dir lib/vmware-tools/modules/input
> lib/open-vm-tools/plugins/common/libhgfsServer.so
> lib/open-vm-tools/plugins/common/libvix.so
> lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
>@@ -36,11 +35,19 @@
> %%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
> %%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
> %%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
>+%%X11%%etc/xdg/autostart/vmware-user.desktop
> lib/vmware-tools/modules/drivers/vmblock.ko
> lib/vmware-tools/modules/drivers/vmmemctl.ko
> lib/vmware-tools/modules/drivers/vmxnet.ko
> libdata/pkgconfig/vmguestlib.pc
> sbin/mount_vmblock
>+%%DATADIR%%/messages/de/toolboxcmd.vmsg
>+%%DATADIR%%/messages/de/vmtoolsd.vmsg
>+%%DATADIR%%/messages/ja/toolboxcmd.vmsg
>+%%DATADIR%%/messages/ja/vmtoolsd.vmsg
>+%%DATADIR%%/messages/ko/toolboxcmd.vmsg
>+%%DATADIR%%/messages/ko/vmtoolsd.vmsg
>+%%DATADIR%%/messages/zh_CN/toolboxcmd.vmsg
> share/vmware-tools/poweroff-vm-default
> share/vmware-tools/poweron-vm-default
> share/vmware-tools/resume-vm-default
>@@ -47,17 +54,8 @@
> share/vmware-tools/scripts/vmware/network
> share/vmware-tools/statechange.subr
> share/vmware-tools/suspend-vm-default
>+@sample share/vmware-tools/tools.conf.sample
> share/vmware-tools/vm-support
>-%%DATADIR%%/messages/de/toolboxcmd.vmsg
>-%%DATADIR%%/messages/de/vmtoolsd.vmsg
>-%%DATADIR%%/messages/ja/toolboxcmd.vmsg
>-%%DATADIR%%/messages/ja/vmtoolsd.vmsg
>-%%DATADIR%%/messages/ko/toolboxcmd.vmsg
>-%%DATADIR%%/messages/ko/vmtoolsd.vmsg
>-%%DATADIR%%/messages/zh_CN/toolboxcmd.vmsg
>-@rmtry etc/vmware-tools/plugins
>-etc/pam.d/vmtoolsd
>-@dir %%DATADIR%%/scripts/vmware
>-@dir %%DATADIR%%/tests
>+@dir lib/vmware-tools/modules/input
> @preunexec %%PREFIX%%/bin/vmware-rpctool 'tools.set.version 0' ; service vmware-guestd stop 2>/dev/null || /usr/bin/true
> @postexec service vmware-kmod restart && service vmware-guestd restart || /usr/bin/true

Actions: View | Diff

Attachments on bug 226204: 190998