Initialise the custom overlays by adding the vmware-server tree, and importing the xgl tree

svn path=/trunk/; revision=1

11 files changed, 225 insertions, 0 deletions

diff --git a/app-emulation/vmware-server/files/90-vmware-server b/app-emulation/vmware-server/files/90-vmware-server
new file mode 100644
index 0000000..dd0d596
--- /dev/null
+++ b/app-emulation/vmware-server/files/90-vmware-server
@@ -0,0 +1,3 @@
+PATH=/opt/vmware/server/bin
+ROOTPATH=/opt/vmware/server/bin
+MANPATH=/opt/vmware/server/man
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config.patch
new file mode 100644
index 0000000..1d864f7
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config.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-server/files/vmware-server-1.0.0.20925-config2.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config2.patch
new file mode 100644
index 0000000..e646b7b
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config2.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-server/files/vmware-server-1.0.0.20925-config3.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config3.patch
new file mode 100644
index 0000000..c3068de
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config3.patch
@@ -0,0 +1,12 @@
+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
+@@ -1972,7 +1972,7 @@
+     . ' -E - | ' . shell_string($gHelper{'grep'}) . ' '
+     . shell_string($pattern));
+   chomp($header_page_offset);
+-  $header_page_offset =~ s/^$pattern \(?0x([0-9a-fA-F]{8,}).*$/$1/;
++  $header_page_offset =~ s/^$pattern \(?(\(unsigned long\))?0x([0-9a-fA-F]{8,}).*$/$1/;
+   if ($header_page_offset =~ /[0-9a-fA-F]{8,}/) {
+     # We found a valid page offset
+     if (defined($gSystem{'page_offset'}) and
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config4.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config4.patch
new file mode 100644
index 0000000..cec3b3e
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-config4.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-server/files/vmware-server-1.0.0.20925-services.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-services.patch
new file mode 100644
index 0000000..c29a87e
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-services.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 -f "$1" || exit 1
+    exit 0
+ }
+ 
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmware-authd-amd64 b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmware-authd-amd64
new file mode 100644
index 0000000..de076b4
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmware-authd-amd64
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       sufficient       /emul/linux/x86/lib/security/pam_unix.so shadow nullok
+auth       required         /emul/linux/x86/lib/security/pam_unix_auth.so shadow nullok
+account    required         /emul/linux/x86/lib/security/pam_listfile.so item=group sense=allow file=/etc/vmware/vmwaregroup onerr=fail
+account    sufficient       /emul/linux/x86/lib/security/pam_unix.so
+account    required         /emul/linux/x86/lib/security/pam_unix_acct.so
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmware-authd-x86 b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmware-authd-x86
new file mode 100644
index 0000000..fce8f64
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmware-authd-x86
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       sufficient       pam_unix.so shadow nullok
+auth       required         pam_unix_auth.so shadow nullok
+account    required         pam_listfile.so item=group sense=allow file=/etc/vmware/vmwaregroup onerr=fail
+account    sufficient       pam_unix.so
+account    required         pam_unix_acct.so
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmwaregroup b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmwaregroup
new file mode 100644
index 0000000..0554874
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.20925-vmwaregroup
@@ -0,0 +1 @@
+vmware
diff --git a/app-emulation/vmware-server/files/vmware.rc b/app-emulation/vmware-server/files/vmware.rc
new file mode 100644
index 0000000..74c39ab
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware.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.rc,v 1.5 2005/12/19 16:16:08 wolf31o2 Exp $
+
+depend() {
+	need localmount
+	use logger net
+	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" == "-1" ]
+			then
+				ewarn $line
+				continue
+			fi
+			if [ "${line/*:*/}" == "" ]
+			then
+				einfon $line
+				echo
+				eend 0
+				msgtype=1
+			else
+				ewarn $line
+				msgtype=-1
+				waserror=1
+			fi
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo $line | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  $message"
+		echo
+
+		echo $line | grep done > /dev/null
+		status=$?
+		eend $status
+
+		if [ "$status" != "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/init.d/vmware || \
+		eend 1 "vmware init script not found. Aborting" || return 1
+
+	/etc/vmware/init.d/vmware start | vmware-prettify start
+	return $?
+}
+
+stop() {
+	/etc/vmware/init.d/vmware stop | vmware-prettify stop
+	return $?
+}
diff --git a/app-emulation/vmware-server/files/vmware.xml b/app-emulation/vmware-server/files/vmware.xml
new file mode 100644
index 0000000..8d5e2ef
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>