summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2009-03-04 17:55:32 +0000
committerMike Auty <ikelos@gentoo.org>2009-03-04 17:55:32 +0000
commita9456df70493378406df60d864e60dd206456bdf (patch)
treee59162ff4b304f72be7a5331cfabb1ee3ea27318 /app-emulation/vmware-converter/files
parentFix up SRC_URI to use variable names whereever possible. (diff)
downloadvmware-a9456df70493378406df60d864e60dd206456bdf.tar.gz
vmware-a9456df70493378406df60d864e60dd206456bdf.tar.bz2
vmware-a9456df70493378406df60d864e60dd206456bdf.zip
Add in vmware-converter masked (both package and keyword).
svn path=/trunk/; revision=359
Diffstat (limited to 'app-emulation/vmware-converter/files')
-rw-r--r--app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch31
-rw-r--r--app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch15
-rw-r--r--app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch15
-rw-r--r--app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch17
-rw-r--r--app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch12
-rw-r--r--app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch19
-rw-r--r--app-emulation/vmware-converter/files/vmware-converter.rc74
7 files changed, 183 insertions, 0 deletions
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 <esc> 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 $?
+}