diff --git a/.gitignore b/.gitignore
index f86a512..007b99d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/open-vm-tools-11.0.0-14549434.tar.gz
+SOURCES/open-vm-tools-11.1.0-16036546.tar.gz
diff --git a/.open-vm-tools.metadata b/.open-vm-tools.metadata
index c4987fa..b5a3f96 100644
--- a/.open-vm-tools.metadata
+++ b/.open-vm-tools.metadata
@@ -1 +1 @@
-c4b7df8636a02195151a51b46d1af2690cca7e78 SOURCES/open-vm-tools-11.0.0-14549434.tar.gz
+95923f136cde31d149d7859cd6af308230c91856 SOURCES/open-vm-tools-11.1.0-16036546.tar.gz
diff --git a/SOURCES/0002-Fix-leaks-in-ListAliases-and-ListMappedAliases.patch b/SOURCES/0002-Fix-leaks-in-ListAliases-and-ListMappedAliases.patch
deleted file mode 100644
index c9dd35b..0000000
--- a/SOURCES/0002-Fix-leaks-in-ListAliases-and-ListMappedAliases.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 1128cfce9031891ff0da50131b75771582756ca1 Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <okurth@vmware.com>
-Date: Wed, 2 Oct 2019 17:48:35 -0700
-Subject: Fix leaks in ListAliases and ListMappedAliases.
-
-The 'record' for each alias was being leaked.
----
- open-vm-tools/services/plugins/vix/vixTools.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
-index 44bca5c..c40ad15 100644
---- a/open-vm-tools/services/plugins/vix/vixTools.c
-+++ b/open-vm-tools/services/plugins/vix/vixTools.c
-@@ -9762,7 +9762,6 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
- char *destPtr;
- char *endDestPtr;
- char *tmpBuf = NULL;
-- char *recordBuf;
- size_t recordSize;
- char *escapedStr = NULL;
- char *escapedStr2 = NULL;
-@@ -9822,6 +9821,8 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
- destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s",
- VIX_XML_ESCAPED_TAG);
- for (i = 0; i < num; i++) {
-+ char *recordBuf = NULL;
-+
- escapedStr = VixToolsEscapeXMLString(uaList[i].pemCert);
- if (escapedStr == NULL) {
- err = VIX_E_OUT_OF_MEMORY;
-@@ -9895,6 +9896,8 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
- Log("%s: ListAuth list results too large, truncating", __FUNCTION__);
- goto abort;
- }
-+ free(recordBuf);
-+ recordBuf = NULL;
- }
-
- *result = resultBuffer;
-@@ -9960,7 +9963,6 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
- char *destPtr;
- char *endDestPtr;
- char *tmpBuf = NULL;
-- char *recordBuf;
- char *escapedStr = NULL;
- char *escapedStr2 = NULL;
- size_t recordSize;
-@@ -10014,6 +10016,8 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
- destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s",
- VIX_XML_ESCAPED_TAG);
- for (i = 0; i < num; i++) {
-+ char *recordBuf = NULL;
-+
- escapedStr = VixToolsEscapeXMLString(maList[i].pemCert);
- if (escapedStr == NULL) {
- err = VIX_E_OUT_OF_MEMORY;
-@@ -10085,6 +10089,8 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
- Log("%s: ListMapped results too large, truncating", __FUNCTION__);
- goto abort;
- }
-+ free(recordBuf);
-+ recordBuf = NULL;
- }
-
- *result = resultBuffer;
---
-1.8.3.1
-
diff --git a/SOURCES/open-vm-tools.conf b/SOURCES/open-vm-tools.conf
new file mode 100644
index 0000000..a517c48
--- /dev/null
+++ b/SOURCES/open-vm-tools.conf
@@ -0,0 +1 @@
+fuse
diff --git a/SOURCES/ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch b/SOURCES/ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch
deleted file mode 100644
index dc62ab6..0000000
--- a/SOURCES/ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d01520e206cc1e3ae658e8fb168ff3b4494fc1ef Mon Sep 17 00:00:00 2001
-From: Cathy Avery <cavery@redhat.com>
-Date: Tue, 3 Dec 2019 14:30:47 +0100
-Subject: [PATCH 1/4] Address Coverity issues reported in bora/lib/file/file.c.
-
-RH-Author: Cathy Avery <cavery@redhat.com>
-Message-id: <20191203143050.23065-2-cavery@redhat.com>
-Patchwork-id: 92833
-O-Subject: [RHEL8.2 open-vm-tools PATCH 1/4] Address Coverity issues reported in bora/lib/file/file.c.
-Bugzilla: 1769881
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-commit 5ca2850b60de0f27c3f8c565d7b7e553acc2921f
-Author: Oliver Kurth <okurth@vmware.com>
-Date: Tue Aug 27 12:55:37 2019 -0700
-
- Address Coverity issues reported in bora/lib/file/file.c.
-
- Fix a minor memory leak in the function File_ExpandAndCheckDir.
- Also add annotations for unchecked return values in functions
- GetOldMachineID and File_MoveTree, so that Coverity scans of
- open-vm-tools will automatically classify these issues as
- "Intentional". These annotations are useful both for internal
- use as well as for partners who run Coverity scans on open-vm-tools.
-
-Signed-off-by: Cathy Avery <cavery@redhat.com>
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- open-vm-tools/lib/file/file.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/open-vm-tools/lib/file/file.c b/open-vm-tools/lib/file/file.c
-index 7dae12c..774ec41 100644
---- a/open-vm-tools/lib/file/file.c
-+++ b/open-vm-tools/lib/file/file.c
-@@ -558,6 +558,7 @@ GetOldMachineID(void)
- sizeof hardwareID);
-
- /* Base 64 encode the binary data to obtain printable characters */
-+ /* coverity[check_return] */
- Base64_Encode(rawMachineID, sizeof rawMachineID, encodedMachineID,
- sizeof encodedMachineID, NULL);
-
-@@ -1437,6 +1438,7 @@ File_MoveTree(const char *srcName, // IN:
- * Only clean up if we created the directory. Not attempting to
- * clean up partial failures.
- */
-+ /* coverity[check_return] */
- File_DeleteDirectoryTree(dstName);
- }
- }
-@@ -2186,6 +2188,7 @@ File_ExpandAndCheckDir(const char *dirName) // IN:
-
- return edirName;
- }
-+ free(edirName);
- }
-
- return NULL;
---
-1.8.3.1
-
diff --git a/SOURCES/ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch b/SOURCES/ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch
deleted file mode 100644
index 8735ee3..0000000
--- a/SOURCES/ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 805d013a5604b124177149be4d10384f58eff74b Mon Sep 17 00:00:00 2001
-From: Cathy Avery <cavery@redhat.com>
-Date: Tue, 3 Dec 2019 14:30:49 +0100
-Subject: [PATCH 3/4] Address two Coverity-reported issues in hostinfoPosix.c.
-
-RH-Author: Cathy Avery <cavery@redhat.com>
-Message-id: <20191203143050.23065-4-cavery@redhat.com>
-Patchwork-id: 92834
-O-Subject: [RHEL8.2 open-vm-tools PATCH 3/4] Address two Coverity-reported issues in hostinfoPosix.c.
-Bugzilla: 1769881
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-commit 8a01c912927b5bb8cdbfa57f5e8c92e8cf792bef
-Author: Oliver Kurth <okurth@vmware.com>
-Date: Fri Nov 22 14:52:35 2019 -0800
-
- Address two Coverity-reported issues in hostinfoPosix.c.
-
- Rework some code with the intent of making it more straightfoward,
- which also eliminates a false positive.
-
- Check the return value from PosixUnlink and log a warning on error.
-
-Signed-off-by: Cathy Avery <cavery@redhat.com>
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- open-vm-tools/lib/misc/hostinfoPosix.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 348a67e..302452e 100644
---- a/open-vm-tools/lib/misc/hostinfoPosix.c
-+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -1127,10 +1127,7 @@ out:
- if (success) {
- result[nArgs - 1] = DynBuf_Detach(&b);
- } else {
-- if (nArgs != 0) {
-- Util_FreeStringList(result, nArgs);
-- }
--
-+ Util_FreeStringList(result, nArgs);
- result = NULL;
- }
-
-@@ -2884,7 +2881,10 @@ Hostinfo_Daemonize(const char *path, // IN: NUL-terminated UTF-8
- * with another process attempting to daemonize and unlinking the
- * file it created instead.
- */
-- Posix_Unlink(pidPath);
-+ if (Posix_Unlink(pidPath) != 0) {
-+ Warning("%s: Unable to unlink %s: %u\n",
-+ __FUNCTION__, pidPath, errno);
-+ }
- }
-
- errno = err;
---
-1.8.3.1
-
diff --git a/SOURCES/ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch b/SOURCES/ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch
deleted file mode 100644
index 95e514c..0000000
--- a/SOURCES/ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6c6daa468c9a1ad1ad4d5bf727008d029d009a50 Mon Sep 17 00:00:00 2001
-From: Cathy Avery <cavery@redhat.com>
-Date: Tue, 3 Dec 2019 14:30:48 +0100
-Subject: [PATCH 2/4] Fix a potential NULL pointer dereference in the vmbackup
- plugin.
-
-RH-Author: Cathy Avery <cavery@redhat.com>
-Message-id: <20191203143050.23065-3-cavery@redhat.com>
-Patchwork-id: 92836
-O-Subject: [RHEL8.2 open-vm-tools PATCH 2/4] Fix a potential NULL pointer dereference in the vmbackup plugin.
-Bugzilla: 1769881
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-commit 0bb6cf83fb6b1f80c99beb11cd47e0db02e252ff
-Author: Oliver Kurth <okurth@vmware.com>
-Date: Fri Nov 22 14:52:35 2019 -0800
-
- Fix a potential NULL pointer dereference in the vmbackup plugin.
-
- In some circumtances, VmBackupAsyncCallback might dereference
- gBackupState after calling VmBackupDoAbort even though the
- latter function can potentially set gBackupState to NULL. Add
- a check to prevent the potential NULL pointer dereference.
-
-Signed-off-by: Cathy Avery <cavery@redhat.com>
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- open-vm-tools/services/plugins/vmbackup/stateMachine.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
-index 6b42286..5c01a7b 100644
---- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
-+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
-@@ -675,6 +675,15 @@ VmBackupAsyncCallback(void *clientData)
- if (gBackupState->rpcState == VMBACKUP_RPC_STATE_ERROR) {
- g_warning("Aborting backup operation due to RPC errors.");
- VmBackupDoAbort();
-+
-+ /*
-+ * Check gBackupState, since the abort could cause a transition to
-+ * VMBACKUP_MSTATE_IDLE, in which case the VmBackupState structure
-+ * would be freed and gBackupState would be NULL.
-+ */
-+ if (gBackupState == NULL) {
-+ return FALSE;
-+ }
- goto exit;
- }
- }
---
-1.8.3.1
-
diff --git a/SOURCES/ovt-Fix-a-resource-leak-issue-in-deployPkg.patch b/SOURCES/ovt-Fix-a-resource-leak-issue-in-deployPkg.patch
deleted file mode 100644
index 0cfccf0..0000000
--- a/SOURCES/ovt-Fix-a-resource-leak-issue-in-deployPkg.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From acf9aa0dce71106f3603398a7b6984ff91dd0eda Mon Sep 17 00:00:00 2001
-From: Cathy Avery <cavery@redhat.com>
-Date: Tue, 3 Dec 2019 14:30:50 +0100
-Subject: [PATCH 4/4] Fix a resource leak issue in deployPkg
-
-RH-Author: Cathy Avery <cavery@redhat.com>
-Message-id: <20191203143050.23065-5-cavery@redhat.com>
-Patchwork-id: 92837
-O-Subject: [RHEL8.2 open-vm-tools PATCH 4/4] Fix a resource leak issue in deployPkg
-Bugzilla: 1769881
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-commit 2ffd2913088505d8249fa342b0ee8e5002a69108
-Author: Oliver Kurth <okurth@vmware.com>
-Date: Fri Nov 22 14:52:35 2019 -0800
-
- Fix a resource leak issue in deployPkg
-
- Variable file going out of scope in error path leaks the storage it
- points to. Added fclose before return when malloc failed.
-
-Signed-off-by: Cathy Avery <cavery@redhat.com>
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- open-vm-tools/libDeployPkg/linuxDeployment.c | 23 ++++++++++++++---------
- 1 file changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/open-vm-tools/libDeployPkg/linuxDeployment.c b/open-vm-tools/libDeployPkg/linuxDeployment.c
-index 1af0893..4f36a00 100644
---- a/open-vm-tools/libDeployPkg/linuxDeployment.c
-+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
-@@ -824,17 +824,18 @@ TransitionState(const char* stateFrom, const char* stateTo)
- *
- *-----------------------------------------------------------------------------
- */
--static char*
--GetNicsToEnable(const char* dir)
-+
-+static char *
-+GetNicsToEnable(const char *dir)
- {
- /*
-- * The file nics.txt will list ordinal number of all nics to enable separated by
-- * a ",". In current architecture we can have max 4 nics. So we just have to read
-- * maximum of 7 characters. This code uses 1024 chars to make sure any future
-- * needs are accomodated.
-+ * The file nics.txt will list ordinal number of all nics to enable separated
-+ * by a ",". In current architecture we can have max 4 nics. So we just have
-+ * to read maximum of 7 characters. This code uses 1024 chars to make sure
-+ * any future needs are accomodated.
- */
- static const unsigned int NICS_SIZE = 1024;
-- static const char* nicFile = "/nics.txt";
-+ static const char *nicFile = "/nics.txt";
-
- FILE *file;
-
-@@ -852,7 +853,9 @@ GetNicsToEnable(const char* dir)
- if (file) {
- ret = malloc(NICS_SIZE);
- if (ret == NULL) {
-- SetDeployError("Error allocating memory to read nic file '%s'", fileName);
-+ SetDeployError("Error allocating memory to read nic file '%s'",
-+ fileName);
-+ fclose(file);
- free(fileName);
- return ret;
- }
-@@ -862,7 +865,8 @@ GetNicsToEnable(const char* dir)
-
- // Check various error condition
- if (ferror(file)) {
-- SetDeployError("Error reading nic file '%s'.(%s)", fileName, strerror(errno));
-+ SetDeployError("Error reading nic file '%s'.(%s)", fileName,
-+ strerror(errno));
- free(ret);
- ret = NULL;
- }
-@@ -880,6 +884,7 @@ GetNicsToEnable(const char* dir)
- return ret;
- }
-
-+
- /**
- *------------------------------------------------------------------------------
- *
---
-1.8.3.1
-
diff --git a/SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch b/SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
deleted file mode 100644
index a32ee73..0000000
--- a/SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 6536375aa0f30fe9226ec687d7854d5c2aef5a7d Mon Sep 17 00:00:00 2001
-From: Cathy Avery <cavery@redhat.com>
-Date: Fri, 14 Feb 2020 12:23:09 +0100
-Subject: [PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
-
-RH-Author: Cathy Avery <cavery@redhat.com>
-Message-id: <20200214122309.5769-1-cavery@redhat.com>
-Patchwork-id: 93876
-O-Subject: [RHEL8.2 open-vm-tools PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
-Bugzilla: 1800812
-RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
-RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1800812
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=26372468
-Branch: rhel8/master-11.0.0
-Tested: By QE
-Upstream Status: stable-11.0.5-suse-bug-1162435 targeted for 11.1.0
-
-commit 4ee0bd3c8ead89541ab7d196fb54e940e397420d
-Author: Oliver Kurth <okurth@vmware.com>
-Date: Fri, 7 Feb 2020 10:39:38 -0800
-
- Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
-
- When a LSI Logic Parallel SCSI controller sits in PCI bus 0
- (SCSI controller 0), the Linux disk device enumeration does not provide
- a "label" file with the controller name. This results in messages like
-
- "GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/var/log", fsName: "/dev/sda2"
-
- repeatedly appearing in the vmsvc logging. The patch converts what previously
- was a warning message to a debug message and thus avoids the log spew.
-
-Signed-off-by: Cathy Avery <cavery@redhat.com>
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- open-vm-tools/services/plugins/guestInfo/diskInfo.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
-index a8234a4..c974dbd 100644
---- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c
-+++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
-@@ -837,9 +837,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;
---
-1.8.3.1
-
diff --git "a/SOURCES/run-vmblock\\x2dfuse.mount" "b/SOURCES/run-vmblock\\x2dfuse.mount"
new file mode 100644
index 0000000..d7be7c2
--- /dev/null
+++ "b/SOURCES/run-vmblock\\x2dfuse.mount"
@@ -0,0 +1,17 @@
+[Unit]
+Description=VMware vmblock Fuse Mount
+Documentation=https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt
+DefaultDependencies=no
+Before=umount.target vmtoolsd.service
+ConditionVirtualization=vmware
+After=sys-fs-fuse-connections.mount
+Wants=vmtoolsd.service
+
+[Mount]
+What=vmware-vmblock-fuse
+Where=/run/vmblock-fuse
+Type=fuse
+Options=subtype=vmware-vmblock,default_permissions,allow_other
+
+[Install]
+WantedBy=multi-user.target
diff --git a/SOURCES/vmtoolsd.pam b/SOURCES/vmtoolsd.pam
new file mode 100644
index 0000000..aa3daa0
--- /dev/null
+++ b/SOURCES/vmtoolsd.pam
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth substack password-auth
+auth include postlogin
+account required pam_nologin.so
+account include password-auth
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index 379ecbd..2826ce7 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -19,16 +19,16 @@
################################################################################
%global _hardened_build 1
-%global majorversion 11.0
+%global majorversion 11.1
%global minorversion 0
-%global toolsbuild 14549434
+%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
Group: Applications/System
License: GPLv2
@@ -36,19 +36,12 @@ 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
+Source3: run-vmblock\x2dfuse.mount
+Source4: open-vm-tools.conf
+Source5: vmtoolsd.pam
+
ExclusiveArch: x86_64
-Patch0002: 0002-Fix-leaks-in-ListAliases-and-ListMappedAliases.patch
-# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
-Patch3: ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch
-# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
-Patch4: ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch
-# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
-Patch5: ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch
-# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
-Patch6: ovt-Fix-a-resource-leak-issue-in-deployPkg.patch
-# For bz#1800812 - [ESXi][RHEL8]Log spew "[ warning] [guestinfo] GuestInfoGetDiskDevice: Missing disk device name
-Patch7: ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -92,6 +85,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
@@ -118,6 +112,22 @@ 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
+Group: Development/Libraries
+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
Group: Development/Libraries
@@ -152,6 +162,7 @@ autoreconf -vif
--without-kernel-modules \
--enable-xmlsec1 \
--enable-resolutionkms \
+ --enable-servicediscovery \
--%{usetirpc} \
--disable-static
@@ -184,12 +195,12 @@ 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
+install -p -m 644 -D '%{SOURCE3}' %{buildroot}%{_unitdir}/run-vmblock\\x2dfuse.mount
+install -p -m 644 -D %{SOURCE4} %{buildroot}%{_modulesloaddir}/open-vm-tools.conf
+install -p -m 644 -D %{SOURCE5} %{buildroot}%{_sysconfdir}/pam.d/vmtoolsd
# 'make check' in open-vm-tools rebuilds docs and ends up regenerating
# the font file. We can add %%check secion once 'make check' is fixed
@@ -221,11 +232,18 @@ if [ "$1" = "2" ]; then
# Cleanup vmtoolsd-init.service in case of upgrades
%{_bindir}/systemctl disable %{toolsdaemon}-init.service &> /dev/null || /bin/true
fi
-
-
%systemd_post %{vgauthdaemon}.service
%systemd_post %{toolsdaemon}.service
+%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
@@ -248,11 +266,24 @@ if [ "$1" = "0" -a \
fi
fi
+%preun desktop
+%systemd_preun run-vmblock\x2dfuse.mount
+
%postun
%{?ldconfig}
%systemd_postun_with_restart %{toolsdaemon}.service
%systemd_postun_with_restart %{vgauthdaemon}.service
+%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
@@ -289,19 +320,33 @@ 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
%{_unitdir}/%{vgauthdaemon}.service
+%{_unitdir}/run-vmblock\x2dfuse.mount
+%{_modulesloaddir}/open-vm-tools.conf
+
%files desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_bindir}/vmware-user
-%{_bindir}/vmware-user-suid-wrapper
+%attr(4755,-,-) %{_bindir}/vmware-user-suid-wrapper
%{_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/
@@ -317,6 +362,21 @@ fi
%{_bindir}/vmware-vgauth-smoketest
%changelog
+* Tue May 26 2020 Mirosalv Rezanina <mrezanin@redhat.com> - 11.1.0-1.el8
+- Rebase to 11.1.0 [bz#1806677]
+- Added open-vm-tools-sdmp package [bz#1833157)
+- Resolves: bz#1806677
+ ([ESXi][RHEL8]Rebase open-vm-tools to 11.1.0 for RHEL 8.3)
+- Resolves: bz#1833157
+ ([ESXi][RHEL8]Add new open-vm-tools-sdmp package for RHEL 8.3)
+
+* Tue Apr 21 2020 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.5-3.el8
+- [ESXi][RHEL8.2.1]open-vm-tools add appinfo plugin patch
+- [ESXi][RHEL8.2.1]open-vm-tools coverity scan issue
+
+* Wed Apr 08 2020 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.5-1.el8
+- Rebase to 11.0.5
+
* Tue Feb 18 2020 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-4.el8
- ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch [bz#1800812]
- Resolves: bz#1800812
@@ -330,9 +390,6 @@ fi
- Resolves: bz#1769881
([ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package)
-* Tue Oct 15 2019 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-2.el8
-- Add missing gating tests
-
* Mon Oct 14 2019 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-1.el8
- Rebase to 11.0.0 [bz#1754658]
- Resolves: bz#1754658