[arch-commits] Commit in open-vm-tools/trunk (3 files)
Christian Hesse
eworm at archlinux.org
Wed Aug 19 20:38:47 UTC 2020
Date: Wednesday, August 19, 2020 @ 20:38:47
Author: eworm
Revision: 685210
upgpkg: open-vm-tools 6:11.1.5-1: new upstream release
Modified:
open-vm-tools/trunk/PKGBUILD
Deleted:
open-vm-tools/trunk/0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch
open-vm-tools/trunk/0002-gdk-defines.patch
------------------------------------------------------------------+
0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch | 112 ----------
0002-gdk-defines.patch | 21 -
PKGBUILD | 15 -
3 files changed, 2 insertions(+), 146 deletions(-)
Deleted: 0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch
===================================================================
--- 0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch 2020-08-19 20:22:28 UTC (rev 685209)
+++ 0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch 2020-08-19 20:38:47 UTC (rev 685210)
@@ -1,112 +0,0 @@
-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: 0002-gdk-defines.patch
===================================================================
--- 0002-gdk-defines.patch 2020-08-19 20:22:28 UTC (rev 685209)
+++ 0002-gdk-defines.patch 2020-08-19 20:38:47 UTC (rev 685210)
@@ -1,21 +0,0 @@
-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
-+ */
-
-
- /*
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-19 20:22:28 UTC (rev 685209)
+++ PKGBUILD 2020-08-19 20:38:47 UTC (rev 685210)
@@ -3,7 +3,7 @@
pkgname=open-vm-tools
epoch=6
-pkgver=11.1.0
+pkgver=11.1.5
pkgrel=1
pkgdesc='The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools'
arch=('x86_64')
@@ -19,23 +19,12 @@
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-Make-peeking-back-into-the-stack-work-for-back-traces.patch'
- '0002-gdk-defines.patch'
'vmtoolsd.service'
'vmware-vmblock-fuse.service')
-sha256sums=('5930448c65cf298e3dded2a3670750f4affaf3a631500a1774eeb4cfe0a32b80'
- 'bd722d730dfc7b2f359046c9cbc928ef58add755d1d309ad40667839a9012857'
- '61a27f7e1aada615212ae12173aa3a12eb0238d3abe994168699e6dd9f0bb15d'
+sha256sums=('0bbc20d725cb2e15db5bd5e6a9cbab7fc98c2e3208f19a233a2308468cb2dc04'
'5a9403f78356873258521644068f2c9639b994d5954e5ad953934136822b2689'
'99e3cc1da20a751049144cc02dec77174a55109b5b5960e1facd78709da7724f')
-prepare() {
- cd "$srcdir/$pkgname-stable-${pkgver}/"
-
- patch -Np1 < ../0001-Make-peeking-back-into-the-stack-work-for-back-traces.patch
- patch -Np1 < ../0002-gdk-defines.patch
-}
-
build() {
cd "$srcdir/$pkgname-stable-${pkgver}/open-vm-tools/"
More information about the arch-commits
mailing list