commit: ee77b844ba07b95724a5bf28a6d2b96659829fa0 Author: Evan Teran <evan.teran <AT> gmail <DOT> com> AuthorDate: Sun Jul 19 01:54:50 2015 +0000 Commit: Evan Teran <evan.teran <AT> gmail <DOT> com> CommitDate: Sun Jul 19 01:54:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=ee77b844
addressing concerns from bug 531682. Hopefully this resolves them Package-Manager: portage-2.2.20 .../vmware-workstation/files/configure-hostd.sh | 20 ++++++++ .../files/list-bundle-components.xsl | 17 +++++++ .../files/list-component-files.xsl | 19 ++++++++ .../vmware-workstation/files/vmware-11.0.rc | 44 +++++++++++++++++ .../vmware-workstation/files/vmware-9.0.rc | 37 +++++++++++++++ .../vmware-workstation/files/vmware-server-10.0.rc | 55 ++++++++++++++++++++++ .../vmware-workstation/files/vmware-server-11.0.rc | 55 ++++++++++++++++++++++ .../vmware-workstation/files/vmware-server-11.1.rc | 55 ++++++++++++++++++++++ .../vmware-workstation/files/vmware-server-11.2.rc | 55 ++++++++++++++++++++++ .../vmware-workstation-11.1.0.2496824.ebuild | 2 +- .../vmware-workstation-11.1.2.2780323.ebuild | 2 +- 11 files changed, 359 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-workstation/files/configure-hostd.sh b/app-emulation/vmware-workstation/files/configure-hostd.sh new file mode 100644 index 0000000..480e903 --- /dev/null +++ b/app-emulation/vmware-workstation/files/configure-hostd.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +action="$1" + +case $action in + add) + rc-update -q add vmware-workstation-server default + rc-service vmware-workstation-server start + ;; + remove) + rc-update -q del vmware-workstation-server default + rc-service vmware-workstation-server stop + ;; + status) + rc-service -q vmware-workstation-server status + ;; + *) + exit 1 + ;; +esac diff --git a/app-emulation/vmware-workstation/files/list-bundle-components.xsl b/app-emulation/vmware-workstation/files/list-bundle-components.xsl new file mode 100644 index 0000000..db1a4e4 --- /dev/null +++ b/app-emulation/vmware-workstation/files/list-bundle-components.xsl @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + + <xsl:output omit-xml-declaration="yes"/> + + <xsl:template match="text()"/> + + <xsl:template match="/bundle/components/component"> + <xsl:value-of select="@offset"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@size"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@name"/> + <xsl:text> </xsl:text> + </xsl:template> + +</xsl:stylesheet> diff --git a/app-emulation/vmware-workstation/files/list-component-files.xsl b/app-emulation/vmware-workstation/files/list-component-files.xsl new file mode 100644 index 0000000..91c6152 --- /dev/null +++ b/app-emulation/vmware-workstation/files/list-component-files.xsl @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + + <xsl:output omit-xml-declaration="yes"/> + + <xsl:template match="text()"/> + + <xsl:template match="/component/fileset/file"> + <xsl:value-of select="@offset"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@compressedSize"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@uncompressedSize"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@path"/> + <xsl:text> </xsl:text> + </xsl:template> + +</xsl:stylesheet> diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.0.rc new file mode 100644 index 0000000..2a827bc --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + + # quiet for vmci because it may not be there + modprobe -vq vmci || modprobe -v vmw_vmci + eend $? + + # vmci or vmw_vmci was loaded by the previous modprobe + # no need to do it here + modprobe -av vmmon vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin Stopping VMware services + modprobe -rv vsock vmmon vmblock vmnet + eend $? + + # quiet for vmci because it may not be there + modprobe -rvq vmci || modprobe -rv vmw_vmci + eend $? +} diff --git a/app-emulation/vmware-workstation/files/vmware-9.0.rc b/app-emulation/vmware-workstation/files/vmware-9.0.rc new file mode 100644 index 0000000..02a82b3 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-9.0.rc @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + modprobe -v vmci || modprobe -v vmw_vmci + eend $? + modprobe -av vmmon vmci vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin Stopping VMware services + modprobe -rv vsock vmmon vmblock vmnet + eend $? + modprobe -rv vmci || modprobe -rv vmw_vmci + eend $? +} diff --git a/app-emulation/vmware-workstation/files/vmware-server-10.0.rc b/app-emulation/vmware-workstation/files/vmware-server-10.0.rc new file mode 100644 index 0000000..353f369 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-server-10.0.rc @@ -0,0 +1,55 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $ + +depend() { + need localmount vmware + use net +} + +checkconfig() { + # Check if certificates exist. If not, we need to generate them, ala sshd. + if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then + mkdir -p @@ETCDIR@@/ssl + openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config + chmod -R 600 @@ETCDIR@@/ssl + fi +} + +start() { + checkconfig + + ebegin Starting VMware Authentication Daemon + start-stop-daemon --start \ + --exec @@PREFIX@@/sbin/vmware-authdlauncher + eend $? + ebegin Starting VMware Workstation Server + start-stop-daemon --start \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd \ + -- -a -d @@ETCDIR@@/hostd/config.xml + + eend $? +} + +stop() { + ebegin "Shutdown VMs in the AutoStart Sequence" + local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" + + if [ "x" != "x${HOHO_ADMIN}" ]; then + @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop + fi + eend $? + + ebegin Stopping VMware Workstation Server + start-stop-daemon --stop \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd + eend $? + ebegin Stopping VMware Authentication Daemon + #start-stop-daemon --stop \ + # --exec @@PREFIX@@/sbin/vmware-authdlauncher + killall @@PREFIX@@/sbin/vmware-authdlauncher + eend $? +} diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc new file mode 100644 index 0000000..353f369 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc @@ -0,0 +1,55 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $ + +depend() { + need localmount vmware + use net +} + +checkconfig() { + # Check if certificates exist. If not, we need to generate them, ala sshd. + if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then + mkdir -p @@ETCDIR@@/ssl + openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config + chmod -R 600 @@ETCDIR@@/ssl + fi +} + +start() { + checkconfig + + ebegin Starting VMware Authentication Daemon + start-stop-daemon --start \ + --exec @@PREFIX@@/sbin/vmware-authdlauncher + eend $? + ebegin Starting VMware Workstation Server + start-stop-daemon --start \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd \ + -- -a -d @@ETCDIR@@/hostd/config.xml + + eend $? +} + +stop() { + ebegin "Shutdown VMs in the AutoStart Sequence" + local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" + + if [ "x" != "x${HOHO_ADMIN}" ]; then + @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop + fi + eend $? + + ebegin Stopping VMware Workstation Server + start-stop-daemon --stop \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd + eend $? + ebegin Stopping VMware Authentication Daemon + #start-stop-daemon --stop \ + # --exec @@PREFIX@@/sbin/vmware-authdlauncher + killall @@PREFIX@@/sbin/vmware-authdlauncher + eend $? +} diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.1.rc b/app-emulation/vmware-workstation/files/vmware-server-11.1.rc new file mode 100644 index 0000000..353f369 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-server-11.1.rc @@ -0,0 +1,55 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $ + +depend() { + need localmount vmware + use net +} + +checkconfig() { + # Check if certificates exist. If not, we need to generate them, ala sshd. + if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then + mkdir -p @@ETCDIR@@/ssl + openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config + chmod -R 600 @@ETCDIR@@/ssl + fi +} + +start() { + checkconfig + + ebegin Starting VMware Authentication Daemon + start-stop-daemon --start \ + --exec @@PREFIX@@/sbin/vmware-authdlauncher + eend $? + ebegin Starting VMware Workstation Server + start-stop-daemon --start \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd \ + -- -a -d @@ETCDIR@@/hostd/config.xml + + eend $? +} + +stop() { + ebegin "Shutdown VMs in the AutoStart Sequence" + local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" + + if [ "x" != "x${HOHO_ADMIN}" ]; then + @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop + fi + eend $? + + ebegin Stopping VMware Workstation Server + start-stop-daemon --stop \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd + eend $? + ebegin Stopping VMware Authentication Daemon + #start-stop-daemon --stop \ + # --exec @@PREFIX@@/sbin/vmware-authdlauncher + killall @@PREFIX@@/sbin/vmware-authdlauncher + eend $? +} diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.2.rc b/app-emulation/vmware-workstation/files/vmware-server-11.2.rc new file mode 100644 index 0000000..353f369 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-server-11.2.rc @@ -0,0 +1,55 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $ + +depend() { + need localmount vmware + use net +} + +checkconfig() { + # Check if certificates exist. If not, we need to generate them, ala sshd. + if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then + mkdir -p @@ETCDIR@@/ssl + openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config + chmod -R 600 @@ETCDIR@@/ssl + fi +} + +start() { + checkconfig + + ebegin Starting VMware Authentication Daemon + start-stop-daemon --start \ + --exec @@PREFIX@@/sbin/vmware-authdlauncher + eend $? + ebegin Starting VMware Workstation Server + start-stop-daemon --start \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd \ + -- -a -d @@ETCDIR@@/hostd/config.xml + + eend $? +} + +stop() { + ebegin "Shutdown VMs in the AutoStart Sequence" + local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" + + if [ "x" != "x${HOHO_ADMIN}" ]; then + @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop + fi + eend $? + + ebegin Stopping VMware Workstation Server + start-stop-daemon --stop \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd + eend $? + ebegin Stopping VMware Authentication Daemon + #start-stop-daemon --stop \ + # --exec @@PREFIX@@/sbin/vmware-authdlauncher + killall @@PREFIX@@/sbin/vmware-authdlauncher + eend $? +} diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild index c54501b..4486922 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild @@ -116,7 +116,7 @@ src_unpack() { if use vix; then vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix + vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix fi if use ovftool; then vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild index c54501b..4486922 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild @@ -116,7 +116,7 @@ src_unpack() { if use vix; then vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix + vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix fi if use ovftool; then vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
