Attachment 192608 Details for Bug 227124 – patch for 10.2.5 version

patch for 10.2.5 version

openvmtools.patch.txt (text/plain), 8.90 KB, created by Josh Paetzel on 2018-04-18 02:58:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Paetzel

Created: 2018-04-18 02:58:00 UTC

Size: 8.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 467652)
>+++ Makefile	(working copy)
>@@ -4,7 +4,6 @@
> PORTNAME=		open-vm-tools
> PORTVERSION=		${RELEASE_VER}
> DISTVERSIONPREFIX=	stable-
>-PORTREVISION=		5
> PORTEPOCH=		2
> CATEGORIES=		emulators
> 
>@@ -18,8 +17,8 @@
> 
> LIB_DEPENDS=		libmspack.so:archivers/libmspack
> 
>-RELEASE_VER=		10.2.0
>-BUILD_VER=		7253323
>+RELEASE_VER=		10.2.5
>+BUILD_VER=		8068406
> 
> OPTIONS_DEFINE=		DNET LIBNOTIFY OPENSSL X11
> OPTIONS_DEFAULT=	DNET LIBNOTIFY OPENSSL X11
>Index: distinfo
>===================================================================
>--- distinfo	(revision 467652)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513787562
>-SHA256 (vmware-open-vm-tools-stable-10.2.0_GH0.tar.gz) = 40dccff0630034b4985ac7a0d3bfcf89025e9a57f518e561db8c6fd7322bf029
>-SIZE (vmware-open-vm-tools-stable-10.2.0_GH0.tar.gz) = 3200084
>+TIMESTAMP = 1524018090
>+SHA256 (vmware-open-vm-tools-stable-10.2.5_GH0.tar.gz) = c0f182c0c422fca8f8b3e5c21802f724256dfe5907383db28ec7e4d5b6d52b0f
>+SIZE (vmware-open-vm-tools-stable-10.2.5_GH0.tar.gz) = 3207633
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(revision 467652)
>+++ files/patch-configure.ac	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2017-02-24 22:15:37 UTC
>+--- configure.ac.orig	2018-03-30 18:44:35 UTC
> +++ configure.ac
>-@@ -1082,7 +1082,7 @@ AC_CHECK_HEADERS([sys/user.h],
>+@@ -1095,7 +1095,7 @@ AC_CHECK_HEADERS([sys/user.h],
>     ])
>  AC_CHECK_HEADERS([sys/vfs.h])
>  AC_CHECK_HEADERS([syslimits.h])
>@@ -9,7 +9,7 @@
>  
>  AC_CHECK_HEADER(
>     [wchar.h],
>-@@ -1137,7 +1137,7 @@ AC_C_VOLATILE
>+@@ -1142,7 +1142,7 @@ AC_C_VOLATILE
>  
>  ### General flags / actions
>  CFLAGS="$CFLAGS -Wall"
>Index: files/patch-lib_guestApp_guestApp.c
>===================================================================
>--- files/patch-lib_guestApp_guestApp.c	(revision 467652)
>+++ files/patch-lib_guestApp_guestApp.c	(working copy)
>@@ -1,4 +1,4 @@
>---- lib/guestApp/guestApp.c.orig	2017-02-24 22:15:37 UTC
>+--- lib/guestApp/guestApp.c.orig	2018-03-30 18:44:35 UTC
> +++ lib/guestApp/guestApp.c
> @@ -63,7 +63,7 @@
>  #elif defined __APPLE__
>@@ -5,7 +5,7 @@
>  #   define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools"
>  #else
> -#   define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools"
>-+#   define GUESTAPP_TOOLS_INSTALL_PATH "%%PREFIX%%/share/vmware-tools"
>++#   define GUESTAPP_TOOLS_INSTALL_PATH "/usr/local/share/vmware-tools"
>  #endif
>  
>  #if defined _WIN32
>Index: files/patch-lib_include_vm__basic__types.h
>===================================================================
>--- files/patch-lib_include_vm__basic__types.h	(revision 467652)
>+++ files/patch-lib_include_vm__basic__types.h	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/include/vm_basic_types.h.orig	2017-02-24 22:15:37 UTC
>+--- lib/include/vm_basic_types.h.orig	2018-03-30 18:44:35 UTC
> +++ lib/include/vm_basic_types.h
>-@@ -415,6 +415,7 @@ typedef int64 VmTimeVirtualClock;  /* Vi
>+@@ -418,6 +418,7 @@ typedef int64 VmTimeVirtualClock;  /* Virtual Clock ke
>        #endif
>     #elif defined(__linux__) || \
>          (defined(__FreeBSD__) && (__FreeBSD__ + 0))\
>Index: files/patch-lib_misc_util__misc.c
>===================================================================
>--- files/patch-lib_misc_util__misc.c	(revision 467652)
>+++ files/patch-lib_misc_util__misc.c	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/misc/util_misc.c.orig	2017-02-24 22:15:37 UTC
>+--- lib/misc/util_misc.c.orig	2018-03-30 18:44:35 UTC
> +++ lib/misc/util_misc.c
>-@@ -307,7 +307,7 @@ Util_CanonicalPathsIdentical(const char 
>+@@ -303,7 +303,7 @@ Util_CanonicalPathsIdentical(const char *path1,  // IN
>     return (strcmp(path1, path2) == 0);
>  #elif defined(_WIN32)
>     return (_stricmp(path1, path2) == 0);
>Index: files/patch-lib_vmCheck_vmcheck.c
>===================================================================
>--- files/patch-lib_vmCheck_vmcheck.c	(revision 467652)
>+++ files/patch-lib_vmCheck_vmcheck.c	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/vmCheck/vmcheck.c.orig	2017-02-24 22:15:37 UTC
>+--- lib/vmCheck/vmcheck.c.orig	2018-03-30 18:44:35 UTC
> +++ lib/vmCheck/vmcheck.c
>-@@ -134,6 +134,7 @@ VmCheckSafe(SafeCheckFn checkFn)
>+@@ -135,6 +135,7 @@ VmCheckSafe(SafeCheckFn checkFn)
>  #else
>     do {
>        int signals[] = {
>Index: files/patch-lib_wiper_wiperPosix.c
>===================================================================
>--- files/patch-lib_wiper_wiperPosix.c	(revision 467652)
>+++ files/patch-lib_wiper_wiperPosix.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- lib/wiper/wiperPosix.c.orig	2018-02-24 17:51:48 UTC
>-+++ lib/wiper/wiperPosix.c
>-@@ -143,6 +143,7 @@ static const PartitionInfo gKnownPartitions[] = {
>-    { "ntfs",      PARTITION_NTFS,         NULL,                   TRUE        },
>-    { "pcfs",      PARTITION_PCFS,         NULL,                   TRUE        },
>-    { "reiserfs",  PARTITION_REISERFS,     NULL,                   TRUE        },
>-+   { "ufs",       PARTITION_UFS,          NULL,                   TRUE        },
>-    { "vfat",      PARTITION_FAT,          NULL,                   TRUE        },
>-    { "zfs",       PARTITION_ZFS,          NULL,                   FALSE       },
>-    { "xfs",       PARTITION_XFS,          NULL,                   TRUE        },
>
>Property changes on: files/patch-lib_wiper_wiperPosix.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-modules_Makefile.am
>===================================================================
>--- files/patch-modules_Makefile.am	(revision 467652)
>+++ files/patch-modules_Makefile.am	(working copy)
>@@ -1,6 +1,6 @@
>---- modules/Makefile.am.orig	2017-04-25 03:59:07 UTC
>+--- modules/Makefile.am.orig	2018-04-18 02:28:12 UTC
> +++ modules/Makefile.am
>-@@ -63,11 +63,11 @@ if SOLARIS
>+@@ -48,11 +48,11 @@ if SOLARIS
>  	done
>  endif
>  if FREEBSD
>@@ -15,5 +15,5 @@
> +#	      $(DESTDIR)$(MODULES_DIR);                                        \
> +#	done
>  endif
>- if LINUX
>- 	for MOD in $(MODULES); do                                              \
>+ 
>+ uninstall-hook:
>Index: files/patch-modules_freebsd_vmblock_vfsops.c
>===================================================================
>--- files/patch-modules_freebsd_vmblock_vfsops.c	(revision 467652)
>+++ files/patch-modules_freebsd_vmblock_vfsops.c	(working copy)
>@@ -1,6 +1,6 @@
>---- modules/freebsd/vmblock/vfsops.c.orig	2017-02-24 22:15:37 UTC
>+--- modules/freebsd/vmblock/vfsops.c.orig	2018-03-30 18:44:35 UTC
> +++ modules/freebsd/vmblock/vfsops.c
>-@@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp,       
>+@@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
>     char *pathname;
>     int len, error = 0;
>  
>@@ -12,15 +12,15 @@
>     VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp);
>  
>     /*
>-@@ -277,6 +282,11 @@ VMBlockVFSUnmount(struct mount *mp,    /
>+@@ -276,6 +281,11 @@ VMBlockVFSUnmount(struct mount *mp,    // IN: filesyst
>+    void *mntdata;
>     int error;
>     int flags = 0, removed = 0;
>- 
>++
> +#if __FreeBSD_version >= 800087
> +   struct thread *td;
> +   td = curthread;
> +#endif
>-+
>+ 
>     VMBLOCKDEBUG("VMBlockVFSUnmount: mp = %p\n", (void *)mp);
>  
>-    xmp = MNTTOVMBLOCKMNT(mp);
>Index: files/patch-services_plugins_vix_vixTools.c
>===================================================================
>--- files/patch-services_plugins_vix_vixTools.c	(revision 467652)
>+++ files/patch-services_plugins_vix_vixTools.c	(working copy)
>@@ -1,4 +1,4 @@
>---- services/plugins/vix/vixTools.c.orig	2017-12-15 21:11:49 UTC
>+--- services/plugins/vix/vixTools.c.orig	2018-03-30 18:44:35 UTC
> +++ services/plugins/vix/vixTools.c
> @@ -52,6 +52,7 @@
>  #include <stdarg.h>
>@@ -8,26 +8,7 @@
>  
>  #ifdef _WIN32
>  #include <WTypes.h>
>-@@ -7330,7 +7331,7 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
>-          goto abort;
>-       }
>-    }
>--   for (var = 0; var <= 0xFFFFFFFF; var++) {
>-+   for (var = 0; ; var++) {
>-       free(tempScriptFilePath);
>-       tempScriptFilePath = Str_SafeAsprintf(NULL,
>-                                             "%s"DIRSEPS"%s%d%s",
>-@@ -7373,6 +7374,9 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
>-           */
>-          break;
>-       }
>-+      if (var == INT_MAX) {
>-+         break;
>-+      }
>-    }
>-    if (fd < 0) {
>-       /*
>-@@ -10131,7 +10135,7 @@ abort:
>+@@ -10133,7 +10134,7 @@ abort:
>     struct passwd pwd;
>     struct passwd *ppwd = &pwd;
>     char *buffer = NULL; // a pool of memory for Posix_Getpwnam_r() to use.
>@@ -36,7 +17,7 @@
>  
>     /*
>      * For POSIX systems, look up the uid of 'username', and compare
>-@@ -10144,9 +10148,15 @@ abort:
>+@@ -10146,9 +10147,15 @@ abort:
>      * Multiply by 4 to compensate for the conversion to UTF-8 by
>      * the Posix_Getpwnam_r() wrapper.
>      */

Actions: View

Attachments on bug 227124: 192608