|
 |
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/configure.ac open-vm-tools-10.2.5-8068406/configure.ac
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/configure.ac 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/configure.ac 2018-05-08 18:10:45.650397285 -0700
|
|
|
6e701c |
@@ -586,6 +586,11 @@
|
|
|
6e701c |
[enable_vgauth=no],
|
|
|
6e701c |
[with_xml2=yes])
|
|
|
6e701c |
|
|
|
6e701c |
+AC_ARG_WITH([tirpc],
|
|
|
6e701c |
+ [AS_HELP_STRING([--without-tirpc],
|
|
|
6e701c |
+ [compiles without tirpc support.])],
|
|
|
6e701c |
+ [with_tirpc="$withval"],
|
|
|
6e701c |
+ [with_tirpc="auto"])
|
|
|
6e701c |
|
|
|
6e701c |
# Make sure we are building with openssl 1.0.1 and above so that
|
|
|
6e701c |
# we use only TLSv1_2.
|
|
|
6e701c |
@@ -1066,10 +1071,45 @@
|
|
|
6e701c |
|
|
|
6e701c |
fi
|
|
|
6e701c |
|
|
|
6e701c |
+have_tirpc="no"
|
|
|
6e701c |
+if test "x$with_tirpc" != "xno"; then
|
|
|
6e701c |
+ AC_VMW_CHECK_LIB([libtirpc],
|
|
|
6e701c |
+ [TIRPC],
|
|
|
6e701c |
+ [libtirpc],
|
|
|
6e701c |
+ [],
|
|
|
6e701c |
+ [],
|
|
|
6e701c |
+ [],
|
|
|
6e701c |
+ [],
|
|
|
6e701c |
+ [have_tirpc="yes"],
|
|
|
6e701c |
+ [have_tirpc="no"])
|
|
|
6e701c |
+fi
|
|
|
6e701c |
+
|
|
|
6e701c |
+if test "$with_tirpc" = "no"; then
|
|
|
6e701c |
+ use_tirpc="no"
|
|
|
6e701c |
+elif test "$with_tirpc" = "auto"; then
|
|
|
6e701c |
+ use_tirpc=$have_tirpc
|
|
|
6e701c |
+elif test "$with_tirpc" = "yes"; then
|
|
|
6e701c |
+ if test "$have_tirpc" = "no"; then
|
|
|
6e701c |
+ AC_MSG_ERROR([libtirpc is required, but not found.])
|
|
|
6e701c |
+ else
|
|
|
6e701c |
+ use_tirpc="yes"
|
|
|
6e701c |
+ fi
|
|
|
6e701c |
+fi
|
|
|
6e701c |
+
|
|
|
6e701c |
+if test "$use_tirpc" = "yes"; then
|
|
|
6e701c |
+ AC_MSG_NOTICE([Building with libtirpc])
|
|
|
6e701c |
+else
|
|
|
6e701c |
+ AC_MSG_NOTICE([Building without libtirpc])
|
|
|
6e701c |
+fi
|
|
|
6e701c |
+
|
|
|
6e701c |
AC_PATH_PROG(
|
|
|
6e701c |
[RPCGEN],
|
|
|
6e701c |
[rpcgen],
|
|
|
6e701c |
- [ AC_MSG_ERROR([rpcgen not found. Please install the libc devel package.]) ])
|
|
|
6e701c |
+ [not_found])
|
|
|
6e701c |
+
|
|
|
6e701c |
+if test "$RPCGEN" = "not_found"; then
|
|
|
6e701c |
+ AC_MSG_ERROR([rpcgen not found. Please install libc-devel or libc-rpcgen package.])
|
|
|
6e701c |
+fi
|
|
|
6e701c |
|
|
|
6e701c |
###
|
|
|
6e701c |
### Headers
|
|
|
6e701c |
@@ -1406,6 +1446,7 @@
|
|
|
6e701c |
AM_CONDITIONAL(HAVE_UDEV, test "$have_udev" = "yes")
|
|
|
6e701c |
AM_CONDITIONAL(ENABLE_RESOLUTIONKMS, test "x$enable_resolutionkms" = "xyes")
|
|
|
6e701c |
AM_CONDITIONAL(VGAUTH_USE_CXX, test "$with_icu" = "yes" -o "$use_xmlsec1" != "yes")
|
|
|
6e701c |
+AM_CONDITIONAL(HAVE_TIRPC, test "$use_tirpc" = "yes")
|
|
|
6e701c |
|
|
|
6e701c |
if test "$have_xsm" != "yes"; then
|
|
|
6e701c |
AC_DEFINE([NO_XSM], 1, [])
|
|
|
6e701c |
@@ -1454,6 +1495,13 @@
|
|
|
6e701c |
XDR_LIBS="-lnsl -lrpcsvc"
|
|
|
6e701c |
fi
|
|
|
6e701c |
|
|
|
6e701c |
+# In newer Linux distros Sun RPC has been removed from libc
|
|
|
6e701c |
+XDR_CPPFLAGS=
|
|
|
6e701c |
+if test "$os" = "linux" -a "$use_tirpc" = "yes"; then
|
|
|
6e701c |
+ XDR_CPPFLAGS="-DUSE_TIRPC $TIRPC_CPPFLAGS"
|
|
|
6e701c |
+ XDR_LIBS="$TIRPC_LIBS"
|
|
|
6e701c |
+fi
|
|
|
6e701c |
+
|
|
|
6e701c |
# Installation directories for core services plugins.
|
|
|
6e701c |
TEST_PLUGIN_INSTALLDIR=$datadir/open-vm-tools/tests
|
|
|
6e701c |
COMMON_PLUGIN_INSTALLDIR=$libdir/open-vm-tools/plugins/common
|
|
|
6e701c |
@@ -1492,6 +1540,7 @@
|
|
|
6e701c |
AC_SUBST([VMTOOLS_CPPFLAGS])
|
|
|
6e701c |
AC_SUBST([VMTOOLS_LIBS])
|
|
|
6e701c |
AC_SUBST([RPCGENFLAGS])
|
|
|
6e701c |
+AC_SUBST([XDR_CPPFLAGS])
|
|
|
6e701c |
AC_SUBST([XDR_LIBS])
|
|
|
6e701c |
AC_SUBST([TEST_PLUGIN_INSTALLDIR])
|
|
|
6e701c |
AC_SUBST([COMMON_PLUGIN_INSTALLDIR])
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/dynxdr/dynxdr.c open-vm-tools-10.2.5-8068406/lib/dynxdr/dynxdr.c
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/dynxdr/dynxdr.c 2018-03-22 02:08:52.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/dynxdr/dynxdr.c 2018-05-09 11:03:11.700032698 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
/*********************************************************
|
|
|
6e701c |
- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
*
|
|
|
6e701c |
* This program is free software; you can redistribute it and/or modify it
|
|
|
6e701c |
* under the terms of the GNU Lesser General Public License as published
|
|
|
6e701c |
@@ -55,7 +55,7 @@
|
|
|
6e701c |
* Mac OS X, FreeBSD and Solaris don't take a const parameter to the
|
|
|
6e701c |
* "x_getpostn" function.
|
|
|
6e701c |
*/
|
|
|
6e701c |
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
|
|
|
6e701c |
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(USE_TIRPC)
|
|
|
6e701c |
# define DYNXDR_GETPOS_CONST
|
|
|
6e701c |
#else
|
|
|
6e701c |
# define DYNXDR_GETPOS_CONST const
|
|
|
6e701c |
@@ -172,7 +172,11 @@
|
|
|
6e701c |
}
|
|
|
6e701c |
|
|
|
6e701c |
|
|
|
6e701c |
-#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
|
|
|
6e701c |
+#if !defined(USE_TIRPC) && \
|
|
|
6e701c |
+ defined(__GLIBC__) || \
|
|
|
6e701c |
+ (defined(sun) && \
|
|
|
6e701c |
+ (defined(_LP64) || \
|
|
|
6e701c |
+ defined(_KERNEL)))
|
|
|
6e701c |
/*
|
|
|
6e701c |
*-----------------------------------------------------------------------------
|
|
|
6e701c |
*
|
|
|
6e701c |
@@ -322,11 +326,11 @@
|
|
|
6e701c |
DynXdrSetPos, /* x_setpostn */
|
|
|
6e701c |
DynXdrInline, /* x_inline */
|
|
|
6e701c |
NULL, /* x_destroy */
|
|
|
6e701c |
-#if defined(__GLIBC__)
|
|
|
6e701c |
+#if defined(__APPLE__) || defined (USE_TIRPC)
|
|
|
6e701c |
+ NULL, /* x_control */
|
|
|
6e701c |
+#elif defined(__GLIBC__)
|
|
|
6e701c |
NULL, /* x_getint32 */
|
|
|
6e701c |
DynXdrPutInt32, /* x_putint32 */
|
|
|
6e701c |
-#elif defined(__APPLE__)
|
|
|
6e701c |
- NULL, /* x_control */
|
|
|
6e701c |
#elif defined(sun) && (defined(_LP64) || defined(_KERNEL))
|
|
|
6e701c |
NULL, /* x_control */
|
|
|
6e701c |
NULL, /* x_getint32 */
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/dynxdr/Makefile.am open-vm-tools-10.2.5-8068406/lib/dynxdr/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/dynxdr/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/dynxdr/Makefile.am 2018-05-09 11:03:50.510199020 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2008-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2008-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -21,3 +21,5 @@
|
|
|
6e701c |
libDynxdr_la_SOURCES += dynxdr.c
|
|
|
6e701c |
libDynxdr_la_SOURCES += xdrutil.c
|
|
|
6e701c |
|
|
|
6e701c |
+libDynxdr_la_CPPFLAGS = @XDR_CPPFLAGS@
|
|
|
6e701c |
+libDynxdr_la_LIBADD = @XDR_LIBS@
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/guestRpc/Makefile.am open-vm-tools-10.2.5-8068406/lib/guestRpc/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/guestRpc/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/guestRpc/Makefile.am 2018-05-09 11:04:33.695343248 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2008-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2008-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -20,6 +20,10 @@
|
|
|
6e701c |
libGuestRpc_la_SOURCES =
|
|
|
6e701c |
libGuestRpc_la_SOURCES += nicinfo_xdr.c
|
|
|
6e701c |
|
|
|
6e701c |
+libGuestRpc_la_CPPFLAGS = @XDR_CPPFLAGS@
|
|
|
6e701c |
+
|
|
|
6e701c |
+libGuestRpc_la_LIBADD = @XDR_LIBS@
|
|
|
6e701c |
+
|
|
|
6e701c |
# XXX: Autoreconf complains about this and recommends using AM_CFLAGS instead.
|
|
|
6e701c |
# Problem is, $(CFLAGS) is appended to the compiler command line after AM_CFLAGS
|
|
|
6e701c |
# and after libGuestRpc_la_CFLAGS, so "-Wall -Werror" will override this flag.
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/netUtil/Makefile.am open-vm-tools-10.2.5-8068406/lib/netUtil/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/netUtil/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/netUtil/Makefile.am 2018-05-09 11:05:22.720325766 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2007-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -20,3 +20,6 @@
|
|
|
6e701c |
libNetUtil_la_SOURCES =
|
|
|
6e701c |
libNetUtil_la_SOURCES += netUtilLinux.c
|
|
|
6e701c |
|
|
|
6e701c |
+libNetUtil_la_CPPFLAGS = @XDR_CPPFLAGS@
|
|
|
6e701c |
+
|
|
|
6e701c |
+libNetUtil_la_LIBADD = @XDR_LIBS@
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/nicInfo/Makefile.am open-vm-tools-10.2.5-8068406/lib/nicInfo/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/nicInfo/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/nicInfo/Makefile.am 2018-05-09 11:16:45.873499080 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2014-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2014-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -25,6 +25,9 @@
|
|
|
6e701c |
|
|
|
6e701c |
libNicInfo_la_CPPFLAGS =
|
|
|
6e701c |
libNicInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@
|
|
|
6e701c |
+libNicInfo_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
+
|
|
|
6e701c |
+libNicInfo_la_LIBADD = @XDR_LIBS@
|
|
|
6e701c |
|
|
|
6e701c |
AM_CFLAGS = $(DNET_CPPFLAGS)
|
|
|
6e701c |
if USE_SLASH_PROC
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/rpcChannel/Makefile.am open-vm-tools-10.2.5-8068406/lib/rpcChannel/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/rpcChannel/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/rpcChannel/Makefile.am 2018-05-09 11:06:28.808588597 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2009-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -27,3 +27,6 @@
|
|
|
6e701c |
|
|
|
6e701c |
libRpcChannel_la_CPPFLAGS =
|
|
|
6e701c |
libRpcChannel_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@
|
|
|
6e701c |
+libRpcChannel_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
+
|
|
|
6e701c |
+libRpcChannel_la_LIBADD = @XDR_LIBS@
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/lib/slashProc/net.c open-vm-tools-10.2.5-8068406/lib/slashProc/net.c
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/lib/slashProc/net.c 2018-03-22 02:05:41.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/lib/slashProc/net.c 2018-05-09 11:06:37.592208338 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
/*********************************************************
|
|
|
6e701c |
- * Copyright (C) 2009-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+ * Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
*
|
|
|
6e701c |
* This program is free software; you can redistribute it and/or modify it
|
|
|
6e701c |
* under the terms of the GNU Lesser General Public License as published
|
|
|
6e701c |
@@ -36,7 +36,6 @@
|
|
|
6e701c |
#include "panic.h"
|
|
|
6e701c |
#include "slashProc.h"
|
|
|
6e701c |
#include "slashProcNetInt.h"
|
|
|
6e701c |
-#include "netutil.h"
|
|
|
6e701c |
|
|
|
6e701c |
|
|
|
6e701c |
/*
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/libguestlib/Makefile.am open-vm-tools-10.2.5-8068406/libguestlib/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/libguestlib/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/libguestlib/Makefile.am 2018-05-09 11:07:16.200301424 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2007-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -22,6 +22,7 @@
|
|
|
6e701c |
|
|
|
6e701c |
libguestlib_la_LIBADD =
|
|
|
6e701c |
libguestlib_la_LIBADD += @VMTOOLS_LIBS@
|
|
|
6e701c |
+libguestlib_la_LIBADD += @XDR_LIBS@
|
|
|
6e701c |
|
|
|
6e701c |
libguestlib_la_SOURCES =
|
|
|
6e701c |
libguestlib_la_SOURCES += guestlibV3_xdr.c
|
|
|
6e701c |
@@ -56,6 +57,7 @@
|
|
|
6e701c |
libguestlib_la_CPPFLAGS =
|
|
|
6e701c |
libguestlib_la_CPPFLAGS += -DVMTOOLS_USE_GLIB
|
|
|
6e701c |
libguestlib_la_CPPFLAGS += @GLIB2_CPPFLAGS@
|
|
|
6e701c |
+libguestlib_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
|
|
|
6e701c |
EXTRA_DIST = vmguestlib.pc.in
|
|
|
6e701c |
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/dndcp/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/dndcp/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/dndcp/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/dndcp/Makefile.am 2018-05-09 11:08:54.693686707 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2009-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -28,6 +28,7 @@
|
|
|
6e701c |
libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx
|
|
|
6e701c |
libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/xutils
|
|
|
6e701c |
libdndcp_la_CPPFLAGS += -I$(top_srcdir)/include
|
|
|
6e701c |
+libdndcp_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
|
|
|
6e701c |
# Passing C++ related flags to CPPFLAGS generates error.
|
|
|
6e701c |
# So, we need to pass these to C++ compilation only.
|
|
|
6e701c |
@@ -45,6 +46,7 @@
|
|
|
6e701c |
libdndcp_la_LIBADD += @VMTOOLS_LIBS@
|
|
|
6e701c |
libdndcp_la_LIBADD += @HGFS_LIBS@
|
|
|
6e701c |
libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo
|
|
|
6e701c |
+libdndcp_la_LIBADD += @XDR_LIBS@
|
|
|
6e701c |
|
|
|
6e701c |
libdndcp_la_SOURCES =
|
|
|
6e701c |
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/guestInfo/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/guestInfo/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/guestInfo/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/guestInfo/Makefile.am 2018-05-09 11:09:40.650361114 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2009-2017 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -22,6 +22,7 @@
|
|
|
6e701c |
|
|
|
6e701c |
libguestInfo_la_CPPFLAGS =
|
|
|
6e701c |
libguestInfo_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
|
|
|
6e701c |
+libguestInfo_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
|
|
|
6e701c |
libguestInfo_la_LDFLAGS =
|
|
|
6e701c |
libguestInfo_la_LDFLAGS += @PLUGIN_LDFLAGS@
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/resolutionKMS/resolutionKMS.c open-vm-tools-10.2.5-8068406/services/plugins/resolutionKMS/resolutionKMS.c
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/resolutionKMS/resolutionKMS.c 2018-03-22 02:05:41.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/resolutionKMS/resolutionKMS.c 2018-05-09 11:09:53.202894953 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
/*********************************************************
|
|
|
6e701c |
- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
*
|
|
|
6e701c |
* This program is free software; you can redistribute it and/or modify it
|
|
|
6e701c |
* under the terms of the GNU Lesser General Public License as published
|
|
|
6e701c |
@@ -29,16 +29,13 @@
|
|
|
6e701c |
#include <sys/stat.h>
|
|
|
6e701c |
#include <fcntl.h>
|
|
|
6e701c |
|
|
|
6e701c |
+#include <stdio.h>
|
|
|
6e701c |
#include <stdlib.h>
|
|
|
6e701c |
#include <string.h>
|
|
|
6e701c |
|
|
|
6e701c |
#include "vmware.h"
|
|
|
6e701c |
-#include "debug.h"
|
|
|
6e701c |
-#include "rpcout.h"
|
|
|
6e701c |
-#include "str.h"
|
|
|
6e701c |
#include "strutil.h"
|
|
|
6e701c |
|
|
|
6e701c |
-#include "xdrutil.h"
|
|
|
6e701c |
#include "vmware/guestrpc/tclodefs.h"
|
|
|
6e701c |
#include "vmware/tools/plugin.h"
|
|
|
6e701c |
#include "vmware/tools/utils.h"
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/resolutionSet/resolutionSet.c open-vm-tools-10.2.5-8068406/services/plugins/resolutionSet/resolutionSet.c
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/resolutionSet/resolutionSet.c 2018-03-22 02:05:41.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/resolutionSet/resolutionSet.c 2018-05-09 11:09:59.737718774 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
/*********************************************************
|
|
|
6e701c |
- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
*
|
|
|
6e701c |
* This program is free software; you can redistribute it and/or modify it
|
|
|
6e701c |
* under the terms of the GNU Lesser General Public License as published
|
|
|
6e701c |
@@ -34,7 +34,6 @@
|
|
|
6e701c |
|
|
|
6e701c |
#include "resolutionInt.h"
|
|
|
6e701c |
|
|
|
6e701c |
-#include "xdrutil.h"
|
|
|
6e701c |
#include "vmware/guestrpc/tclodefs.h"
|
|
|
6e701c |
#include "vmware/tools/plugin.h"
|
|
|
6e701c |
#include "vmware/tools/utils.h"
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/vix/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/vix/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/vix/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/vix/Makefile.am 2018-05-09 11:10:15.184453099 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2009-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -20,6 +20,7 @@
|
|
|
6e701c |
|
|
|
6e701c |
libvix_la_CPPFLAGS =
|
|
|
6e701c |
libvix_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
|
|
|
6e701c |
+libvix_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
libvix_la_CPPFLAGS += -I$(top_srcdir)/vgauth/public
|
|
|
6e701c |
|
|
|
6e701c |
libvix_la_LDFLAGS =
|
|
|
6e701c |
@@ -32,6 +33,7 @@
|
|
|
6e701c |
libvix_la_LIBADD += $(top_builddir)/lib/auth/libAuth.la
|
|
|
6e701c |
libvix_la_LIBADD += $(top_builddir)/lib/foundryMsg/libFoundryMsg.la
|
|
|
6e701c |
libvix_la_LIBADD += $(top_builddir)/lib/impersonate/libImpersonate.la
|
|
|
6e701c |
+libvix_la_LIBADD += @XDR_LIBS@
|
|
|
6e701c |
if ENABLE_VGAUTH
|
|
|
6e701c |
libvix_la_LIBADD += $(top_builddir)/vgauth/lib/libvgauth.la
|
|
|
6e701c |
endif
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/vix/vixTools.c open-vm-tools-10.2.5-8068406/services/plugins/vix/vixTools.c
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/vix/vixTools.c 2018-03-22 02:05:41.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/vix/vixTools.c 2018-05-09 00:12:44.258433002 -0700
|
|
|
6e701c |
@@ -91,7 +91,6 @@
|
|
|
6e701c |
#include "str.h"
|
|
|
6e701c |
#include "file.h"
|
|
|
6e701c |
#include "err.h"
|
|
|
6e701c |
-#include "guestInfo.h" // MAX_VALUE_LEN
|
|
|
6e701c |
#include "hostinfo.h"
|
|
|
6e701c |
#include "guest_os.h"
|
|
|
6e701c |
#include "guest_msg_def.h"
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/vmbackup/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/vmbackup/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/Makefile.am 2018-05-09 11:10:27.959367162 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2009-2017 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -20,6 +20,7 @@
|
|
|
6e701c |
|
|
|
6e701c |
libvmbackup_la_CPPFLAGS =
|
|
|
6e701c |
libvmbackup_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
|
|
|
6e701c |
+libvmbackup_la_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
|
|
|
6e701c |
libvmbackup_la_LDFLAGS =
|
|
|
6e701c |
libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@
|
|
|
6e701c |
@@ -27,6 +28,7 @@
|
|
|
6e701c |
libvmbackup_la_LIBADD =
|
|
|
6e701c |
libvmbackup_la_LIBADD += @GOBJECT_LIBS@
|
|
|
6e701c |
libvmbackup_la_LIBADD += @VMTOOLS_LIBS@
|
|
|
6e701c |
+libvmbackup_la_LIBADD += @XDR_LIBS@
|
|
|
6e701c |
|
|
|
6e701c |
libvmbackup_la_SOURCES =
|
|
|
6e701c |
libvmbackup_la_SOURCES += nullProvider.c
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/services/plugins/vmbackup/stateMachine.c open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/stateMachine.c
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/services/plugins/vmbackup/stateMachine.c 2018-03-22 02:05:41.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/stateMachine.c 2018-05-09 10:14:03.721823229 -0700
|
|
|
6e701c |
@@ -35,7 +35,6 @@
|
|
|
6e701c |
|
|
|
6e701c |
#include "vmBackupInt.h"
|
|
|
6e701c |
|
|
|
6e701c |
-#include "dynxdr.h"
|
|
|
6e701c |
#include <glib-object.h>
|
|
|
6e701c |
#include <gmodule.h>
|
|
|
6e701c |
#include "guestApp.h"
|
|
|
6e701c |
diff -ru open-vm-tools-10.2.5-8068406.orig/toolbox/Makefile.am open-vm-tools-10.2.5-8068406/toolbox/Makefile.am
|
|
|
6e701c |
--- open-vm-tools-10.2.5-8068406.orig/toolbox/Makefile.am 2018-03-22 02:05:02.000000000 -0700
|
|
|
6e701c |
+++ open-vm-tools-10.2.5-8068406/toolbox/Makefile.am 2018-05-09 11:11:30.514058368 -0700
|
|
|
6e701c |
@@ -1,5 +1,5 @@
|
|
|
6e701c |
################################################################################
|
|
|
6e701c |
-### Copyright (C) 2007-2016 VMware, Inc. All rights reserved.
|
|
|
6e701c |
+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved.
|
|
|
6e701c |
###
|
|
|
6e701c |
### This program is free software; you can redistribute it and/or modify
|
|
|
6e701c |
### it under the terms of version 2 of the GNU General Public License as
|
|
|
6e701c |
@@ -20,9 +20,11 @@
|
|
|
6e701c |
vmware_toolbox_cmd_LDADD =
|
|
|
6e701c |
vmware_toolbox_cmd_LDADD += ../libguestlib/libguestlib.la
|
|
|
6e701c |
vmware_toolbox_cmd_LDADD += @VMTOOLS_LIBS@
|
|
|
6e701c |
+vmware_toolbox_cmd_LDADD += @XDR_LIBS@
|
|
|
6e701c |
|
|
|
6e701c |
vmware_toolbox_cmd_CPPFLAGS =
|
|
|
6e701c |
vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@
|
|
|
6e701c |
+vmware_toolbox_cmd_CPPFLAGS += @XDR_CPPFLAGS@
|
|
|
6e701c |
|
|
|
6e701c |
vmware_toolbox_cmd_SOURCES =
|
|
|
6e701c |
vmware_toolbox_cmd_SOURCES += toolbox-cmd.c
|