gentoo resync : 14.07.2018

10 files changed, 229 insertions, 0 deletions

diff --git a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch b/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
new file mode 100644
index 000000000000..b79865e62db6
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
@@ -0,0 +1,24 @@
+From fdf599994d58ef47b73dc94d21d3556a2ec5d9da Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 26 Nov 2016 11:54:33 -0500
+Subject: [PATCH] build: drop -Werror
+
+---
+ open-vm-tools/configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+index 8d4604e8..4d925f22 100644
+--- a/open-vm-tools/configure.ac
++++ b/open-vm-tools/configure.ac
+@@ -1137,7 +1137,6 @@ AC_C_VOLATILE
+ 
+ ### General flags / actions
+ CFLAGS="$CFLAGS -Wall"
+-CFLAGS="$CFLAGS -Werror"
+ 
+ # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident'
+ # in Xlib.h on OpenSolaris.
+-- 
+2.11.0.rc2
+
diff --git a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch b/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch
new file mode 100644
index 000000000000..bff97811771b
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch
@@ -0,0 +1,33 @@
+From 1805ab024b10e8185175de7ce9c9b9db87fd0897 Mon Sep 17 00:00:00 2001
+From: Bernd Zeimetz <bernd@bzed.de>
+Date: Sun, 10 Jan 2016 22:18:04 +0100
+Subject: [PATCH] Fix mount.vmhgfs symlinks if DESTDIR is used
+
+Without this change symlinks in the form of
+sbin/mount.vmhgfs -> /build/open-vm-tools-10.0.5-3227872/debian/open-vm-tools/usr/sbin/mount.vmhgfs
+are being produced, if DESTDIR was uset while running make install.
+---
+ open-vm-tools/hgfsmounter/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am
+index e48417e..fe70892 100644
+--- a/open-vm-tools/hgfsmounter/Makefile.am
++++ b/open-vm-tools/hgfsmounter/Makefile.am
+@@ -33,14 +33,14 @@ install-exec-hook:
+ 	mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
+ 		$(DESTDIR)$(sbindir)/mount_vmhgfs
+ 	-$(MKDIR_P) $(DESTDIR)/sbin
+-	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
++	-$(LN_S) $(sbindir)/mount_vmhgfs \
+ 		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
+ else
+ install-exec-hook:
+ 	-$(MKDIR_P) $(DESTDIR)/sbin
+-	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
++	-$(LN_S) $(sbindir)/mount.vmhgfs \
+ 		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
+ uninstall-hook:
+ 	rm -f $(DESTDIR)/sbin/mount.vmhgfs
diff --git a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
new file mode 100644
index 000000000000..bc91b1b141ab
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
@@ -0,0 +1,25 @@
+From 488258effa60e293a70000338422c33ce5c73f9b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 25 Nov 2016 13:59:34 -0500
+Subject: [PATCH] build: Always link VGAuthService using CXX
+
+---
+ open-vm-tools/vgauth/service/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/open-vm-tools/vgauth/service/Makefile.am b/open-vm-tools/vgauth/service/Makefile.am
+index 8c51d9f2..8f99dad1 100644
+--- a/open-vm-tools/vgauth/service/Makefile.am
++++ b/open-vm-tools/vgauth/service/Makefile.am
+@@ -95,7 +95,7 @@ if HAVE_ICU
+                             $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+                             $(LDFLAGS) -o $@
+ else
+-   VGAuthService_LINK = $(LINK)
++   VGAuthService_LINK = $(CXXLINK)
+ endif
+ 
+ # Message catalogs.
+-- 
+2.11.0.rc2
+
diff --git a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
new file mode 100644
index 000000000000..a9dfb42b2fc4
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
@@ -0,0 +1,45 @@
+From 75505fed193fc3779560b57c1b0d6d4209b05bf9 Mon Sep 17 00:00:00 2001
+From: Xiami <i@f2light.com>
+Date: Thu, 14 Jun 2018 16:23:00 +0800
+Subject: [PATCH] lib/dynxdr: for libtirpc
+
+glibc-2.26 do not provide RPC support by default.
+This workaround only works for Gentoo as ebuild forces libtirpc.
+---
+ open-vm-tools/lib/dynxdr/dynxdr.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/open-vm-tools/lib/dynxdr/dynxdr.c b/open-vm-tools/lib/dynxdr/dynxdr.c
+index 95fdc7e2..d3182733 100644
+--- a/open-vm-tools/lib/dynxdr/dynxdr.c
++++ b/open-vm-tools/lib/dynxdr/dynxdr.c
+@@ -55,7 +55,7 @@ typedef struct DynXdrData {
+  * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
+  * "x_getpostn" function.
+  */
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(_TIRPC_XDR_H)
+ #  define DYNXDR_GETPOS_CONST
+ #else
+ #  define DYNXDR_GETPOS_CONST const
+@@ -172,7 +172,7 @@ DynXdrSetPos(XDR *xdrs, // IN
+ }
+ 
+ 
+-#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
++#if (defined(__GLIBC__) && !defined(_TIRPC_XDR_H)) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
+ /*
+  *-----------------------------------------------------------------------------
+  *
+@@ -322,7 +322,7 @@ DynXdr_Create(XDR *in)  // IN
+       DynXdrSetPos,     /* x_setpostn */
+       DynXdrInline,     /* x_inline */
+       NULL,             /* x_destroy */
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_TIRPC_XDR_H)
+       NULL,             /* x_getint32 */
+       DynXdrPutInt32,   /* x_putint32 */
+ #elif defined(__APPLE__)
+-- 
+2.16.4
+
diff --git a/app-emulation/open-vm-tools/files/mount.vmhgfs b/app-emulation/open-vm-tools/files/mount.vmhgfs
new file mode 100644
index 000000000000..d4b319c80cb2
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/mount.vmhgfs
@@ -0,0 +1,2 @@
+#!/bin/sh
+hgfsmounter "$@" >/dev/null 2>&1 || vmhgfs-fuse "$@"
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.confd b/app-emulation/open-vm-tools/files/open-vm-tools.confd
new file mode 100644
index 000000000000..4414fabdb46e
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools.confd
@@ -0,0 +1,2 @@
+# Set this to no to disable drag and drop (and vmblock) loading.
+VM_DRAG_AND_DROP="yes"
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.initd b/app-emulation/open-vm-tools/files/open-vm-tools.initd
new file mode 100644
index 000000000000..8b91e4fb4c0a
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools.initd
@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/vmtoolsd.pid"
+command="/usr/bin/vmtoolsd"
+command_args="-b ${pidfile}"
+
+vmblockmntpt="/proc/fs/vmblock/mountPoint"
+vmblockfusemntpt="/run/vmblock-fuse"
+
+depend() {
+	before checkfs fsck net X
+}
+
+start_vmblock() {
+	checkpath -d -m 1777 /tmp/VMwareDnD
+	if command -v vmware-vmblock-fuse > /dev/null; then
+		modprobe fuse > /dev/null 2>&1
+		checkpath -d "${vmblockfusemntpt}"
+		ebegin "Mounting vmblock-fuse"
+		vmware-vmblock-fuse \
+			-o subtype=vmware-vmblock,default_permissions,allow_other \
+			"${vmblockfusemntpt}"
+		eend $?
+	else
+		modprobe vmblock > /dev/null 2>&1
+		checkpath -d "${vmblockmntpt}"
+		ebegin "Mounting vmblock"
+		mount -t vmblock vmblock "${vmblockmntpt}"
+		eend $?
+	fi
+}
+
+stop_vmblock() {
+	if [ -d "${vmblockfusemntpt}" ]; then
+		ebegin "Unmounting vmblock-fuse"
+		umount "${vmblockfusemntpt}"
+		eend $?
+	else
+		ebegin "Unmounting vmblock"
+		umount "${vmblockmntpt}"
+		eend $?
+	fi
+}
+
+start_pre() {
+	if [ x"${VM_DRAG_AND_DROP}" = xyes ]; then
+		start_vmblock
+	fi
+	return 0
+}
+
+stop_post() {
+	if [ x"${VM_DRAG_AND_DROP}" = xyes ]; then
+		stop_vmblock
+	fi
+	return 0
+}
diff --git a/app-emulation/open-vm-tools/files/vgauthd.service b/app-emulation/open-vm-tools/files/vgauthd.service
new file mode 100644
index 000000000000..db27bd56ef51
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/vgauthd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=VGAuth Service for open-vm-tools
+Documentation=https://github.com/vmware/open-vm-tools
+ConditionVirtualization=vmware
+PartOf=vmtoolsd.service
+
+[Service]
+# For dev-libs/xerces-c[iconv,-icu]
+EnvironmentFile=-/etc/env.d/50xerces-c
+ExecStart=/usr/bin/VGAuthService -s
+TimeoutStopSec=5
+
+[Install]
+RequiredBy=vmtoolsd.service
diff --git a/app-emulation/open-vm-tools/files/vmtoolsd.service b/app-emulation/open-vm-tools/files/vmtoolsd.service
new file mode 100644
index 000000000000..1226291bc8da
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/vmtoolsd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Service for virtual machines hosted on VMware
+Documentation=https://github.com/vmware/open-vm-tools
+ConditionVirtualization=vmware
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+TimeoutStopSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-emulation/open-vm-tools/files/vmtoolsd.vgauth.service b/app-emulation/open-vm-tools/files/vmtoolsd.vgauth.service
new file mode 100644
index 000000000000..1cb6e00ecf51
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/vmtoolsd.vgauth.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Service for virtual machines hosted on VMware
+Documentation=https://github.com/vmware/open-vm-tools
+ConditionVirtualization=vmware
+Requires=vgauthd.service
+After=vgauthd.service
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+TimeoutStopSec=5
+
+[Install]
+WantedBy=multi-user.target
+Also=vgauthd.service