[arch-commits] Commit in open-vm-tools/trunk (2 files)
Date: Tuesday, January 14, 2020 @ 12:25:19
Author: eworm
Revision: 552490
upgpkg: open-vm-tools 6:11.0.1-2
fix udev rules
Added:
open-vm-tools/trunk/0002-stop-systemd-243-udev-complaints.patch
Modified:
open-vm-tools/trunk/PKGBUILD
-+
0002-stop-systemd-243-udev-complaints.patch | 56 ++
PKGBUILD|5 +-
2 files changed, 60 insertions(+), 1 deletion(-)
Added: 0002-stop-systemd-243-udev-complaints.patch
===
--- 0002-stop-systemd-243-udev-complaints.patch (rev 0)
+++ 0002-stop-systemd-243-udev-complaints.patch 2020-01-14 12:25:19 UTC (rev
552490)
@@ -0,0 +1,56 @@
+commit f1dab8ded454b6993a4d96d0aefc700f1796
+Author: Oliver Kurth
+Date: Mon Oct 28 16:12:42 2019 -0700
+
+stop systemd-243 udev complaints #371
+
+Address issues from pull request #371 on github:
+- fix substiution variables for systemd-243
+- fix permissions of rules file
+See https://github.com/vmware/open-vm-tools/pull/371
+
+diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
+index 08cc28ef..026de07e 100644
+--- a/open-vm-tools/AUTHORS
b/open-vm-tools/AUTHORS
+@@ -49,3 +49,7 @@ Josh PaetzelAdditional changes to vmmemctl.ko for
FreeBSD 12.0 API changes.
+
+ Haruki TsurumotoFix Asianux identification
+ - https://github.com/vmware/open-vm-tools/pull/325
++
++MilhouseVH stop systemd-243 udev complaints
++- https://github.com/vmware/open-vm-tools/pull/371
++
+diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules
b/open-vm-tools/udev/99-vmware-scsi-udev.rules
+index 053b5970..fb4ed684 100644
+--- a/open-vm-tools/udev/99-vmware-scsi-udev.rules
b/open-vm-tools/udev/99-vmware-scsi-udev.rules
+@@ -1,7 +1,7 @@
+-# Copyright (C) 2016 VMware, Inc. All rights reserved.
++# Copyright (C) 2016,2019 VMware, Inc. All rights reserved.
+ #
+ # This file is part of open-vm-tools
+
+-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*",
ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180
>/sys$DEVPATH/device/timeout'"
+-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*",
ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo
180 >/sys$DEVPATH/device/timeout'"
++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*",
ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180
>/sys$env{DEVPATH}/device/timeout'"
++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*",
ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo
180 >/sys$env{DEVPATH}/device/timeout'"
+
+diff --git a/open-vm-tools/udev/Makefile.am b/open-vm-tools/udev/Makefile.am
+index 68fbc3e2..c3baadf1 100644
+--- a/open-vm-tools/udev/Makefile.am
b/open-vm-tools/udev/Makefile.am
+@@ -1,5 +1,5 @@
+
+-### Copyright (C) 2016 VMware, Inc. All rights reserved.
++### Copyright (C) 2016,2019 VMware, Inc. All rights reserved.
+ ###
+ ### This program is free software; you can redistribute it and/or modify
+ ### it under the terms of version 2 of the GNU General Public License as
+@@ -17,5 +17,5 @@
+
+ install-data-local:
+ $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR)
+- $(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
++ $(INSTALL) -m 644 $(srcdir)/99-vmware-scsi-udev.rules
$(DESTDIR)$(UDEVRULESDIR)
+
Modified: PKGBUILD
===
--- PKGBUILD2020-01-14 12:03:35 UTC (rev 552489)
+++ PKGBUILD2020-01-14 12:25:19 UTC (rev 552490)
@@ -4,7 +4,7 @@
pkgname=open-vm-tools
epoch=6
pkgver=11.0.1
-pkgrel=1
+pkgrel=2
pkgdesc='The Open Virtual Machine Tools (open-vm-tools) are the open source
implementation of VMware Tools'
arch=('x86_64')
url='https://github.com/vmware/open-vm-tools'
@@ -20,10 +20,12 @@
options=('docs')
source=("$pkgname-$pkgver.tar.gz::https://github.com/vmware/open-vm-tools/archive/stable-${pkgver/_/-}.tar.gz";
'0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch'
+'0002-stop-systemd-243-udev-complaints.patch'
'vmtoolsd.service'
'vmware-vmblock-fuse.service')
sha256sums=('99f1e3c5245bb002c1e66cbb7a1078e1c3567db5f92cc2e00ab08557e9df4758'
'c97484a15dbc65d7eb14bbd96dd3785e2a1a130a44e3950f9865a988c28bc137'
+'a01990c7cda8426e5bfcebc33b4024ff037367e27d58c006f5b0fe6a7f5bd52c'
'5a9403f78356873258521644068f2c9639b994d5954e5ad953934136822b2689'
'99e3cc1da20a751049144cc02dec77174a55109b5b5960e1facd78709da7724f')
@@ -31,6 +33,7 @@
cd "$srcdir/$pkgname-stable-${pkgver}/"
patch -Np1 < ../0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
+ patch -Np1 < ../0002-stop-syst
[arch-commits] Commit in open-vm-tools/trunk (2 files)
Date: Friday, February 9, 2018 @ 06:48:32
Author: eworm
Revision: 290428
upgpkg: open-vm-tools 6:10.2.0-2
Set X11 as the backend for gtk3 of open-vm-tools (FS#57425)
Added:
open-vm-tools/trunk/0001-Set-X11-as-the-backend-for-gtk3-of-open-vm-tools.patch
Modified:
open-vm-tools/trunk/PKGBUILD
-+
0001-Set-X11-as-the-backend-for-gtk3-of-open-vm-tools.patch | 83 ++
PKGBUILD| 23 +-
2 files changed, 99 insertions(+), 7 deletions(-)
Added: 0001-Set-X11-as-the-backend-for-gtk3-of-open-vm-tools.patch
===
--- 0001-Set-X11-as-the-backend-for-gtk3-of-open-vm-tools.patch
(rev 0)
+++ 0001-Set-X11-as-the-backend-for-gtk3-of-open-vm-tools.patch 2018-02-09
06:48:32 UTC (rev 290428)
@@ -0,0 +1,83 @@
+From c5bc784da611ee929e0da7c20a410e03e6540613 Mon Sep 17 00:00:00 2001
+From: Oliver Kurth
+Date: Fri, 26 Jan 2018 15:04:36 -0800
+Subject: [PATCH] Set X11 as the backend for gtk3 of open-vm-tools
+
+Open-vm-tools defaults to gtk3. For distros like Fedora 27, Wayland is
+the default display server. With no restriction on the backend, plugins
+will try to use Wayland as the backend of Gtk+3. As a result,
+gdk_display_get_default() returns a Wayland display;
+gdk_display_get_default_group() also returns a Wayland window. Applying
+GDK_WINDOW_XID() on the Wayland window will result in the crash reported
+on recent Linux releases that default to a Wayland display server.
+
+As X11-specific code is widely used in tools plugins, a migratation to
+Wayland in the short term is not possible. So, as a compromised solution,
+plugins can be forced to run on XWayland, which is the compatible mode
+of Wayland for legacy X11 clients.
+
+gdk_set_allowed_backends() only applies when flag GTK3 is defined, and Gtk
+version cwgreater than 3.10.
+---
+ open-vm-tools/services/plugins/desktopEvents/x11Lock.c | 12 +++-
+ open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp | 14 +-
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/open-vm-tools/services/plugins/desktopEvents/x11Lock.c
b/open-vm-tools/services/plugins/desktopEvents/x11Lock.c
+index 572234ac..613b6946 100644
+--- a/open-vm-tools/services/plugins/desktopEvents/x11Lock.c
b/open-vm-tools/services/plugins/desktopEvents/x11Lock.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
++ * Copyright (C) 2010-2018 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
+@@ -364,6 +364,16 @@ X11Lock_Init(ToolsAppCtx *ctx,
+g_set_prgname(VMUSER_TITLE);
+argv[0] = VMUSER_TITLE;
+
++#if GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >=
10)
++ /*
++* On recent distros, Wayland is the default display server. If the
obtained
++* display or window is a wayland one, applying X11 specific functions on
them
++* will result in crashes. Before migrating the X11 specific code to
Wayland,
++* force using X11 as the backend of Gtk+3. gdk_set_allowed_backends() is
++* introduced since Gtk+3.10 and Wayland is supported from Gtk+3.10.
++*/
++ gdk_set_allowed_backends("x11");
++#endif
+/* XXX: is calling gtk_init() multiple times safe? */
+gtk_init(&argc, (char ***) &argv);
+
+diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
b/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
+index fffdc402..4c2f3d8d 100644
+--- a/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
b/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
++ * Copyright (C) 2010-2018 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
+@@ -211,6 +211,18 @@ gboolean
+ CopyPasteDnDX11::Init(ToolsAppCtx *ctx)
+ {
+TRACE_CALL();
++
++#if GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >=
10)
++ /*
++* On recent distros, Wayland is the default display server. If the
obtained
++* display or window is a wayland one, applying X11 specific functions on
them
++* will result in crashes. Before migrating the X11 specific code to
Wayland,
++* force using X11 as the backend of Gtk+3. gdk_set_allowed_backends() is
++* introduced since Gtk+3.10 and Wayland is supported from Gtk+3.10.
++*/
++ gdk_set_allowed_backends("x11");
++#endif
++
+CopyPasteDnDWrapper *wrapper = CopyPasteDnDWrapper::GetInstance();
+
+ASSERT
