* Fri Oct 15 2021 Miroslav Rezanina <mrezanin@redhat.com> - 11.3.5-1
- Rebase to 11.3.5 [bz#2008243] - Resolves: bz#2008243 ([ESXi][RHEL9]Open-vm-tools release 11.3.5 has been released - please rebase)
This commit is contained in:
Miroslav Rezanina
parent
83e47a3fc1
commit
430ce977f0
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@
|
||||
/open-vm-tools-11.2.0-16938113.tar.gz
|
||||
/open-vm-tools-11.2.5-17337674.tar.gz
|
||||
/open-vm-tools-11.3.0-18090558.tar.gz
|
||||
/open-vm-tools-11.3.5-18557794.tar.gz
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
|
||||
%global _hardened_build 1
|
||||
%global majorversion 11.3
|
||||
%global minorversion 0
|
||||
%global toolsbuild 18090558
|
||||
%global minorversion 5
|
||||
%global toolsbuild 18557794
|
||||
%global toolsversion %{majorversion}.%{minorversion}
|
||||
%global toolsdaemon vmtoolsd
|
||||
%global vgauthdaemon vgauthd
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
Name: open-vm-tools
|
||||
Version: %{toolsversion}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
|
||||
License: GPLv2
|
||||
URL: https://github.com/vmware/%{name}
|
||||
@ -46,7 +46,7 @@ Source5: vmtoolsd.pam
|
||||
|
||||
|
||||
%if 0%{?rhel} >= 7
|
||||
ExclusiveArch: x86_64
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
%else
|
||||
ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
%endif
|
||||
@ -390,6 +390,11 @@ fi
|
||||
%{_bindir}/vmware-vgauth-smoketest
|
||||
|
||||
%changelog
|
||||
* Fri Oct 15 2021 Miroslav Rezanina <mrezanin@redhat.com> - 11.3.5-1
|
||||
- Rebase to 11.3.5 [bz#2008243]
|
||||
- Resolves: bz#2008243
|
||||
([ESXi][RHEL9]Open-vm-tools release 11.3.5 has been released - please rebase)
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.3.0-2
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
From 91bbbafc599978c5065879351715f452d2a003ea Mon Sep 17 00:00:00 2001
|
||||
From: Cathy Avery <cavery@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 14:54:39 -0400
|
||||
Subject: [PATCH] Fix a memory leak reported by a partner from their Coverity
|
||||
scans.
|
||||
|
||||
RH-Author: Cathy Avery (cavery)
|
||||
RH-MergeRequest: 4: Fix a memory leak reported by a partner from their Coverity scans.
|
||||
RH-Commit: [1/1] 30a99cc22d39845f1fd272cf841c6a684f3174d4
|
||||
RH-Bugzilla: 1954040
|
||||
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
||||
RH-Acked-by: Mohamed Gamal <mgamal@redhat.com>
|
||||
|
||||
commit 4f7441d8cd20923e509ff819084693bbd8c928df
|
||||
Author: John Wolfe <jwolfe@vmware.com>
|
||||
Date: Thu Mar 25 20:21:17 2021 -0700
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1954040
|
||||
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=36472596
|
||||
Tested: Tested by QE
|
||||
Upstream Status: origin/devel
|
||||
Conflicts: None
|
||||
|
||||
Fix a memory leak reported by a partner from their Coverity scans.
|
||||
|
||||
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||
---
|
||||
open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
|
||||
index fbadee2c..aaa5082a 100644
|
||||
--- a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
|
||||
+++ b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (C) 2016-2020 VMware, Inc. All rights reserved.
|
||||
+ * Copyright (C) 2016-2021 VMware, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -872,7 +872,6 @@ VerifySubject(xmlDocPtr doc,
|
||||
xmlNodePtr nameIDNode;
|
||||
xmlNodePtr child;
|
||||
gchar *subjectVal = NULL;
|
||||
- gboolean retCode = FALSE;
|
||||
gboolean validSubjectFound = FALSE;
|
||||
xmlChar *tmp;
|
||||
|
||||
@@ -956,14 +955,13 @@ VerifySubject(xmlDocPtr doc,
|
||||
}
|
||||
}
|
||||
|
||||
+done:
|
||||
if (validSubjectFound && (NULL != subjectRet)) {
|
||||
*subjectRet = subjectVal;
|
||||
} else {
|
||||
g_free(subjectVal);
|
||||
}
|
||||
- retCode = validSubjectFound;
|
||||
-done:
|
||||
- return retCode;
|
||||
+ return validSubjectFound;
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,106 +0,0 @@
|
||||
From 305aec78caf0266c69005c4d01e7955025af7b21 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Mon, 8 Mar 2021 09:28:50 +0100
|
||||
Subject: [PATCH 1/2] Fixes necessary to build open-vm-tools with newer gtk and
|
||||
gcc
|
||||
|
||||
RH-Author: Miroslav Rezanina (mrezanin)
|
||||
RH-MergeRequest: 2: Fixes necessary to build open-vm-tools with newer gtk and gcc
|
||||
RH-Commit: [1/2] a91a8017174b4788132aeb5832187e0c91b6419d (mrezanin/rhel-src-open-vm-tools)
|
||||
RH-Bugzilla: 1936382
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
gtk updates present in RHEL 9 makes some functions used by open-vm-tools
|
||||
deprecated so they raise warning during build. Code has to be updated to
|
||||
use non-deprecated functionality.
|
||||
|
||||
In addition, some small fixes are necessary for proper build using gcc
|
||||
version available in RHEL 9.
|
||||
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
open-vm-tools/lib/include/tracer.hh | 2 --
|
||||
open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp | 1 +
|
||||
.../plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp | 2 --
|
||||
open-vm-tools/services/plugins/dndcp/dndUIX11.cpp | 4 ++--
|
||||
open-vm-tools/services/plugins/dndcp/dndcp.cpp | 4 ++--
|
||||
5 files changed, 5 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools/lib/include/tracer.hh b/open-vm-tools/lib/include/tracer.hh
|
||||
index 697caedb..71642ea1 100644
|
||||
--- a/open-vm-tools/lib/include/tracer.hh
|
||||
+++ b/open-vm-tools/lib/include/tracer.hh
|
||||
@@ -28,9 +28,7 @@
|
||||
|
||||
#include "vm_basic_defs.h"
|
||||
|
||||
-extern "C" {
|
||||
#include "glib.h"
|
||||
-}
|
||||
|
||||
|
||||
#ifdef VMX86_DEVEL
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
|
||||
index 68212ab8..a7882b80 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
|
||||
@@ -1666,6 +1666,7 @@ CopyPasteUIX11::FileBlockMonitorThread(void *arg) // IN
|
||||
char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
|
||||
ssize_t size;
|
||||
size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
|
||||
+ (void) size; /* Prevent unused variable warning */
|
||||
/*
|
||||
* The current thread will block in read function until
|
||||
* any other application accesses the file params->fileBlockName
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
|
||||
index 9b70984f..300c9323 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
|
||||
@@ -31,13 +31,11 @@
|
||||
|
||||
#include "dnd.h"
|
||||
|
||||
-extern "C" {
|
||||
#ifdef VMX86_TOOLS
|
||||
#include "vmware/tools/guestrpc.h"
|
||||
#else
|
||||
#include "guest_rpc.h"
|
||||
#endif
|
||||
-}
|
||||
|
||||
#define GUEST_RPC_CMD_STR_DND "dnd.transport"
|
||||
#define GUEST_RPC_CMD_STR_CP "copypaste.transport"
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
|
||||
index 50c2bf5e..9bb3ad64 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
|
||||
@@ -467,8 +467,8 @@ DnDUIX11::OnSrcDragBegin(const CPClipboard *clip, // IN
|
||||
#ifndef GTK3
|
||||
event.device = gdk_device_get_core_pointer();
|
||||
#else
|
||||
- GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event.window));
|
||||
- event.device = gdk_device_manager_get_client_pointer(manager);
|
||||
+ GdkSeat* seat = gdk_display_get_default_seat(gdk_window_get_display(event.window));
|
||||
+ event.device = gdk_seat_get_pointer(seat);
|
||||
#endif
|
||||
event.x_root = mOrigin.get_x();
|
||||
event.y_root = mOrigin.get_y();
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/dndcp.cpp b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
|
||||
index d1013f4a..e0bf2906 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/dndcp.cpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
|
||||
@@ -33,9 +33,9 @@
|
||||
|
||||
extern "C" {
|
||||
#include "vmware/guestrpc/tclodefs.h"
|
||||
-#include "vmware/tools/plugin.h"
|
||||
-#include "vmware/tools/utils.h"
|
||||
}
|
||||
+#include "vmware/tools/utils.h"
|
||||
+#include "vmware/tools/plugin.h"
|
||||
|
||||
#include <string.h>
|
||||
#include "copyPasteDnDWrapper.h"
|
||||
--
|
||||
2.27.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (open-vm-tools-11.3.0-18090558.tar.gz) = 36fa4fc309e57f49f1000abe8ca48aaf8bda67cd0ef3fd25ed0dfc12e2dd88e5a2bc8dae69abbadb44b2fa5195802f9925681a452f54916daa268adb20e8c8cd
|
||||
SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user