From a9456df70493378406df60d864e60dd206456bdf Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Wed, 4 Mar 2009 17:55:32 +0000 Subject: Add in vmware-converter masked (both package and keyword). svn path=/trunk/; revision=359 --- app-emulation/vmware-converter/Manifest | 9 ++ .../4.0.0.146302.off/000_all_initd-location.patch | 31 +++++++ .../4.0.0.146302.off/001_all_fix-permissions.patch | 15 ++++ .../002_all_pagebreak-detection-fix.patch | 15 ++++ .../004_all_do-not-build-modules.patch | 17 ++++ .../007_all_use-modprobe-over-insmod.patch | 12 +++ .../009_all_init.d-modules-warning.patch | 19 +++++ .../vmware-converter/files/vmware-converter.rc | 74 +++++++++++++++++ .../vmware-converter-4.0.0.146302.ebuild | 96 ++++++++++++++++++++++ 9 files changed, 288 insertions(+) create mode 100644 app-emulation/vmware-converter/Manifest create mode 100644 app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch create mode 100644 app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch create mode 100644 app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch create mode 100644 app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch create mode 100644 app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch create mode 100644 app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch create mode 100644 app-emulation/vmware-converter/files/vmware-converter.rc create mode 100644 app-emulation/vmware-converter/vmware-converter-4.0.0.146302.ebuild (limited to 'app-emulation/vmware-converter') diff --git a/app-emulation/vmware-converter/Manifest b/app-emulation/vmware-converter/Manifest new file mode 100644 index 0000000..518e017 --- /dev/null +++ b/app-emulation/vmware-converter/Manifest @@ -0,0 +1,9 @@ +AUX 4.0.0.146302.off/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62 +AUX 4.0.0.146302.off/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 +AUX 4.0.0.146302.off/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d +AUX 4.0.0.146302.off/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e +AUX 4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630 +AUX 4.0.0.146302.off/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498 +AUX vmware-converter.rc 1500 RMD160 f5bc22dbee280583ebca78836f38d82a4e164409 SHA1 0326487bea4369c8ac2ee1796f472e5e0f0bd858 SHA256 348a516325be26f64b6bbded7fde25f392478a8511330200e6cd58d6977d6067 +DIST VMware-converter-4.0.0-146302.tar.gz 122325894 RMD160 8919371ded3a6756e6d175515bd273a4bf06bd93 SHA1 b736e69a65b96406d3407032fd18f84e403c72f1 SHA256 7a34ba719630979fc1fe0b210e13f2c8ddc414a8baf63400a1f586adffc6f0f0 +EBUILD vmware-converter-4.0.0.146302.ebuild 3108 RMD160 4adbc978c14533a577afd27cff093e02de30237d SHA1 e32436bef467d13e9f86e24ac32995f6f4821c18 SHA256 919e9a52cfa3096fed0d4b1d5ed036660fc78c0c327be473eb195ec52da94038 diff --git a/app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch b/app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch new file mode 100644 index 0000000..1d864f7 --- /dev/null +++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch @@ -0,0 +1,31 @@ +--- vmware-distrib/bin/vmware-config.pl.ori 2005-11-09 01:45:08.000000000 +0000 ++++ vmware-distrib/bin/vmware-config.pl 2005-11-09 01:48:21.000000000 +0000 +@@ -8433,7 +8433,7 @@ + error('Please shut down any running VMs and run this script again.' . + "\n\n"); + } else { +- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') ++ if (system(shell_string('/etc/init.d' . '/vmware') + . ' stop')) { + error('Unable to stop services for ' . vmware_product_name() . + "\n\n"); +@@ -8463,8 +8463,8 @@ + } + if (vmware_product() ne 'server') { + configure_gtk2(); +- createMimePackageFile(); +- configureDesktopFiles(); ++# createMimePackageFile(); ++# configureDesktopFiles(); + configure_mon(); + configure_pp(); + configure_net(); +@@ -8532,7 +8532,7 @@ + db_save(); + # Then start VMware's services + if (!$gOption{'skipstopstart'}) { +- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start'); ++ system(shell_string('/etc/init.d' . '/vmware') . ' start'); + print "\n"; + } + diff --git a/app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch b/app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch new file mode 100644 index 0000000..e646b7b --- /dev/null +++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch @@ -0,0 +1,15 @@ +diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl +--- vmware-distrib.orig/bin/vmware-config.pl 2005-12-16 00:51:03.000000000 -0500 ++++ vmware-distrib/bin/vmware-config.pl 2005-12-21 14:34:03.000000000 -0500 +@@ -7327,7 +7327,10 @@ + error('Unable to write configuration file "' . $name . '".' . "\n\n"); + } + db_add_file($name, 0x1); +- safe_chmod(0644, $name); ++ safe_chmod(0664, $name); ++ my $gid = (getgrnam('vmware'))[2]; ++ my $uid = (stat($name))[4]; ++ safe_chown($uid,$gid,$name); + + # Append the promotional configuration if it exists + $promoconfig = $libdir . '/configurator/PROMOCONFIG'; diff --git a/app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch new file mode 100644 index 0000000..fd3fc76 --- /dev/null +++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch @@ -0,0 +1,15 @@ +diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl +--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100 ++++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100 +@@ -2015,9 +2015,9 @@ + . shell_string($pattern)); + chomp($header_page_offset); + # Ignore PAGE_OFFSET if we cannot parse it. +- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) { ++ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) { + # We found a valid page offset +- $header_page_offset = $1; ++ $header_page_offset = $2; + if (defined($gSystem{'page_offset'}) and + not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) { + if ($source eq 'user') { diff --git a/app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch b/app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch new file mode 100644 index 0000000..cec3b3e --- /dev/null +++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch @@ -0,0 +1,17 @@ +diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl +--- vmware-server-distrib.orig/bin/vmware-config.pl 2006-02-18 18:12:26.000000000 +0000 ++++ vmware-server-distrib/bin/vmware-config.pl 2006-02-18 18:14:17.000000000 +0000 +@@ -8571,10 +8571,10 @@ + configure_gtk2(); + # createMimePackageFile(); + # configureDesktopFiles(); +- configure_mon(); +- configure_pp(); ++# configure_mon(); ++# configure_pp(); + configure_net(); +- build_vmnet(); ++# build_vmnet(); + } + + # Create the directory for the UNIX domain sockets diff --git a/app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch new file mode 100644 index 0000000..5509d24 --- /dev/null +++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch @@ -0,0 +1,12 @@ +diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh +--- vmware-server-distrib/installer/services.sh 2006-02-05 00:21:25.000000000 +0000 ++++ vmware-server-distrib.new/installer/services.sh 2006-02-20 23:48:07.000000000 +0000 +@@ -538,7 +538,7 @@ + } + + vmware_load_module() { +- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1 ++ /sbin/modprobe -s "$1" || exit 1 + exit 0 + } + diff --git a/app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch b/app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch new file mode 100644 index 0000000..4eab043 --- /dev/null +++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch @@ -0,0 +1,19 @@ +diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh +--- vmware-server-distrib.orig/installer/services.sh 2006-07-01 03:14:16.000000000 +0000 ++++ vmware-server-distrib/installer/services.sh 2006-07-14 11:59:28.000000000 +0000 +@@ -606,8 +606,13 @@ + start) + if [ -e "$vmware_etc_dir"/not_configured ]; then + echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured' +- echo 'for the running kernel. To (re-)configure it, invoke the' +- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.' ++ echo 'for the running kernel.' ++ echo ++ echo 'Please ensure that the modules have been compiled for this kernel:' ++ echo ' emerge --oneshot vmware-modules' ++ echo ++ echo 'Also ensure '"`vmware_product_name`"' has been configured:' ++ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl' + echo + + exit 1 diff --git a/app-emulation/vmware-converter/files/vmware-converter.rc b/app-emulation/vmware-converter/files/vmware-converter.rc new file mode 100644 index 0000000..1bb31c4 --- /dev/null +++ b/app-emulation/vmware-converter/files/vmware-converter.rc @@ -0,0 +1,74 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation.rc,v 1.6 2007/11/25 12:50:32 ikelos Exp $ + +depend() { + need localmount + use logger net hald + after samba +} + +vmware_prettify() { + # Yea, the code is ugly but the output is pretty + state=$1 + waserror=0 + msgtype=0 + while read line + do + [ "${line}" = "" ] && continue + if [ ${msgtype} -le 0 ] + then + if [ ${msgtype} -eq -1 ] + then + ewarn ${line} + continue + fi + case ${line} in + *:*) + einfon ${line} + echo + eend 0 + msgtype=1;; + *) + ewarn ${line} + msgtype=-1 + waserror=1;; + esac + continue + fi + + # Strip out anything after the code + message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"` + einfon " ${message}" + echo + + echo ${line} | grep -q done + status=$? + eend ${status} + + if [ ${status} -eq 0 ] + then + logger -p local0.err -t vmware-${state} "${line}" + waserror=${status} + fi + done + if [ "${msgtype}" = "-1" ] + then + eend 1 "VMware is not properly configured! See above." + fi + return ${waserror} +} + +start() { + test -x /etc/vmware-converter/init.d/vmware-converter || \ + eend 1 "vmware init script not found. Aborting" || return 1 + + /etc/vmware-converter/init.d/vmware-converter start | vmware_prettify start + return $? +} + +stop() { + /etc/vmware-converter/init.d/vmware-converter stop | vmware_prettify stop + return $? +} diff --git a/app-emulation/vmware-converter/vmware-converter-4.0.0.146302.ebuild b/app-emulation/vmware-converter/vmware-converter-4.0.0.146302.ebuild new file mode 100644 index 0000000..2143523 --- /dev/null +++ b/app-emulation/vmware-converter/vmware-converter-4.0.0.146302.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $ + +inherit vmware eutils versionator + +MY_P="VMware-converter-$(replace_version_separator 3 - $PV)" + +DESCRIPTION="Converts a complete PC on your PC without the usual performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/download/ws/ws5.html" +SRC_URI="${MY_P}.tar.gz" + +LICENSE="vmware" +SLOT="0" +KEYWORDS="-*" +IUSE="server client" +RESTRICT="fetch strip" + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND="sys-libs/glibc + amd64? ( + app-emulation/emul-linux-x86-gtklibs ) + x86? ( + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXinerama + x11-libs/libXi + x11-libs/libXft ) + >=dev-lang/perl-5 + sys-apps/pciutils" + +S=${WORKDIR}/vmware-converter-distrib + +RUN_UPDATE="no" +ANY_ANY="" + +dir=/opt/vmware/converter +Ddir=${D}/${dir} + +src_unpack() { + vmware_src_unpack + cd ${S} + rmdir sbin + + sed -i -e "s|##{CONFDIR}##|/etc/vmware-converter|" ${S}/conf/converter-*.xml + sed -i -e "s|##{LIBDIR}##|${VMWARE_INSTALL_DIR}/lib|" ${S}/conf/converter-*.xml + sed -i -e "s|##{DATADIR}##|/var/lib/vmware-vcenter-converter-standalone|" ${S}/conf/converter-*.xml + sed -i -e "s|##{LOGDIR}##|/var/log/vmware-vcenter-converter-standalone|" ${S}/conf/converter-*.xml + sed -i -e "s|##{FORCELOCAL}##|false|" ${S}/conf/converter-*.xml + sed -i -e "s|##{STANDALONE}##|true|" ${S}/conf/converter-*.xml + sed -i -e "s|##{LOGINBOX}##|true|" ${S}/conf/converter-*.xml + sed -i -e "s|##{ENABLE_REMOTE_ACCESS}##|true|" ${S}/conf/converter-*.xml + sed -i -e "s|##{PROXY_HTTP_PORT}##|80|" ${S}/conf/converter-*.xml + sed -i -e "s|##{PROXY_HTTPS_PORT}##|443|" ${S}/conf/converter-*.xml +} + +src_install() { + # Sed and install the files in ./conf + cd ${S} + insinto /etc/${PN} + doins etc/icudt38l.dat + doins conf/* + + # mkdir libdir and copy over the common stuff + + cd ${S}/lib + dodir "${VMWARE_INSTALL_DIR}/lib" + cp -rP common/* "${D}/${VMWARE_INSTALL_DIR}/lib" || die "Failed to copy common files" + use server && ( cp -rP server/* "${D}/${VMWARE_INSTALL_DIR}/lib" || die "Failed to copy server files" ) + use client && ( cp -rP client/* "${D}/${VMWARE_INSTALL_DIR}/lib" || die "Failed to copy client files" ) + + # Symlink everything up + dodir "${VMWARE_INSTALL_DIR}/bin" + for i in ${D}/${VMWARE_INSTALL_DIR}/lib/bin/*; + do + j=$(basename ${i}) + dosym "${VMWARE_INSTALL_DIR}/lib/bin/${j}" "${VMWARE_INSTALL_DIR}/bin/${j}" + done + + if $(use server); + then + dodir /etc/${PN}/init.d + exeinto /etc/${PN}/init.d + doexe ${S}/system_etc/init.d/${PN} + newinitd ${FILESDIR}/${PN}.rc ${PN} + fi + + dosym /opt/vmware/converter/lib/configurator/pam.d/${PN} /etc/pam.d/${PN} + + # Finally, we run the "questions" + vmware_run_questions || die "running questions" + + use server && ( echo "answer INSTALL_SERVER yes" >> "${D}${config_dir}/locations" ) + echo "answer ENABLE_REMOTE_ACCESS yes" >> "${D}${config_dir}/locations" +} -- cgit v1.2.3-65-gdbad