From 4a6e96b7b345090f5b701472dd5da54096c55a25 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 10 May 2017 22:29:02 +0100 Subject: [PATCH] open-vm-tools: update to 10.1.5, move to github url, patch for glibc-2.25 --- packages/sysutils/open-vm-tools/package.mk | 4 +- .../patches/open-vm-tools-01-glibc-2.25.patch | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create 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 a4d40c7ed8..1faa3ec3e7 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -18,10 +18,10 @@ ################################################################################ PKG_NAME="open-vm-tools" -PKG_VERSION="stable-10.1.0" +PKG_VERSION="stable-10.1.5" PKG_ARCH="x86_64" PKG_LICENSE="GPL" -PKG_SITE="http://open-vm-tools.sourceforge.net" +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_SECTION="virtualization" 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 new file mode 100644 index 0000000000..39a4e3829d --- /dev/null +++ b/packages/sysutils/open-vm-tools/patches/open-vm-tools-01-glibc-2.25.patch @@ -0,0 +1,44 @@ +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"