[arch-commits] Commit in open-vm-tools/trunk (5 files)
Christian Hesse
eworm at archlinux.org
Tue Jun 30 09:49:30 UTC 2020
Date: Tuesday, June 30, 2020 @ 09:49:30
Author: eworm
Revision: 657138
upgpkg: open-vm-tools 6:11.1.0-1: new upstream release
Added:
open-vm-tools/trunk/0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch
open-vm-tools/trunk/0002-gdk-defines.patch
Modified:
open-vm-tools/trunk/PKGBUILD
Deleted:
open-vm-tools/trunk/0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
open-vm-tools/trunk/0002-stop-systemd-243-udev-complaints.patch
------------------------------------------------------------------+
0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch | 112 ++++++++++
0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch | 87 -------
0002-gdk-defines.patch | 21 +
0002-stop-systemd-243-udev-complaints.patch | 56 -----
PKGBUILD | 18 -
5 files changed, 142 insertions(+), 152 deletions(-)
Added: 0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch
===================================================================
--- 0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch (rev 0)
+++ 0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch 2020-06-30 09:49:30 UTC (rev 657138)
@@ -0,0 +1,112 @@
+commit 9cbdf3a6e2cb23a7673fe19b2a3f888714095019
+Author: Oliver Kurth <okurth at vmware.com>
+Date: Wed Apr 1 11:31:36 2020 -0700
+
+ Add a Coverity annotation.
+
+ The Coverity scan of open-vm-tools reports an out-of-bounds access
+ issue in Util_BacktraceWithFunc. This is intentional, to compute
+ the base pointer for a stack trace.
+
+diff --git a/open-vm-tools/lib/user/utilBacktrace.c b/open-vm-tools/lib/user/utilBacktrace.c
+index dca33d26..e1259606 100644
+--- a/open-vm-tools/lib/user/utilBacktrace.c
++++ b/open-vm-tools/lib/user/utilBacktrace.c
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2013-2019 VMware, Inc. All rights reserved.
++ * Copyright (C) 2013-2020 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
+@@ -438,6 +438,7 @@ Util_BacktraceWithFunc(int bugNr, // IN:
+ } else {
+ outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
+ }
++ /* coverity[ptr_arith] */
+ UtilBacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
+ #endif
+ }
+commit bb11e038323893d2428eb2ce94f8742233b45546
+Author: Oliver Kurth <okurth at vmware.com>
+Date: Wed Jun 10 12:05:43 2020 -0700
+
+ Changes to common source file not applicable to open-vm-tools.
+
+diff --git a/open-vm-tools/lib/user/utilBacktrace.c b/open-vm-tools/lib/user/utilBacktrace.c
+index e1259606..99871365 100644
+--- a/open-vm-tools/lib/user/utilBacktrace.c
++++ b/open-vm-tools/lib/user/utilBacktrace.c
+@@ -422,7 +422,7 @@ Util_BacktraceWithFunc(int bugNr, // IN:
+ for (i = 0; i < frames; i++) {
+ if (dladdr(callstack[i], &dli)) {
+ outFunc(outFuncData, "SymBacktrace[%d] rip=%016lx in function %s "
+- "in object %s loaded at %#08x\n",
++ "in object %s loaded at %016lx\n",
+ i, callstack[i], dli.dli_sname, dli.dli_fname,
+ dli.dli_fbase);
+ } else {
+
+commit 0cfda58aaa8bc0fea56f1211897e7f2237f6070a
+Author: Oliver Kurth <okurth at vmware.com>
+Date: Wed Jun 10 12:05:46 2020 -0700
+
+ Make peeking back into the stack work for back traces
+
+ GCC 10 doesn't like peeking back before the end of an arrary (which
+ is used to peek into the stack). Fix this.
+
+ https://github.com/vmware/open-vm-tools/issues/429
+
+diff --git a/open-vm-tools/lib/user/utilBacktrace.c b/open-vm-tools/lib/user/utilBacktrace.c
+index 99871365..d26d21e7 100644
+--- a/open-vm-tools/lib/user/utilBacktrace.c
++++ b/open-vm-tools/lib/user/utilBacktrace.c
+@@ -343,7 +343,8 @@ UtilBacktraceFromPointerWithFunc(uintptr_t *basePtr, // IN:
+ i, x[0], x[1], dli.dli_sname, dli.dli_fname,
+ dli.dli_fbase);
+ } else {
+- outFunc(outFuncData, "SymBacktrace[%d] %#08x eip %#08x \n", i, x[0], x[1]);
++ outFunc(outFuncData, "SymBacktrace[%d] %#08x eip %#08x \n", i, x[0],
++ x[1]);
+ }
+ x = (uintptr_t *) x[0];
+ }
+@@ -394,6 +395,7 @@ Util_Backtrace(int bugNr) // IN
+ *-----------------------------------------------------------------------------
+ */
+
++
+ void
+ Util_BacktraceWithFunc(int bugNr, // IN:
+ Util_OutputFunc outFunc, // IN:
+@@ -413,7 +415,7 @@ Util_BacktraceWithFunc(int bugNr, // IN:
+ if (bugNr == 0) {
+ outFunc(outFuncData, "Backtrace:\n");
+ } else {
+- outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
++ outFunc(outFuncData, "Backtrace for bugNr=%d\n", bugNr);
+ }
+ frames = backtrace(callstack, ARRAYSIZE(callstack));
+ for (i = 0; i < frames; i++) {
+@@ -431,14 +433,14 @@ Util_BacktraceWithFunc(int bugNr, // IN:
+ }
+ }
+ #else
+- uintptr_t *x = (uintptr_t *) &bugNr;
+-
+ if (bugNr == 0) {
+ outFunc(outFuncData, "Backtrace:\n");
+ } else {
+- outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
++ outFunc(outFuncData, "Backtrace for bugNr=%d\n", bugNr);
+ }
+- /* coverity[ptr_arith] */
+- UtilBacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
++
++ UtilBacktraceFromPointerWithFunc(__builtin_frame_address(0), outFunc,
++ outFuncData);
+ #endif
+ }
++
+
Deleted: 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
===================================================================
--- 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch 2020-06-30 09:40:11 UTC (rev 657137)
+++ 0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch 2020-06-30 09:49:30 UTC (rev 657138)
@@ -1,87 +0,0 @@
-From 89c0d444567eb525e8d083fb564c46d68e96660c Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <okurth at vmware.com>
-Date: Mon, 30 Sep 2019 16:24:27 -0700
-Subject: [PATCH] GitHub Issue #367. Remove references to deprecated
- G_INLINE_FUNC.
-
-G_INLINE_FUNC was a work-around for compilers that didn't support
-static inline. Change uses of it to static inline.
----
- open-vm-tools/lib/include/vmware/tools/plugin.h | 2 +-
- open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++----
- open-vm-tools/lib/include/vmware/tools/utils.h | 9 ---------
- 3 files changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
-index f9acc6a29..deefd1f3d 100644
---- a/open-vm-tools/lib/include/vmware/tools/plugin.h
-+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
-@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
- *
- * @return TRUE if COM is initialized when the function returns.
- */
--G_INLINE_FUNC gboolean
-+static inline gboolean
- ToolsCore_InitializeCOM(ToolsAppCtx *ctx)
- {
- if (!ctx->comInitialized) {
-diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h
-index 3f2082b3e..5880fbcff 100644
---- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
-+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
-@@ -91,7 +91,7 @@ typedef struct ToolsCorePool {
- *******************************************************************************
- */
-
--G_INLINE_FUNC ToolsCorePool *
-+static inline ToolsCorePool *
- ToolsCorePool_GetPool(ToolsAppCtx *ctx)
- {
- ToolsCorePool *pool = NULL;
-@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
- *******************************************************************************
- */
-
--G_INLINE_FUNC guint
-+static inline guint
- ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
- ToolsCorePoolCb cb,
- gpointer data,
-@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
- *******************************************************************************
- */
-
--G_INLINE_FUNC void
-+static inline void
- ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
- guint taskId)
- {
-@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
- *******************************************************************************
- */
-
--G_INLINE_FUNC gboolean
-+static inline gboolean
- ToolsCorePool_StartThread(ToolsAppCtx *ctx,
- const gchar *threadName,
- ToolsCorePoolCb cb,
-diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h
-index f65745906..a3292d5c0 100644
---- a/open-vm-tools/lib/include/vmware/tools/utils.h
-+++ b/open-vm-tools/lib/include/vmware/tools/utils.h
-@@ -51,15 +51,6 @@
- # include <sys/time.h>
- #endif
-
--
--/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */
--#if defined(G_PLATFORM_WIN32)
--# if defined(G_INLINE_FUNC)
--# undef G_INLINE_FUNC
--# endif
--# define G_INLINE_FUNC static __inline
--#endif
--
- #ifndef ABS
- # define ABS(x) (((x) >= 0) ? (x) : -(x))
- #endif
Added: 0002-gdk-defines.patch
===================================================================
--- 0002-gdk-defines.patch (rev 0)
+++ 0002-gdk-defines.patch 2020-06-30 09:49:30 UTC (rev 657138)
@@ -0,0 +1,21 @@
+diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+index be8369e..e4d6877 100644
+--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
++++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+@@ -92,7 +92,7 @@ extern "C" {
+ * matter, we just create the atom we need directly in main().
+ *
+ * This is for V1 text copy paste only!
+- */
++ *
+ #ifndef GDK_SELECTION_CLIPBOARD
+ GdkAtom GDK_SELECTION_CLIPBOARD;
+ #endif
+@@ -104,6 +104,7 @@ GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
+ #ifndef GDK_SELECTION_TYPE_UTF8_STRING
+ GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
+ #endif
++ */
+
+
+ /*
Deleted: 0002-stop-systemd-243-udev-complaints.patch
===================================================================
--- 0002-stop-systemd-243-udev-complaints.patch 2020-06-30 09:40:11 UTC (rev 657137)
+++ 0002-stop-systemd-243-udev-complaints.patch 2020-06-30 09:49:30 UTC (rev 657138)
@@ -1,56 +0,0 @@
-commit f1dab8ded45aaaa4b6993a4d96d0aefc700f1796
-Author: Oliver Kurth <okurth at vmware.com>
-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 Paetzel Additional changes to vmmemctl.ko for FreeBSD 12.0 API changes.
-
- Haruki Tsurumoto Fix 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
===================================================================
--- PKGBUILD 2020-06-30 09:40:11 UTC (rev 657137)
+++ PKGBUILD 2020-06-30 09:49:30 UTC (rev 657138)
@@ -3,8 +3,8 @@
pkgname=open-vm-tools
epoch=6
-pkgver=11.0.1
-pkgrel=2
+pkgver=11.1.0
+pkgrel=1
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'
@@ -19,13 +19,13 @@
backup=('etc/xdg/autostart/vmware-user.desktop')
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'
+ '0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch'
+ '0002-gdk-defines.patch'
'vmtoolsd.service'
'vmware-vmblock-fuse.service')
-sha256sums=('99f1e3c5245bb002c1e66cbb7a1078e1c3567db5f92cc2e00ab08557e9df4758'
- 'c97484a15dbc65d7eb14bbd96dd3785e2a1a130a44e3950f9865a988c28bc137'
- 'a01990c7cda8426e5bfcebc33b4024ff037367e27d58c006f5b0fe6a7f5bd52c'
+sha256sums=('5930448c65cf298e3dded2a3670750f4affaf3a631500a1774eeb4cfe0a32b80'
+ 'bd722d730dfc7b2f359046c9cbc928ef58add755d1d309ad40667839a9012857'
+ '61a27f7e1aada615212ae12173aa3a12eb0238d3abe994168699e6dd9f0bb15d'
'5a9403f78356873258521644068f2c9639b994d5954e5ad953934136822b2689'
'99e3cc1da20a751049144cc02dec77174a55109b5b5960e1facd78709da7724f')
@@ -32,8 +32,8 @@
prepare() {
cd "$srcdir/$pkgname-stable-${pkgver}/"
- patch -Np1 < ../0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
- patch -Np1 < ../0002-stop-systemd-243-udev-complaints.patch
+ patch -Np1 < ../0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch
+ patch -Np1 < ../0002-gdk-defines.patch
}
build() {
More information about the arch-commits
mailing list