From 35ed5b83bddd01ec34a5e1c79dd965c0dfc37fd1 Mon Sep 17 00:00:00 2001 From: CvH Date: Mon, 4 Jun 2018 14:10:56 +0200 Subject: [PATCH] open-vm-tools: update to 10.2.5 --- packages/sysutils/open-vm-tools/package.mk | 16 +++---- .../patches/open-vm-tools-01-glibc-2.25.patch | 44 ------------------- 2 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 packages/sysutils/open-vm-tools/patches/open-vm-tools-01-glibc-2.25.patch diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk index 55384bdd15..90bddd9add 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -1,32 +1,32 @@ ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016-present Team LibreELEC # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) # -# OpenELEC is free software: you can redistribute it and/or modify +# LibreELEC is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# OpenELEC is distributed in the hope that it will be useful, +# LibreELEC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . +# along with LibreELEC. If not, see . ################################################################################ PKG_NAME="open-vm-tools" -PKG_VERSION="stable-10.1.5" -PKG_SHA256="53c281119a6ef43022853f858f91aa6985baed2e668c85fdfa0eb39c9c2c24a9" +PKG_VERSION="stable-10.2.5" +PKG_SHA256="c0f182c0c422fca8f8b3e5c21802f724256dfe5907383db28ec7e4d5b6d52b0f" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/vmware/open-vm-tools" PKG_URL="https://github.com/vmware/open-vm-tools/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain glib:host glib libdnet fuse" +PKG_DEPENDS_TARGET="toolchain fuse glib:host glib libdnet" PKG_SECTION="virtualization" -PKG_SHORTDESC="open-vm-tools: open source implementation of VMware Tools" PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools" PKG_TOOLCHAIN="autotools" diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-01-glibc-2.25.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-01-glibc-2.25.patch deleted file mode 100644 index 39a4e3829d..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-01-glibc-2.25.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4c20c27ee1b3d0c88ee5d6e41b88a5c94432dbcc Mon Sep 17 00:00:00 2001 -From: Oliver Kurth -Date: Thu, 20 Apr 2017 18:04:18 -0700 -Subject: [PATCH] Include sysmacros.h directly as mandated by glibc-2.25. - -glibc-2.25 generates a deprecation warning for using the 'major' -macro without including sysmacros.h. -https://sourceware.org/glibc/wiki/Release/2.25 - -This breaks Fedora builds of open-vm-tools because Fedora 26 is -switching to glibc-2.25. ---- - lib/wiper/wiperPosix.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/wiper/wiperPosix.c b/lib/wiper/wiperPosix.c -index d389eee..b41bd72 100644 ---- a/lib/wiper/wiperPosix.c -+++ b/lib/wiper/wiperPosix.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2004-2016 VMware, Inc. All rights reserved. -+ * Copyright (C) 2004-2017 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 -@@ -30,6 +30,9 @@ - #include - #include - #if defined(__linux__) || defined(sun) -+# if defined(__linux__) -+# include -+# endif - # include - #elif defined(__FreeBSD__) || defined(__APPLE__) - # include -@@ -44,7 +47,6 @@ - - #include "vmware.h" - #include "wiper.h" --#include "util.h" - #include "str.h" - #include "strutil.h" - #include "fileIO.h"