diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk index de4feabe09..962c12b46c 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="open-vm-tools" -PKG_VERSION="11.1.0" -PKG_SHA256="5930448c65cf298e3dded2a3670750f4affaf3a631500a1774eeb4cfe0a32b80" +PKG_VERSION="11.2.0" +PKG_SHA256="280970a15dd8210b89e68df5fce64fa8bfb3ff7ca3737ce5ebf8634d8c1a2494" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/vmware/open-vm-tools" diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0001-fix-issue-429.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-0001-fix-issue-429.patch deleted file mode 100644 index 2f4e69e17a..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0001-fix-issue-429.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9cbdf3a6e2cb23a7673fe19b2a3f888714095019 Mon Sep 17 00:00:00 2001 -From: Oliver Kurth -Date: Wed, 1 Apr 2020 11:31:36 -0700 -Subject: [PATCH] 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. ---- - lib/user/utilBacktrace.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/user/utilBacktrace.c b/lib/user/utilBacktrace.c -index dca33d267..e1259606f 100644 ---- a/lib/user/utilBacktrace.c -+++ b/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 - } diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0002-fix-issue-429.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-0002-fix-issue-429.patch deleted file mode 100644 index def8c54cd4..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0002-fix-issue-429.patch +++ /dev/null @@ -1,23 +0,0 @@ -From bb11e038323893d2428eb2ce94f8742233b45546 Mon Sep 17 00:00:00 2001 -From: Oliver Kurth -Date: Wed, 10 Jun 2020 12:05:43 -0700 -Subject: [PATCH] Changes to common source file not applicable to - open-vm-tools. - ---- - lib/user/utilBacktrace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/user/utilBacktrace.c b/lib/user/utilBacktrace.c -index e1259606f..998713656 100644 ---- a/lib/user/utilBacktrace.c -+++ b/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 { diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0003-fix-issue-429.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-0003-fix-issue-429.patch deleted file mode 100644 index 96f48755fb..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0003-fix-issue-429.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0cfda58aaa8bc0fea56f1211897e7f2237f6070a Mon Sep 17 00:00:00 2001 -From: Oliver Kurth -Date: Wed, 10 Jun 2020 12:05:46 -0700 -Subject: [PATCH] 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 ---- - lib/user/utilBacktrace.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/lib/user/utilBacktrace.c b/lib/user/utilBacktrace.c -index 998713656..d26d21e7d 100644 ---- a/lib/user/utilBacktrace.c -+++ b/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 - } -+