Attachment 119373 Details for Bug 161891 – patch.txt

patch.txt

patch.txt (text/plain), 7.84 KB, created by Michael Scheidell on 2012-02-17 15:07:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scheidell

Created: 2012-02-17 15:07:12 UTC

Size: 7.84 KB

patch

obsolete

>diff -bNBru --exclude CVS ./Makefile /usr/ports/emulators/open-vm-tools/Makefile
>--- ./Makefile	2012-02-15 18:09:25.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/Makefile	2011-11-06 23:24:54.000000000 -0500
>@@ -2,30 +2,27 @@
> # Date created:		28 Mar 2008
> # Whom:			mbr@FreeBSD.org
> #
>-# $FreeBSD: ports/emulators/open-vm-tools/Makefile,v 1.58 2012/02/15 23:09:25 pav Exp $
>+# $FreeBSD: ports/emulators/open-vm-tools/Makefile,v 1.53 2011/11/07 04:24:54 miwi Exp $
> #
>+
> PORTNAME=		open-vm-tools
> PORTVERSION=		${BUILD_VER}
>-PORTREVISION=		1
> CATEGORIES=		emulators kld
>-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.8.x
>+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
> DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
> 
>-MAINTAINER=		ports@FreeBSD.org
>+MAINTAINER=		mbr@FreeBSD.org
> COMMENT?=		Open VMware tools for FreeBSD VMware guests
> 
> LICENSE=		LGPL21
> LICENSE_FILE=		${WRKSRC}/COPYING
> 
>-BROKEN=			does not package
>-
>-RELEASE_VER=		8.8.0
>-BUILD_VER=		471268
>+RELEASE_VER=		8.6.0
>+BUILD_VER=		425873
> 
> WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
> GNU_CONFIGURE=		yes
> USE_LDCONFIG=		yes
>-USE_AUTOTOOLS=		automake
> 
> CONFIGURE_ARGS+=	--without-procps --sysconfdir=${LOCALBASE}/etc
> .if defined(WITHOUT_X11)
>@@ -61,13 +58,6 @@
> PLIST_SUB+=	FUSE="@comment "
> .endif
> 
>-.if defined(WITH_LOAD_HGFS)
>-PLIST_SUB+=	NOLOAD=""
>-BROKEN=		remove this line to install broken vmhgfs.ko
>-.else
>-PLIST_SUB+=	NOLOAD="@comment "
>-.endif
>-
> CONFLICTS+=		vmware-guestd[0-9]* vmware-tools[0-9]*
> SUB_FILES=		pkg-message
> 
>@@ -99,9 +89,7 @@
> 	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
>-.if defined(WITH_LOAD_HGFS)
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
>-.endif
> 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
> 	@-kldxref ${PREFIX}/lib/vmware-tools/modules/drivers 2>/dev/null
> 	@${CAT} ${PKGMESSAGE}
>diff -bNBru --exclude CVS ./distinfo /usr/ports/emulators/open-vm-tools/distinfo
>--- ./distinfo	2012-01-07 20:20:39.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/distinfo	2011-10-14 16:12:20.000000000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (open-vm-tools-8.8.0-471268.tar.gz) = 642cf860c9910cd64424a588f8ac4ad500af358e5ca992862bfbd667224ff79c
>-SIZE (open-vm-tools-8.8.0-471268.tar.gz) = 3760851
>+SHA256 (open-vm-tools-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
>+SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
>diff -bNBru --exclude CVS ./files/patch-vmhgfs-Makefile /usr/ports/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
>--- ./files/patch-vmhgfs-Makefile	2012-01-15 19:07:20.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/files/patch-vmhgfs-Makefile	2010-11-15 18:59:05.000000000 -0500
>@@ -1,15 +1,6 @@
>---- modules/freebsd/vmhgfs/Makefile.orig	2011-09-15 02:03:28.000000000 +0000
>-+++ modules/freebsd/vmhgfs/Makefile	2012-01-08 16:11:28.000000000 +0000
>-@@ -47,7 +47,7 @@
>- .endif
>- 
>- COMMON_HGFS_SRCS := debug.c
>--COMMON_HGFS_SRCS := bdhandler.c
>-+COMMON_HGFS_SRCS += bdhandler.c
>- COMMON_HGFS_SRCS += request.c
>- COMMON_HGFS_SRCS += worker.c
>- COMMON_HGFS_SRCS += fsutil.c
>-@@ -93,22 +93,7 @@
>+--- ./modules/freebsd/vmhgfs/Makefile.orig	2010-10-20 05:19:54.000000000 +0900
>++++ ./modules/freebsd/vmhgfs/Makefile	2010-11-11 23:06:07.000000000 +0900
>+@@ -90,22 +90,7 @@
>     CFLAGS += -Ishared
>  .endif
>  
>diff -bNBru --exclude CVS ./files/pkg-message.in /usr/ports/emulators/open-vm-tools/files/pkg-message.in
>--- ./files/pkg-message.in	2012-01-15 19:07:20.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/files/pkg-message.in	2009-01-05 14:43:58.000000000 -0500
>@@ -8,7 +8,4 @@
> vmware_guest_vmxnet_enable="YES"
> vmware_guestd_enable="YES"
> 
>-NOTE: as of this writting, vmhfgs.ko load module is broken.
>-To install and test/debug/fix this module, define WITH_LOAD_HGFS 
>-and remove BROKEN in Makefile
> *******************************************************************
>diff -bNBru --exclude CVS ./files/vmware-guestd.sh.in /usr/ports/emulators/open-vm-tools/files/vmware-guestd.sh.in
>--- ./files/vmware-guestd.sh.in	2012-01-14 03:55:40.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/files/vmware-guestd.sh.in	2010-03-26 20:12:58.000000000 -0400
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: ports/emulators/open-vm-tools/files/vmware-guestd.sh.in,v 1.7 2012/01/14 08:55:40 dougb Exp $
>+# $FreeBSD: ports/emulators/open-vm-tools/files/vmware-guestd.sh.in,v 1.6 2010/03/27 00:12:58 dougb Exp $
> #
> 
> # PROVIDE: vmware-guestd
>@@ -14,7 +14,7 @@
> 
> # VMware guest daemon
> name="vmware_guestd"
>-rcvar=vmware_guestd_enable
>+rcvar=`set_rcvar`
> start_precmd="${checkvm_cmd}"
> unset start_cmd
> stop_precmd="${checkvm_cmd}"
>diff -bNBru --exclude CVS ./files/vmware-kmod.sh.in /usr/ports/emulators/open-vm-tools/files/vmware-kmod.sh.in
>--- ./files/vmware-kmod.sh.in	2012-01-14 03:55:40.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/files/vmware-kmod.sh.in	2010-09-13 23:20:16.000000000 -0400
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: ports/emulators/open-vm-tools/files/vmware-kmod.sh.in,v 1.9 2012/01/14 08:55:40 dougb Exp $
>+# $FreeBSD: ports/emulators/open-vm-tools/files/vmware-kmod.sh.in,v 1.8 2010/09/14 03:20:16 pgollucci Exp $
> #
> 
> # PROVIDE: vmware-kmod
>@@ -42,7 +42,7 @@
> # VMware kernel module: vmmemctl
> kernel_mod="vmmemctl"
> name="vmware_guest_${kernel_mod}"
>-rcvar=vmware_guest_${kernel_mod}_enable
>+rcvar=`set_rcvar`
> extra_commands="status"
> status_cmd="vmware_mod_status ${kernel_mod}"
> start_precmd="${checkvm_cmd}"
>@@ -58,7 +58,7 @@
> # VMware kernel module: vmxnet
> kernel_mod="vmxnet"
> name="vmware_guest_${kernel_mod}"
>-rcvar=vmware_guest_${kernel_mod}_enable
>+rcvar=`set_rcvar`
> extra_commands="status"
> status_cmd="vmware_mod_status ${kernel_mod}"
> start_precmd="${checkvm_cmd}"
>@@ -73,7 +73,7 @@
> # VMware kernel module: vmblock
> kernel_mod="vmblock"
> name="vmware_guest_${kernel_mod}"
>-rcvar=vmware_guest_${kernel_mod}_enable
>+rcvar=`set_rcvar`
> extra_commands="status"
> status_cmd="vmware_mod_status ${kernel_mod}"
> start_precmd="${checkvm_cmd}"
>@@ -88,7 +88,7 @@
> # VMware kernel module: vmhgfs
> kernel_mod="vmhgfs"
> name="vmware_guest_${kernel_mod}"
>-rcvar=vmware_guest_${kernel_mod}_enable
>+rcvar=`set_rcvar`
> extra_commands="status"
> status_cmd="vmware_mod_status ${kernel_mod}"
> start_precmd="${checkvm_cmd}"
>diff -bNBru --exclude CVS ./pkg-plist /usr/ports/emulators/open-vm-tools/pkg-plist
>--- ./pkg-plist	2012-01-15 19:07:20.000000000 -0500
>+++ /usr/ports/emulators/open-vm-tools/pkg-plist	2011-10-14 16:12:20.000000000 -0400
>@@ -32,7 +32,7 @@
> libdata/pkgconfig/vmguestlib.pc
> lib/vmware-tools/modules/drivers/linker.hints
> lib/vmware-tools/modules/drivers/vmblock.ko
>-%%NOLOAD%%lib/vmware-tools/modules/drivers/vmhgfs.ko
>+lib/vmware-tools/modules/drivers/vmhgfs.ko
> lib/vmware-tools/modules/drivers/vmmemctl.ko
> lib/vmware-tools/modules/drivers/vmxnet.ko
> include/vmGuestLib/includeCheck.h
>@@ -41,8 +41,6 @@
> include/vmGuestLib/vm_basic_types.h
> @exec mkdir -p %D/lib/vmware-tools/modules/input
> sbin/mount_vmhgfs
>-sbin/mount_vmblock
>-@unexec rm /sbin/mount_vmblock
> %%X11%%bin/vmware-toolbox
> %%X11%%bin/vmware-user-suid-wrapper
> share/vmware-tools/poweroff-vm-default
>@@ -59,9 +57,6 @@
> @unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
> @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
> @unexec if test -h %D/etc/vmware-tools/plugins; then rm -f %D/etc/vmware-tools/plugins; fi
>-%%X11%%etc/xdg/autostart/vmware-user.desktop
>-@dirrmtry etc/xdg/autostart
>-@dirrmtry etc/xdg
> @dirrmtry lib/vmware-tools/modules/drivers
> @dirrmtry lib/vmware-tools/modules/input
> @dirrmtry lib/vmware-tools/modules

Actions: View

Attachments on bug 161891: 119372 | 119373