import open-vm-tools-11.0.0-3.el8
This commit is contained in:
parent
d2ceed4746
commit
d70d9f6314
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/open-vm-tools-10.3.10-12406962.tar.gz
|
SOURCES/open-vm-tools-11.0.0-14549434.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
4f5fcf3f098aaddd3da24caa772575505e286ed7 SOURCES/open-vm-tools-10.3.10-12406962.tar.gz
|
c4b7df8636a02195151a51b46d1af2690cca7e78 SOURCES/open-vm-tools-11.0.0-14549434.tar.gz
|
||||||
|
@ -0,0 +1,69 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,63 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,61 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,54 @@
|
|||||||
|
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
|
||||||
|
|
90
SOURCES/ovt-Fix-a-resource-leak-issue-in-deployPkg.patch
Normal file
90
SOURCES/ovt-Fix-a-resource-leak-issue-in-deployPkg.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
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
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=One-time configuration for vmtoolsd
|
|
||||||
ConditionVirtualization=vmware
|
|
||||||
ConditionPathExists=|!/etc/vmware-tools/GuestProxyData/server/cert.pem
|
|
||||||
ConditionPathExists=|!/etc/vmware-tools/GuestProxyData/server/key.pem
|
|
||||||
PartOf=vmtoolsd.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
RemainAfterExit=no
|
|
||||||
ExecStart=/usr/bin/vmware-guestproxycerttool -g
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
RequiredBy=vmtoolsd.service
|
|
@ -19,26 +19,34 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%global majorversion 10.3
|
%global majorversion 11.0
|
||||||
%global minorversion 10
|
%global minorversion 0
|
||||||
%global toolsbuild 12406962
|
%global toolsbuild 14549434
|
||||||
%global toolsversion %{majorversion}.%{minorversion}
|
%global toolsversion %{majorversion}.%{minorversion}
|
||||||
%global toolsdaemon vmtoolsd
|
%global toolsdaemon vmtoolsd
|
||||||
%global vgauthdaemon vgauthd
|
%global vgauthdaemon vgauthd
|
||||||
|
|
||||||
Name: open-vm-tools
|
Name: open-vm-tools
|
||||||
Version: %{toolsversion}
|
Version: %{toolsversion}
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
|
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/vmware/%{name}
|
URL: https://github.com/vmware/%{name}
|
||||||
Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
|
Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
|
||||||
Source1: %{toolsdaemon}-init.service
|
Source1: %{toolsdaemon}.service
|
||||||
Source2: %{toolsdaemon}.service
|
Source2: %{vgauthdaemon}.service
|
||||||
Source3: %{vgauthdaemon}.service
|
|
||||||
ExclusiveArch: x86_64
|
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
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -129,8 +137,7 @@ useful for verifying the functioning of %{name} in VMware virtual
|
|||||||
machines.
|
machines.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}-%{toolsbuild}
|
%autosetup -p2 -n %{name}-%{version}-%{toolsbuild}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Required for regenerating configure script when
|
# Required for regenerating configure script when
|
||||||
@ -179,9 +186,8 @@ rm -fr %{buildroot}%{_sbindir} %{buildroot}/sbin/mount.vmhgfs
|
|||||||
mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
|
mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
|
||||||
|
|
||||||
# Systemd unit files
|
# Systemd unit files
|
||||||
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}-init.service
|
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
|
||||||
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
|
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
|
||||||
install -p -m 644 -D %{SOURCE3} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
|
|
||||||
|
|
||||||
# 'make check' in open-vm-tools rebuilds docs and ends up regenerating
|
# '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
|
# the font file. We can add %%check secion once 'make check' is fixed
|
||||||
@ -201,12 +207,24 @@ if [ -f %{_bindir}/vmware-checkvm -a \
|
|||||||
mkdir -p /mnt/hgfs
|
mkdir -p /mnt/hgfs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%systemd_post %{toolsdaemon}-init.service
|
if [ "$1" = "2" ]; then
|
||||||
|
# Cleanup GuestProxy certs, relevant for upgrades only
|
||||||
|
if [ -f %{_bindir}/vmware-guestproxycerttool ]; then
|
||||||
|
%{_bindir}/vmware-guestproxycerttool -e &> /dev/null || /bin/true
|
||||||
|
fi
|
||||||
|
if [ -d /etc/vmware-tools/GuestProxyData ]; then
|
||||||
|
rm -rf /etc/vmware-tools/GuestProxyData &> /dev/null || /bin/true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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 %{vgauthdaemon}.service
|
||||||
%systemd_post %{toolsdaemon}.service
|
%systemd_post %{toolsdaemon}.service
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun %{toolsdaemon}-init.service
|
|
||||||
%systemd_preun %{toolsdaemon}.service
|
%systemd_preun %{toolsdaemon}.service
|
||||||
%systemd_preun %{vgauthdaemon}.service
|
%systemd_preun %{vgauthdaemon}.service
|
||||||
|
|
||||||
@ -226,14 +244,10 @@ if [ "$1" = "0" -a \
|
|||||||
umount /mnt/hgfs &> /dev/null || /bin/true
|
umount /mnt/hgfs &> /dev/null || /bin/true
|
||||||
rmdir /mnt/hgfs &> /dev/null || /bin/true
|
rmdir /mnt/hgfs &> /dev/null || /bin/true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Cleanup GuestProxy certs
|
|
||||||
%{_bindir}/vmware-guestproxycerttool -e &> /dev/null || /bin/true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%{?ldconfig}
|
%{?ldconfig}
|
||||||
%systemd_postun_with_restart %{toolsdaemon}-init.service
|
|
||||||
%systemd_postun_with_restart %{toolsdaemon}.service
|
%systemd_postun_with_restart %{toolsdaemon}.service
|
||||||
%systemd_postun_with_restart %{vgauthdaemon}.service
|
%systemd_postun_with_restart %{vgauthdaemon}.service
|
||||||
|
|
||||||
@ -245,6 +259,8 @@ fi
|
|||||||
%dir %{_sysconfdir}/vmware-tools/vgauth
|
%dir %{_sysconfdir}/vmware-tools/vgauth
|
||||||
%dir %{_sysconfdir}/vmware-tools/vgauth/schemas
|
%dir %{_sysconfdir}/vmware-tools/vgauth/schemas
|
||||||
%config(noreplace) %{_sysconfdir}/vmware-tools/*.conf
|
%config(noreplace) %{_sysconfdir}/vmware-tools/*.conf
|
||||||
|
# Don't expect users to modify example tools.conf file
|
||||||
|
%config %{_sysconfdir}/vmware-tools/tools.conf.example
|
||||||
# Don't expect users to modify VGAuth schema files
|
# Don't expect users to modify VGAuth schema files
|
||||||
%config %{_sysconfdir}/vmware-tools/vgauth/schemas/*
|
%config %{_sysconfdir}/vmware-tools/vgauth/schemas/*
|
||||||
%{_sysconfdir}/vmware-tools/*-vm-default
|
%{_sysconfdir}/vmware-tools/*-vm-default
|
||||||
@ -255,7 +271,6 @@ fi
|
|||||||
%{_bindir}/vmhgfs-fuse
|
%{_bindir}/vmhgfs-fuse
|
||||||
%{_bindir}/vmtoolsd
|
%{_bindir}/vmtoolsd
|
||||||
%{_bindir}/vmware-checkvm
|
%{_bindir}/vmware-checkvm
|
||||||
%{_bindir}/vmware-guestproxycerttool
|
|
||||||
%{_bindir}/vmware-hgfsclient
|
%{_bindir}/vmware-hgfsclient
|
||||||
%{_bindir}/vmware-namespace-cmd
|
%{_bindir}/vmware-namespace-cmd
|
||||||
%{_bindir}/vmware-rpctool
|
%{_bindir}/vmware-rpctool
|
||||||
@ -275,7 +290,6 @@ fi
|
|||||||
%{_libdir}/%{name}/plugins/vmsvc/*.so
|
%{_libdir}/%{name}/plugins/vmsvc/*.so
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%{_udevrulesdir}/99-vmware-scsi-udev.rules
|
%{_udevrulesdir}/99-vmware-scsi-udev.rules
|
||||||
%{_unitdir}/%{toolsdaemon}-init.service
|
|
||||||
%{_unitdir}/%{toolsdaemon}.service
|
%{_unitdir}/%{toolsdaemon}.service
|
||||||
%{_unitdir}/%{vgauthdaemon}.service
|
%{_unitdir}/%{vgauthdaemon}.service
|
||||||
|
|
||||||
@ -301,11 +315,54 @@ fi
|
|||||||
%{_bindir}/vmware-vgauth-smoketest
|
%{_bindir}/vmware-vgauth-smoketest
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 05 2019 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-3.el8
|
||||||
|
- ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch [bz#1769881]
|
||||||
|
- ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch [bz#1769881]
|
||||||
|
- ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch [bz#1769881]
|
||||||
|
- ovt-Fix-a-resource-leak-issue-in-deployPkg.patch [bz#1769881]
|
||||||
|
- 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
|
||||||
|
(Rebase open-vm-tools to 11.0 for 8.2.0)
|
||||||
|
- Resolves: bz#1760891
|
||||||
|
(Need to backport some severe memory leak fixes from upstream)
|
||||||
|
|
||||||
|
* Thu Aug 01 2019 Miroslav Rezanina <mrezanin@redhat.com> - 10.3.10-3.el8
|
||||||
|
- ovt-End-VGAuth-impersonation-in-the-case-of-error.patch [bz#1602648]
|
||||||
|
- ovt-Fix-memory-leak-in-GetFormattedCommandLine-function-.patch [bz#1602648]
|
||||||
|
- ovt-Fix-a-leak-if-VGAuth-setup-fails.-Coverity-issue.patch [bz#1602648]
|
||||||
|
- ovt-Fix-minor-leak-in-FileRotateByRenumber-Coverity-scan.patch [bz#1602648]
|
||||||
|
- ovt-Fix-memory-leak-in-SNEBuildHash-function.patch [bz#1602648]
|
||||||
|
- ovt-Fix-Coverity-reported-issues-in-i18n.c-code-VMTools-.patch [bz#1602648]
|
||||||
|
- ovt-Fix-a-memory-leak-in-the-unicode-library.patch [bz#1602648]
|
||||||
|
- ovt-Fix-a-trivial-Coverity-reported-memory-leak-in-vgaut.patch [bz#1602648]
|
||||||
|
- ovt-Fixes-for-few-leaks-and-improved-error-handling.patch [bz#1602648]
|
||||||
|
- ovt-Fix-Coverity-reported-double-memory-free-errors.patch [bz#1602648]
|
||||||
|
- ovt-Fix-a-trivial-Coverity-reported-memory-leak.patch [bz#1602648]
|
||||||
|
- ovt-Fix-RH-Covscan-Coverity-reported-memory-leaks-in-too.patch [bz#1602648]
|
||||||
|
- ovt-Fix-Using-uninitialized-value-issue-reported-by-Cove.patch [bz#1602648]
|
||||||
|
- ovt-copyPasteCompatX11.c-code-generating-unnecessary-Cov.patch [bz#1602648]
|
||||||
|
- ovt-Fix-a-Coverity-issue-reported-in-vgauth-serviceImpl-.patch [bz#1602648]
|
||||||
|
- ovt-Fix-two-coverity-issues-reported-by-a-customer.patch [bz#1602648]
|
||||||
|
- Resolves: bz#1602648
|
||||||
|
([ESXi][RHEL8]Please review important issues found by covscan in "open-vm-tools-10.2.5-2.el8+7" package)
|
||||||
|
|
||||||
* Tue Jun 04 2019 Miroslav Rezanina <mrezanin@redhat.com> - 10.3.10-2
|
* Tue Jun 04 2019 Miroslav Rezanina <mrezanin@redhat.com> - 10.3.10-2
|
||||||
- Rebase to 10.3.10 [bz#1702784]
|
- Rebase to 10.3.10 [bz#1702784]
|
||||||
- Resolves: bz#1702784
|
- Resolves: bz#1702784
|
||||||
(Rebase open-vm-tools to 10.3.10)
|
(Rebase open-vm-tools to 10.3.10)
|
||||||
|
|
||||||
|
* Tue Jan 08 2019 Miroslav Rezanina <mrezanin@redhat.com> - 10.3.0-2.el8
|
||||||
|
- ovt-Enable-cloud-init-by-default-to-change-the-systemd-u.patch [bz#1660713]
|
||||||
|
- Resolves: bz#1660713
|
||||||
|
([ESXi][RHEL8.0]Enable cloud-init by default to change the systemd unit file vmtoolsd.service)
|
||||||
|
|
||||||
* Tue Oct 16 2018 Miroslav Rezanina <mrezanin@redhat.com> - 10.3.0-1
|
* Tue Oct 16 2018 Miroslav Rezanina <mrezanin@redhat.com> - 10.3.0-1
|
||||||
- Rebase to 10.3.0 [bz#1626578]
|
- Rebase to 10.3.0 [bz#1626578]
|
||||||
- Resolves: bz#1626578
|
- Resolves: bz#1626578
|
||||||
|
Loading…
Reference in New Issue
Block a user