pool/open-vm-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 783060 from Virtualization:VMware

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/783060
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=90
This commit is contained in:
Dominique Leuenberger 2020-03-11 17:45:38 +00:00 committed by Git OBS Bridge
commit 9bb39da726
8 changed files with 1689 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1571
app_info_plugin.patch Normal file
View File

File diff suppressed because it is too large Load Diff

32
diskinfo-debug-logging-1162435.patch Normal file
View File

@ -0,0 +1,32 @@
commit 4ee0bd3c8ead89541ab7d196fb54e940e397420d
Author: Oliver Kurth <okurth@vmware.com>
Date: Fri Feb 7 10:39:38 2020 -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.
diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
index 878276ce..032c0928 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;

64
fix-leaks-Aliases-MappedAliases.patch
View File

@ -1,64 +0,0 @@
commit 9bc72f0b09702754b429115658a85223cb3058bd
Author: Oliver Kurth <okurth@vmware.com>
Date: Wed Oct 2 17:48:35 2019 -0700
Fix leaks in ListAliases and ListMappedAliases.
The 'record' for each alias was being leaked.
diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 6352b915..9ba55073 100644
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -9762,7 +9762,6 @@ VixToolsListAuthAliases(VixCommandReques
char *destPtr;
char *endDestPtr;
char *tmpBuf = NULL;
- char *recordBuf;
size_t recordSize;
char *escapedStr = NULL;
char *escapedStr2 = NULL;
@@ -9822,6 +9821,8 @@ VixToolsListAuthAliases(VixCommandReques
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(VixCommandReques
Log("%s: ListAuth list results too large, truncating", __FUNCTION__);
goto abort;
}
+ free(recordBuf);
+ recordBuf = NULL;
}
*result = resultBuffer;
@@ -9960,7 +9963,6 @@ VixToolsListMappedAliases(VixCommandRequ
char *destPtr;
char *endDestPtr;
char *tmpBuf = NULL;
- char *recordBuf;
char *escapedStr = NULL;
char *escapedStr2 = NULL;
size_t recordSize;
@@ -10014,6 +10016,8 @@ VixToolsListMappedAliases(VixCommandRequ
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(VixCommandRequ
Log("%s: ListMapped results too large, truncating", __FUNCTION__);
goto abort;
}
+ free(recordBuf);
+ recordBuf = NULL;
}
*result = resultBuffer;

40
gcc10-warning.patch Normal file
View File

@ -0,0 +1,40 @@
--- a/open-vm-tools/lib/user/utilBacktrace.c
+++ b/open-vm-tools/lib/user/utilBacktrace.c
@@ -510,13 +510,16 @@
options.bugNumber = bugNr;
CoreDump_LogFullBacktraceToFunc(&options, outFunc, outFuncData);
#else
- uintptr_t *x = (uintptr_t *) &bugNr;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+ uintptr_t *x = ((uintptr_t *) &bugNr) - 2;
+#pragma GCC diagnostic pop
if (bugNr == 0) {
outFunc(outFuncData, "Backtrace:\n");
} else {
outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
}
- Util_BacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
+ Util_BacktraceFromPointerWithFunc(x, outFunc, outFuncData);
#endif
}
--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
@@ -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;
#endif
#ifndef GDK_SELECTION_TYPE_TIMESTAMP
-GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
+extern GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
#endif
#ifndef GDK_SELECTION_TYPE_UTF8_STRING
-GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
+extern GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
#endif

3
open-vm-tools-11.0.0-14549434.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b95141b0eb8a46094f905c29b969ad7ee63997194df168c82e35389bb1cebc7b
size 3972826

3
open-vm-tools-11.0.5-15389592.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc5ed2d752af33775250e0f103d622c0031d578f8394511617d2619b124dfc42
size 3979725

26
open-vm-tools.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Mon Mar 9 17:10:27 UTC 2020 - Kirk Allan <kallan@suse.com>
- Simplified the conditional around systemd_ordering to just use
suse_version >= 1500.
-------------------------------------------------------------------
Fri Mar 6 22:46:16 UTC 2020 - Kirk Allan <kallan@suse.com>
- Update to 11.0.5 (build 15389592) (boo#1165955)
+ DNS server is reported incorrectly as '127.0.0.53' when using
systemd-resolved. DNS server is reported incorrectly in GuestInfo as
'127.0.0.53' , when the OS uses systemd-resolved. This issue is fixed
in this release.
- Conditionalized the use of systemd_ordering. Use systemd_ordering
for factory, openSUSE >= 15, and SLE >= 15. Use systemd_requires
for older openSUSE and SLE releases.
- Conditionalize out the use of %license COPYING for SLE 12 SP2 and older.
- Added patches
+ gcc10-warning.patch (boo#1160408)
+ diskinfo-debug-logging-1162435.patch (boo#1162435 and bsc#1162119)
- Changed g_warning to g_debug
+ app_info_plugin.patch (boo#1165955)
- Drop unnecessary patch:
- fix-leaks-Aliases-MappedAliases.patch
-------------------------------------------------------------------
Fri Jan 24 14:55:18 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

21
open-vm-tools.spec
View File

@ -64,8 +64,8 @@
Name: open-vm-tools
%define subname open-vm-tools
%define tarname open-vm-tools
%define bldnum 14549434
Version: 11.0.0
%define bldnum 15389592
Version: 11.0.5
Release: 0
Summary: Open Virtual Machine Tools
License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@ -161,10 +161,16 @@ Obsoletes: open-vm-tools-deploypkg <= 10.0.5
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
ExclusiveArch: %ix86 x86_64
#Upstream patches
Patch0: fix-leaks-Aliases-MappedAliases.patch
Patch1: gcc9-static-inline.patch
Patch0: gcc9-static-inline.patch
Patch1: gcc10-warning.patch
Patch2: diskinfo-debug-logging-1162435.patch
Patch3: app_info_plugin.patch
%if 0%{?suse_version } >= 1500
%systemd_ordering
%else
%systemd_requires
%endif
%description
Open Virtual Machine Tools (open-vm-tools) are the open source
@ -231,6 +237,8 @@ sed -i -e "s/\r//" README
#Upstream patches
%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2
%build
%if %{with_X}
@ -395,8 +403,12 @@ rm -rf %{buildroot}
%files
%defattr(-, root, root)
%if 0%{?sle_version} <= 120200 && !0%{?is_opensuse}
%doc AUTHORS COPYING ChangeLog NEWS README
%else
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%endif
%{_bindir}/vmtoolsd
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
@ -408,6 +420,7 @@ rm -rf %{buildroot}
%{_libdir}/%{name}/plugins/vmsvc/libresolutionKMS.so
%{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so
%{_libdir}/%{name}/plugins/vmsvc/libvmbackup.so
%{_libdir}/%{name}/plugins/vmsvc/libappInfo.so
%{_libdir}/%{name}/plugins/common/libhgfsServer.so
%{_libdir}/%{name}/plugins/common/libvix.so
%{_bindir}/vmhgfs-fuse