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

Accepting request 901765 from Virtualization:VMware

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/901765
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=103
This commit is contained in:
Dominique Leuenberger 2021-06-27 16:58:19 +00:00 committed by Git OBS Bridge
commit dddde5d9e6
9 changed files with 47 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
open-vm-tools-11.2.5-17337674.tar.gz
View File

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

3
open-vm-tools-11.3.0-18090558.tar.gz Normal file
View File

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

73
open-vm-tools-glib-2.67.patch
View File

@ -1,73 +0,0 @@
diff -ur a/lib/include/tracer.hh b/lib/include/tracer.hh
--- a/lib/include/tracer.hh 2020-12-17 12:11:31.000000000 -0800
+++ b/lib/include/tracer.hh 2021-03-15 19:51:49.287342746 -0700
@@ -28,9 +28,7 @@
#include "vm_basic_defs.h"
-extern "C" {
#include "glib.h"
-}
#ifdef VMX86_DEVEL
diff -ur a/services/plugins/dndcp/copyPasteUIX11.cpp b/services/plugins/dndcp/copyPasteUIX11.cpp
--- a/services/plugins/dndcp/copyPasteUIX11.cpp 2020-12-17 12:11:31.000000000 -0800
+++ b/services/plugins/dndcp/copyPasteUIX11.cpp 2021-03-15 19:53:20.020952955 -0700
@@ -1666,6 +1666,7 @@
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 -ur a/services/plugins/dndcp/dndcp.cpp b/services/plugins/dndcp/dndcp.cpp
--- a/services/plugins/dndcp/dndcp.cpp 2020-12-17 12:11:31.000000000 -0800
+++ b/services/plugins/dndcp/dndcp.cpp 2021-03-15 19:54:34.873281325 -0700
@@ -33,9 +33,9 @@
extern "C" {
#include "vmware/guestrpc/tclodefs.h"
+}
#include "vmware/tools/plugin.h"
#include "vmware/tools/utils.h"
-}
#include <string.h>
#include "copyPasteDnDWrapper.h"
diff -ur a/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
--- a/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp 2020-12-17 12:12:15.000000000 -0800
+++ b/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp 2021-03-15 19:55:28.810238519 -0700
@@ -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 -ur a/services/plugins/dndcp/dndUIX11.cpp b/services/plugins/dndcp/dndUIX11.cpp
--- a/services/plugins/dndcp/dndUIX11.cpp 2020-12-17 12:11:31.000000000 -0800
+++ b/services/plugins/dndcp/dndUIX11.cpp 2021-03-15 20:53:51.733705766 -0700
@@ -467,8 +467,13 @@
#ifndef GTK3
event.device = gdk_device_get_core_pointer();
#else
+ #if GTK_MINOR_VERSION >= 20
+ GdkSeat* seat = gdk_display_get_default_seat(gdk_window_get_display(event.window));
+ event.device = gdk_seat_get_pointer(seat);
+ #else
GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event.window));
event.device = gdk_device_manager_get_client_pointer(manager);
+ #endif
#endif
event.x_root = mOrigin.get_x();
event.y_root = mOrigin.get_y();

11
open-vm-tools-pollGtk.patch
View File

