From 10f38ab9c13cf0a1f3441c3d4f2e10ce41063edb Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 1 Oct 2019 23:59:03 +0200 Subject: [PATCH] open-vm-tools: update to 11.0.0. adopt package --- srcpkgs/open-vm-tools/patches/gcc9.patch | 103 ----------------------- srcpkgs/open-vm-tools/template | 17 ++-- 2 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 srcpkgs/open-vm-tools/patches/gcc9.patch diff --git a/srcpkgs/open-vm-tools/patches/gcc9.patch b/srcpkgs/open-vm-tools/patches/gcc9.patch deleted file mode 100644 index 346c8187d61..00000000000 --- a/srcpkgs/open-vm-tools/patches/gcc9.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- hgfsmounter/hgfsmounter.c -+++ hgfsmounter/hgfsmounter.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2006-2019 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 -@@ -514,11 +514,13 @@ ParseFmask(const char *option, // IN: -option string along with value - HgfsMountInfo *mountInfo, // OUT: mount data - int *flags) // OUT: mount flags - { -+ unsigned short fmask = 0; - ASSERT(option); - ASSERT(mountInfo); - -- if (ParseMask(option, &mountInfo->fmask)) { -- LOG("Setting mount fmask to %o\n", mountInfo->fmask); -+ if (ParseMask(option, &fmask)) { -+ LOG("Setting mount fmask to %o\n", fmask); -+ mountInfo->fmask = fmask; - return TRUE; - } - -@@ -548,11 +550,13 @@ ParseDmask(const char *option, // IN: -option string along with value - HgfsMountInfo *mountInfo, // OUT: mount data - int *flags) // OUT: mount flags - { -+ unsigned short dmask = 0; - ASSERT(option); - ASSERT(mountInfo); - -- if (ParseMask(option, &mountInfo->dmask)) { -- LOG("Setting mount dmask to %o\n", mountInfo->dmask); -+ if (ParseMask(option, &dmask)) { -+ LOG("Setting mount dmask to %o\n", dmask); -+ mountInfo->dmask = dmask; - return TRUE; - } ---- lib/hgfsServer/hgfsServer.c -+++ lib/hgfsServer/hgfsServer.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -+ * Copyright (C) 1998-2019 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 -@@ -6536,11 +6536,13 @@ HgfsServerRead(HgfsInputParam *input) // IN: Input params - payload = &reply->payload[0]; - } - if (payload) { -+ uint32 actualSize = 0; - status = HgfsPlatformReadFile(readFd, input->session, offset, - requiredSize, payload, -- &reply->actualSize); -+ &actualSize); - if (HGFS_ERROR_SUCCESS == status) { - reply->reserved = 0; -+ reply->actualSize = actualSize; - replyPayloadSize = sizeof *reply; - - if (readUseDataBuffer) { -@@ -6556,11 +6558,13 @@ HgfsServerRead(HgfsInputParam *input) // IN: Input params - break; - } - case HGFS_OP_READ: { -+ uint32 actualSize = 0; - HgfsReplyRead *reply = replyRead; - - status = HgfsPlatformReadFile(readFd, input->session, offset, requiredSize, -- reply->payload, &reply->actualSize); -+ reply->payload, &actualSize); - if (HGFS_ERROR_SUCCESS == status) { -+ reply->actualSize = actualSize; - replyPayloadSize = sizeof *reply + reply->actualSize; - } else { - LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status)); ---- lib/misc/util_misc.c -+++ lib/misc/util_misc.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -+ * Copyright (C) 1998-2019 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 -@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN file path to expand - ASSERT(!freeChunk[i]); - chunks[i] = expand; - if (chunks[i] == NULL) { -- Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n", -- __FUNCTION__, expand, fileName); -+ Log("%s: Cannot allocate memory to expand $ in \"%s\".\n", -+ __FUNCTION__, fileName); - goto out; - } - chunkSize[i] = strlen(expand); diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template index 7d471b68a32..6a14f22573e 100644 --- a/srcpkgs/open-vm-tools/template +++ b/srcpkgs/open-vm-tools/template @@ -1,8 +1,9 @@ # Template file for 'open-vm-tools' pkgname=open-vm-tools -version=10.3.10 -revision=3 -_build=12406962 +version=11.0.0 +revision=1 +_build=14549434 +archs="x86_64 i686" wrksrc="open-vm-tools-${version}-${_build}" build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d @@ -13,20 +14,16 @@ makedepends="fuse-devel glib-devel icu-devel libdnet-devel libmspack-devel libressl-devel libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel') $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')" short_desc="Open source implementation of VMware Tools" -maintainer="Carson Page " +maintainer="Piraty " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://github.com/vmware/open-vm-tools" +changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog" distfiles="https://github.com/vmware/open-vm-tools/releases/download/stable-${version}/open-vm-tools-${version}-${_build}.tar.gz" -checksum=a3c02595c802680be258d6249513c76502d383a59597079b10984bb9136dbef5 +checksum=b95141b0eb8a46094f905c29b969ad7ee63997194df168c82e35389bb1cebc7b build_options="pam x11" build_options_default="pam x11" -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="Musl requires addl. patches";; - "arm"*|"aarch"*) broken=yes;; -esac - pre_configure() { autoreconf -vfi }