commit d1effd0b94348509fede0e995a34432bb6a50e5d Author: Matt Housh <jaeger@crux.ninja> Date: Wed Aug 19 19:55:42 2020 -0500 open-vm-tools: updated to version 11.1.5-16724464 diff --git a/open-vm-tools/.signature b/open-vm-tools/.signature index 0f3d3f334..34bcf859b 100644 --- a/open-vm-tools/.signature +++ b/open-vm-tools/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32KM15yLt93BEzvWt9c1C1yPMuFxlpmpcwqevQuuFC0q8MZXuNPEAybqwNGCQcrk6qbJLcH09sqaa9ZRomfe5gA= -SHA256 (Pkgfile) = e255110c5a0556f89d5654975fbeb774b25066d3c7e3ffedc60758044f4dc36c +RWSagIOpLGJF30uYNnNA8kbLKejc1BrnnUjI/frboEI/JFrv5tqDhYLr7ZWPPSlkuTyKlLM9S/CDSPUCuxkHaM8DrG8ltWTRHAQ= +SHA256 (Pkgfile) = e30a66c094c33fe1adc9e67e273dc59fca857065ccffd7ae9c349234bb37f8a1 SHA256 (.footprint) = 4e6c79446d268221a06bc18de6c7f765ccc8eee15ddff1d5f8dee29f680cbb1d -SHA256 (open-vm-tools-11.1.0-16036546.tar.gz) = cb029af04357f19a899995f9e1ecfe55222b76158ab6d64fe8b56df0ccf87308 +SHA256 (open-vm-tools-11.1.5-16724464.tar.gz) = cb33171b22872d66632b4151feafd4da480aee0c6bd5dcc188651984c1e9c511 SHA256 (vmtoolsd) = a443b32dd7b0505db463ed20ff10c0ea3aefc41f003feb704921afa4c72325d8 -SHA256 (gcc10-warning.patch) = 34f519c0d1ca578c508c0351c8e9dc856a043b3bd1f767ed3ed2d1a0d26dd1e2 diff --git a/open-vm-tools/Pkgfile b/open-vm-tools/Pkgfile index 3cbcf139f..4be9748d7 100644 --- a/open-vm-tools/Pkgfile +++ b/open-vm-tools/Pkgfile @@ -4,14 +4,13 @@ # Depends on: libmspack libdnet glib rpcsvc-proto name=open-vm-tools -version=11.1.0-16036546 -release=2 +version=11.1.5-16724464 +release=1 source=(https://github.com/vmware/$name/releases/download/stable-${version%-*}/$name-$version.tar.gz \ - vmtoolsd gcc10-warning.patch) + vmtoolsd) build() { cd $name-$version - patch -p2 -i $SRC/gcc10-warning.patch ./configure --prefix=/usr \ --without-icu \ --without-x \ diff --git a/open-vm-tools/gcc10-warning.patch b/open-vm-tools/gcc10-warning.patch deleted file mode 100644 index 3207ec96f..000000000 --- a/open-vm-tools/gcc10-warning.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/open-vm-tools/lib/user/utilBacktrace.c 2020-05-18 15:17:38.566170714 -0700 -+++ b/open-vm-tools/lib/user/utilBacktrace.c 2020-05-18 15:19:32.678018476 -0700 -@@ -431,13 +431,16 @@ - } - } - #else -- uintptr_t *x = (uintptr_t *) &bugNr; -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Warray-bounds" -+ uintptr_t *x = ((uintptr_t *) &bugNr) - 2; -+#pragma GCC diagnostic pop - - if (bugNr == 0) { - outFunc(outFuncData, "Backtrace:\n"); - } else { - outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr); - } -- UtilBacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData); -+ UtilBacktraceFromPointerWithFunc(x, outFunc, outFuncData); - #endif - } ---- a/open-vm-tools/services/plugins/dndcp/copyPasteCompatX11.c 2020-05-18 16:42:56.135715690 -0700 -+++ b/open-vm-tools/services/plugins/dndcp/copyPasteCompatX11.c 2020-05-18 16:44:25.952405005 -0700 -@@ -73,11 +73,11 @@ - #endif - - #ifndef GDK_SELECTION_TYPE_TIMESTAMP --GdkAtom GDK_SELECTION_TYPE_TIMESTAMP; -+extern GdkAtom GDK_SELECTION_TYPE_TIMESTAMP; - #endif - - #ifndef GDK_SELECTION_TYPE_UTF8_STRING --GdkAtom GDK_SELECTION_TYPE_UTF8_STRING; -+extern GdkAtom GDK_SELECTION_TYPE_UTF8_STRING; - #endif - - /*