@ -1,11 +0,0 @@
--- a/lib/pollGtk/pollGtk.c 2020-03-10 16:12:24.000000000 -0700
+++ b/lib/pollGtk/pollGtk.c 2020-03-10 16:12:24.000000000 -0700
@@ -99,7 +99,7 @@
} Poll;
static Poll *pollState;
-static volatile gsize inited = 0;
+static gsize inited = 0;
static VMwareStatus
PollGtkCallback(PollClassSet classSet, // IN

27
open-vm-tools.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Thu Jun 24 14:15:09 UTC 2021 - Kirk Allan <kallan@suse.com>
- Update to 11.3.0 (build 18090558) (boo#1187567)
+ Resolved issues:
- The following github issues and pull requests have been resolved:
446, 481, 500, and 509
- The following Pull requests have been resolved: 474 and 505
- A number of issues detected by Coverity, internally or by third parties,
have been addressed.
- A command line tool, vmwgfxctrl, has been added to open-vm-tools for
Linux that can be used to control various aspects of the vmwgfx Linux
kernel module. Currently it can both display and set the current
topology of the vmwgfx kernel driver. It is useful when trying to
configure custom resolutions on recent Linux distributions, including
multi-monitor setups.
- A command line tool, vmware-alias-import, has been added to
open-vm-tools that can be used to import vgauth config data and apply
it to the running vgauth service.
- Enhancements to support or utilize various vSphere features.
- Fixed bug (bsc#1185175) In vmtoolsd.service move deprecated path
"/var/run" to "/run" for it's PIDfile.
- Update pam-vmtoolsd.patch to compensate for new line numbers.
- Drop patch now contained in 11.3.0:
- open-vm-tools-glib-2.67.patch
- open-vm-tools-pollGtk.patch
-------------------------------------------------------------------
Thu May 6 19:53:08 UTC 2021 - Kirk Allan <kallan@suse.com>

22
open-vm-tools.spec
View File

@ -40,8 +40,8 @@
Name: open-vm-tools
%define subname open-vm-tools
%define tarname open-vm-tools
%define bldnum 17337674
Version: 11.2.5
%define bldnum 18090558
Version: 11.3.0
Release: 0
Summary: Open Virtual Machine Tools
License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@ -56,9 +56,6 @@ Source6: open-vm-tools-modprobe.conf
Source7: tools.conf
Source8: vgauthd.service
Source9: vmblock-fuse.service
# PATCH-FIX-UPSTREAM open-vm-tools-glib-2.67.patch dimstar@opensuse.org -- Fix build with glib 2.67, https://github.com/vmware/open-vm-tools/issues/500
Patch100: open-vm-tools-glib-2.67.patch
Patch101: open-vm-tools-pollGtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
# don't use pkgconfig(gtk+-2.0) so we can build on SLE
@ -93,6 +90,8 @@ BuildRequires: pkgconfig(xtst)
BuildRequires: glibc >= 2.12
BuildRequires: xorg-x11-devel
%endif
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libudev)
%if %{with vgauth}
# vgauth requires xml2, xerces-c, and xml-security-c/xmlsec1
BuildRequires: libxml2-devel
@ -139,6 +138,8 @@ Obsoletes: open-vm-tools-deploypkg <= 10.0.5
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
ExclusiveArch: %ix86 x86_64 aarch64
#Upstream patches
#SUSE specific patches
Patch0: pam-vmtoolsd.patch
%if 0%{?suse_version} >= 1500
@ -219,11 +220,9 @@ if you intend to create own plugins for vmtoolsd.
# fix for an rpmlint warning regarding wrong line feeds
sed -i -e "s/\r//" README
#Upstream patches
%patch0 -p2
# patch not yet coming from upstream, https://github.com/vmware/open-vm-tools/issues/500
%patch100 -p1
%patch101 -p1
#SUSE specific patches
%patch0 -p2
%build
%if %{with_X}
@ -415,6 +414,8 @@ rm -rf %{buildroot}
%{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so
%{_libdir}/%{name}/plugins/vmsvc/libvmbackup.so
%{_libdir}/%{name}/plugins/vmsvc/libappInfo.so
%{_libdir}/%{name}/plugins/vmsvc/libgdp.so
%{_libdir}/%{name}/plugins/vmsvc/libguestStore.so
%{_libdir}/%{name}/plugins/common/libhgfsServer.so
%{_libdir}/%{name}/plugins/common/libvix.so
%{_bindir}/vmhgfs-fuse
@ -425,6 +426,7 @@ rm -rf %{buildroot}
%{_bindir}/vmware-toolbox-cmd
%{_bindir}/vmware-xferlogs
%{_bindir}/vm-support
%{_bindir}/vmware-alias-import
%{_sbindir}/mount.vmhgfs
%if !0%{?usrmerged}
/sbin/mount.vmhgfs
@ -475,6 +477,7 @@ rm -rf %{buildroot}
%{_bindir}/vmware-user
%{_bindir}/vmware-user-autostart-wrapper
%{_bindir}/vmware-vmblock-fuse
%{_bindir}/vmwgfxctrl
%if %{with vmblockfuseservice}
%{_unitdir}/vmblock-fuse.service
%{_sbindir}/rcvmblock-fuse
@ -497,6 +500,7 @@ rm -rf %{buildroot}
%{_libdir}/libguestlib.so.*
%{_libdir}/libhgfs.so.*
%{_libdir}/libDeployPkg.so.*
%{_libdir}/libguestStoreClient.so.*
%if %{with vgauth}
%{_libdir}/libvgauth.so.*
%endif

2
pam-vmtoolsd.patch
View File

@ -1,6 +1,6 @@
--- a/open-vm-tools/services/vmtoolsd/Makefile.am
+++ b/open-vm-tools/services/vmtoolsd/Makefile.am
@@ -78,7 +78,7 @@ install-data-hook:
@@ -81,7 +81,7 @@ install-data-hook:
install-exec-hook:
$(INSTALL) -d $(DESTDIR)/etc/vmware-tools
$(INSTALL) -d $(DESTDIR)/$(PAM_PREFIX)/pam.d/

2
vmblock-fuse.service
View File

@ -8,7 +8,7 @@ Before=vmtoolsd.service
Type=forking
RuntimeDirectory=vmblock-fuse
RuntimeDirectoryMode=755
ExecStart=/usr/bin/vmware-vmblock-fuse -o subtype=vmware-vmblock,default_permissions,allow_other /var/run/vmblock-fuse
ExecStart=/usr/bin/vmware-vmblock-fuse -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
[Install]
WantedBy=multi-user.target

4
vmtoolsd.service
View File

@ -9,8 +9,8 @@ Before=cloud-init-local.service
[Service]
Type=forking
PIDFile=/var/run/vmtoolsd.pid
ExecStart=/usr/bin/vmtoolsd --background /var/run/vmtoolsd.pid
PIDFile=/run/vmtoolsd.pid
ExecStart=/usr/bin/vmtoolsd --background /run/vmtoolsd.pid
TimeoutStopSec=5
[Install]