diff --git a/.gitignore b/.gitignore index 56ba551..d5a67bd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /open-vm-tools-10.3.10-12406962.tar.gz /open-vm-tools-11.0.0-14549434.tar.gz /open-vm-tools-11.0.5-15389592.tar.gz +/open-vm-tools-11.1.0-16036546.tar.gz diff --git a/diskinfo-log-spew.patch b/diskinfo-log-spew.patch deleted file mode 100644 index 129b012..0000000 --- a/diskinfo-log-spew.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c -index 878276ce7..032c09285 100644 ---- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c -+++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c -@@ -846,9 +846,9 @@ GuestInfoGetDiskDevice(const char *fsName, - */ - for (indx = 0; indx < partEntry->diskDevCnt; indx++) { - if (partEntry->diskDevNames[indx][0] == '\0') { -- g_warning("%s: Missing disk device name; VMDK mapping unavailable " -- "for \"%s\", fsName: \"%s\"\n", __FUNCTION__, -- partEntry->name, fsName); -+ g_debug("%s: Missing disk device name; VMDK mapping unavailable " -+ "for \"%s\", fsName: \"%s\"\n", __FUNCTION__, -+ partEntry->name, fsName); - partEntry->diskDevCnt = 0; - free(partEntry->diskDevNames); - partEntry->diskDevNames = NULL; diff --git a/gcc10-warning.patch b/gcc10-warning.patch index 1a4a653..3207ec9 100644 --- a/gcc10-warning.patch +++ b/gcc10-warning.patch @@ -1,8 +1,8 @@ ---- a/open-vm-tools/lib/user/utilBacktrace.c 2020-02-03 12:13:08.092463938 -0800 -+++ b/open-vm-tools/lib/user/utilBacktrace.c 2020-02-03 15:30:56.234489288 -0800 -@@ -510,13 +510,16 @@ - options.bugNumber = bugNr; - CoreDump_LogFullBacktraceToFunc(&options, outFunc, outFuncData); +--- a/open-vm-tools/lib/user/utilBacktrace.c 2020-05-18 15:17:38.566170714 -0700 ++++ b/open-vm-tools/lib/user/utilBacktrace.c 2020-05-18 15:19:32.678018476 -0700 +@@ -431,13 +431,16 @@ + } + } #else - uintptr_t *x = (uintptr_t *) &bugNr; +#pragma GCC diagnostic push @@ -15,18 +15,13 @@ } else { outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr); } -- Util_BacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData); -+ Util_BacktraceFromPointerWithFunc(x, outFunc, outFuncData); +- UtilBacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData); ++ UtilBacktraceFromPointerWithFunc(x, outFunc, outFuncData); #endif } ---- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp 2020-02-03 12:13:09.572471067 -0800 -+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp 2020-02-03 14:03:12.518469494 -0800 -@@ -94,15 +94,15 @@ - * This is for V1 text copy paste only! - */ - #ifndef GDK_SELECTION_CLIPBOARD --GdkAtom GDK_SELECTION_CLIPBOARD; -+extern GdkAtom GDK_SELECTION_CLIPBOARD; +--- a/open-vm-tools/services/plugins/dndcp/copyPasteCompatX11.c 2020-05-18 16:42:56.135715690 -0700 ++++ b/open-vm-tools/services/plugins/dndcp/copyPasteCompatX11.c 2020-05-18 16:44:25.952405005 -0700 +@@ -73,11 +73,11 @@ #endif #ifndef GDK_SELECTION_TYPE_TIMESTAMP @@ -39,4 +34,4 @@ +extern GdkAtom GDK_SELECTION_TYPE_UTF8_STRING; #endif - + /* diff --git a/gcc9-static-inline.patch b/gcc9-static-inline.patch deleted file mode 100644 index d102c31..0000000 --- a/gcc9-static-inline.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h -index f9acc6a29..deefd1f3d 100644 ---- a/open-vm-tools/lib/include/vmware/tools/plugin.h -+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h -@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx { - * - * @return TRUE if COM is initialized when the function returns. - */ --G_INLINE_FUNC gboolean -+static inline gboolean - ToolsCore_InitializeCOM(ToolsAppCtx *ctx) - { - if (!ctx->comInitialized) { -diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h -index 3f2082b3e..5880fbcff 100644 ---- a/open-vm-tools/lib/include/vmware/tools/threadPool.h -+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h -@@ -91,7 +91,7 @@ typedef struct ToolsCorePool { - ******************************************************************************* - */ - --G_INLINE_FUNC ToolsCorePool * -+static inline ToolsCorePool * - ToolsCorePool_GetPool(ToolsAppCtx *ctx) - { - ToolsCorePool *pool = NULL; -@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx) - ******************************************************************************* - */ - --G_INLINE_FUNC guint -+static inline guint - ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, - ToolsCorePoolCb cb, - gpointer data, -@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, - ******************************************************************************* - */ - --G_INLINE_FUNC void -+static inline void - ToolsCorePool_CancelTask(ToolsAppCtx *ctx, - guint taskId) - { -@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx, - ******************************************************************************* - */ - --G_INLINE_FUNC gboolean -+static inline gboolean - ToolsCorePool_StartThread(ToolsAppCtx *ctx, - const gchar *threadName, - ToolsCorePoolCb cb, -diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h -index f65745906..a3292d5c0 100644 ---- a/open-vm-tools/lib/include/vmware/tools/utils.h -+++ b/open-vm-tools/lib/include/vmware/tools/utils.h -@@ -51,15 +51,6 @@ - # include - #endif - -- --/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */ --#if defined(G_PLATFORM_WIN32) --# if defined(G_INLINE_FUNC) --# undef G_INLINE_FUNC --# endif --# define G_INLINE_FUNC static __inline --#endif -- - #ifndef ABS - # define ABS(x) (((x) >= 0) ? (x) : -(x)) - #endif diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 8ea1764..9be6bf2 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -19,20 +19,19 @@ ################################################################################ %global _hardened_build 1 -%global majorversion 11.0 -%global minorversion 5 -%global toolsbuild 15389592 +%global majorversion 11.1 +%global minorversion 0 +%global toolsbuild 16036546 %global toolsversion %{majorversion}.%{minorversion} %global toolsdaemon vmtoolsd %global vgauthdaemon vgauthd Name: open-vm-tools Version: %{toolsversion} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Open Virtual Machine Tools for virtual machines hosted on VMware License: GPLv2 URL: https://github.com/vmware/%{name} - Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz Source1: %{toolsdaemon}.service Source2: %{vgauthdaemon}.service @@ -46,11 +45,7 @@ ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %endif -# Reference https://github.com/vmware/open-vm-tools/commit/89c0d444567eb525e8d083fb564c46d68e96660c -Patch1: gcc9-static-inline.patch -Patch2: gcc10-warning.patch -# Reference https://github.com/vmware/open-vm-tools/commit/4ee0bd3c8ead89541ab7d196fb54e940e397420d -Patch3: diskinfo-log-spew.patch +Patch1: gcc10-warning.patch BuildRequires: autoconf BuildRequires: automake @@ -108,6 +103,7 @@ Requires: sed Requires: systemd Requires: systemd-libs Requires: tar +Requires: util-linux Requires: which # xmlsec1-openssl needs to be added explicitly Requires: xmlsec1-openssl @@ -137,6 +133,21 @@ This package contains only the user-space programs and libraries of %{name} that are essential for improved user experience of VMware virtual machines. +%package sdmp +Summary: Service Discovery components for Open Virtual Machine Tools +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: coreutils +Requires: gawk +Requires: glibc-common +Requires: grep +Requires: net-tools +Requires: procps + +%description sdmp +This package contains only the user-space programs and utility scripts of +%{name} that are essential for performing service discovery in VMware virtual +machines by vRealize Operations Service Discovery Management Pack. + %package devel Summary: Development libraries for Open Virtual Machine Tools Requires: %{name}%{?_isa} = %{version}-%{release} @@ -173,6 +184,7 @@ autoreconf -vif --without-kernel-modules \ --enable-xmlsec1 \ --enable-resolutionkms \ + --enable-servicediscovery \ --%{usetirpc} \ --disable-static @@ -205,9 +217,6 @@ rm -f docs/api/build/html/FreeSans.ttf # Remove mount.vmhgfs & symlink rm -fr %{buildroot}%{_sbindir} %{buildroot}/sbin/mount.vmhgfs -# Move vm-support to /usr/bin -mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir} - # Systemd unit files install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service @@ -255,6 +264,12 @@ fi %post desktop %systemd_post run-vmblock\x2dfuse.mount +%post sdmp +# Load the newly installed or upgraded SDMP plugin +if %{_bindir}/systemctl is-active %{toolsdaemon}.service &> /dev/null; then + %{_bindir}/systemctl restart %{toolsdaemon}.service &> /dev/null || /bin/true +fi + %preun %systemd_preun %{toolsdaemon}.service %systemd_preun %{vgauthdaemon}.service @@ -292,6 +307,13 @@ fi %postun desktop %systemd_postun run-vmblock\x2dfuse.mount +%postun sdmp +# In case of uninstall, unload the uninstalled SDMP plugin +if [ "$1" = "0" ] && \ + %{_bindir}/systemctl is-active %{toolsdaemon}.service &> /dev/null; then + %{_bindir}/systemctl restart %{toolsdaemon}.service &> /dev/null || /bin/true +fi + %files %license COPYING %doc AUTHORS ChangeLog NEWS README @@ -328,7 +350,14 @@ fi %dir %{_libdir}/%{name}/plugins/common %{_libdir}/%{name}/plugins/common/*.so %dir %{_libdir}/%{name}/plugins/vmsvc -%{_libdir}/%{name}/plugins/vmsvc/*.so +%{_libdir}/%{name}/plugins/vmsvc/libappInfo.so +%{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so +%{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so +%{_libdir}/%{name}/plugins/vmsvc/libpowerOps.so +%{_libdir}/%{name}/plugins/vmsvc/libresolutionKMS.so +%{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so +%{_libdir}/%{name}/plugins/vmsvc/libvmbackup.so + %{_datadir}/%{name}/ %{_udevrulesdir}/99-vmware-scsi-udev.rules %{_unitdir}/%{toolsdaemon}.service @@ -343,6 +372,10 @@ fi %{_bindir}/vmware-vmblock-fuse %{_libdir}/%{name}/plugins/vmusr/ +%files sdmp +%{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so +%{_libdir}/%{name}/serviceDiscovery + %files devel %doc docs/api/build/* %exclude %{_includedir}/libDeployPkg/ @@ -358,6 +391,15 @@ fi %{_bindir}/vmware-vgauth-smoketest %changelog +* Mon May 25 2020 Ravindra Kumar - 11.1.0-1 +- Package new upstream version open-vm-tools-11.1.0-16036546. +- Added new open-vm-tools-sdmp package. +- Workaround for vm-support script path is no longer needed. +- Added missing dependencies for vm-support script. +- Updated gcc10-warning.patch. +- Removed gcc9-static-inline.patch and diskinfo-log-spew.patch that + are no longer needed. + * Sun May 17 2020 Ravindra Kumar - 11.0.5-4 - Updated PAM configuration file to follow configured authn scheme. diff --git a/sources b/sources index df5acbb..adee64f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (open-vm-tools-11.0.5-15389592.tar.gz) = 7b465f2dd8987e2b67c17bf9bbfaf52f92013180944f87161bb2e846da36716121d96f499e47ceaeaf535cc17706d7d1ced2b47d08144ef0f3749db23d01f404 +SHA512 (open-vm-tools-11.1.0-16036546.tar.gz) = cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e