commit 624b79266f6321fbbc9b936b0ef5f7d5598a9c90 Author: Matt Housh <jaeger@crux.ninja> Date: Sat Aug 15 15:47:03 2020 -0500 open-vm-tools: added gcc 10 patch and rpcsvc-proto dependency diff --git a/open-vm-tools/.signature b/open-vm-tools/.signature index 78025f153..0f3d3f334 100644 --- a/open-vm-tools/.signature +++ b/open-vm-tools/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36iYhNEEJtaq6g3Q4d+kC5u1guSTn0bk0vMhDGCGy+yJjjvjeo8xjJInfwVFv5RAzur9Phqacaljeu+XP0Kmywk= -SHA256 (Pkgfile) = b0f703ac86dd2cded3d71ef41f7e211c6b43aeb1ddb1757f796bbc47cf2d0ed0 +RWSagIOpLGJF32KM15yLt93BEzvWt9c1C1yPMuFxlpmpcwqevQuuFC0q8MZXuNPEAybqwNGCQcrk6qbJLcH09sqaa9ZRomfe5gA= +SHA256 (Pkgfile) = e255110c5a0556f89d5654975fbeb774b25066d3c7e3ffedc60758044f4dc36c SHA256 (.footprint) = 4e6c79446d268221a06bc18de6c7f765ccc8eee15ddff1d5f8dee29f680cbb1d SHA256 (open-vm-tools-11.1.0-16036546.tar.gz) = cb029af04357f19a899995f9e1ecfe55222b76158ab6d64fe8b56df0ccf87308 SHA256 (vmtoolsd) = a443b32dd7b0505db463ed20ff10c0ea3aefc41f003feb704921afa4c72325d8 +SHA256 (gcc10-warning.patch) = 34f519c0d1ca578c508c0351c8e9dc856a043b3bd1f767ed3ed2d1a0d26dd1e2 diff --git a/open-vm-tools/Pkgfile b/open-vm-tools/Pkgfile index da83393f7..3cbcf139f 100644 --- a/open-vm-tools/Pkgfile +++ b/open-vm-tools/Pkgfile @@ -1,16 +1,17 @@ # Description: A set of services and modules that enable several features in VMware products for better management of, and seamless user interactions with, guests # URL: https://github.com/vmware/open-vm-tools # Maintainer: Matt Housh, jaeger at crux dot ninja -# Depends on: libmspack libdnet glib +# Depends on: libmspack libdnet glib rpcsvc-proto name=open-vm-tools version=11.1.0-16036546 release=2 source=(https://github.com/vmware/$name/releases/download/stable-${version%-*}/$name-$version.tar.gz \ - vmtoolsd) + vmtoolsd gcc10-warning.patch) 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 new file mode 100644 index 000000000..3207ec96f --- /dev/null +++ b/open-vm-tools/gcc10-warning.patch @@ -0,0 +1,37 @@ +--- 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 + + /*