summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2006-03-20 20:30:48 +0000
committerMike Auty <ikelos@gentoo.org>2006-03-20 20:30:48 +0000
commit0bef18430768974608444da97feedea9cb620009 (patch)
tree4886c3cb2538cb154a7d81671af736d16fa54e0f /app-emulation
parentFix up dependencies in vmware-server-* to ensure that portage can unpack loca... (diff)
downloadvmware-0bef18430768974608444da97feedea9cb620009.tar.gz
vmware-0bef18430768974608444da97feedea9cb620009.tar.bz2
vmware-0bef18430768974608444da97feedea9cb620009.zip
Update vmware-server's config file with Hannes' patch, vmware-authd should no longer be overwritten.
Added my own patch to fix vmware restart xinetd rather than just reloading it. Altered /etc/init.d/vmware to ensure that xinetd is started before the vmware service. svn path=/trunk/; revision=14
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-server/Manifest18
-rw-r--r--app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch50
-rw-r--r--app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch28
-rw-r--r--app-emulation/vmware-server/files/vmware.rc2
-rw-r--r--app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild4
5 files changed, 95 insertions, 7 deletions
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 5f3041e..783d9ad 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -16,6 +16,12 @@ SHA256 8065a566b484b124f5b6ffe2190ef7025f39da14b1c0fc33453487860fa02c78 files/vm
MD5 8b7edbd7b3b93bf2b437f88cfa375f28 files/vmware-server-1.0.0.22088-config4.patch 589
RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 files/vmware-server-1.0.0.22088-config4.patch 589
SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e files/vmware-server-1.0.0.22088-config4.patch 589
+MD5 7fc2b46e200ef3ccf5e200e73b28c02d files/vmware-server-1.0.0.22088-config5.patch 2113
+RMD160 88619cb1a448e95c5b8dbf1e269abead6f849dfb files/vmware-server-1.0.0.22088-config5.patch 2113
+SHA256 c6056047d1226ada3328fea2d7827f632cfab9b155a001388294836a1ab8780e files/vmware-server-1.0.0.22088-config5.patch 2113
+MD5 7990840c4bacdd7ce2baf98194c43f77 files/vmware-server-1.0.0.22088-config6.patch 1227
+RMD160 f27ea918c99e6a3db0fba8d53b5329833aa4cc58 files/vmware-server-1.0.0.22088-config6.patch 1227
+SHA256 1fcbbdf11f99f80881ee43ae47ed099d5f10aa3985bfe16606fdf2d307836ff0 files/vmware-server-1.0.0.22088-config6.patch 1227
MD5 f5a4bba93e2ef942332dbe7105f2b204 files/vmware-server-1.0.0.22088-services.patch 448
RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 files/vmware-server-1.0.0.22088-services.patch 448
SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee files/vmware-server-1.0.0.22088-services.patch 448
@@ -25,12 +31,12 @@ SHA256 b74a8935915a9e8325c675de4f1a0c041870b85c897d55836bd898803c96a9cf files/vm
MD5 a237d4e862ce8615d286c979dd9fd2fd files/vmware-server-1.0.0.22088-vmware-authd-x86 315
RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 files/vmware-server-1.0.0.22088-vmware-authd-x86 315
SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 files/vmware-server-1.0.0.22088-vmware-authd-x86 315
-MD5 e516aab6d83b21fc44a44fc1394999cf files/vmware.rc 1424
-RMD160 f72d33d084de6661231ed3d10599f9d9bb578c21 files/vmware.rc 1424
-SHA256 408be40a1e176ef2c74fae1e9cc9dcd716ece187b6b2bcf037892a4f5ae1394b files/vmware.rc 1424
+MD5 8f5b4988c119df62fc6c4e8a6d113f92 files/vmware.rc 1431
+RMD160 862c9ea3471412123dcefca69b793ce597afe859 files/vmware.rc 1431
+SHA256 6ec6c667133ea5445df8dd52d8accac6e0177bbdfb4d067b4c68a315acabdf13 files/vmware.rc 1431
MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 8b98d35c651c204056416afea7480df4 vmware-server-1.0.0.22088.ebuild 9135
-RMD160 ba75a96f3e162eeed7c0857a76a66023ea90a107 vmware-server-1.0.0.22088.ebuild 9135
-SHA256 2d265553b8c47e36b197dd5305ede7c0c8f08fd49c3d5272b75e08b9cb399734 vmware-server-1.0.0.22088.ebuild 9135
+MD5 9604d82c8047f07c42ccac425aeb4cf4 vmware-server-1.0.0.22088.ebuild 9337
+RMD160 91b45502357e62d8a6f033ca19faa9c38aaa251f vmware-server-1.0.0.22088.ebuild 9337
+SHA256 2170a35ac914f478dc811f119a2029ed6a39bdcd9d3753a2333750a897648194 vmware-server-1.0.0.22088.ebuild 9337
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch
new file mode 100644
index 0000000..55d4447
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch
@@ -0,0 +1,50 @@
+--- vmware-server-distrib/bin/vmware-config.pl 2006-03-17 21:13:22.000000000 +0100
++++ vmware-server-distrib/bin/vmware-config.pl 2006-03-17 22:37:00.000000000 +0100
+@@ -6278,10 +6278,36 @@
+ my $authd_conf_file = "$conf_dir/vmware-authd";
+ my $authd = db_get_answer('SBINDIR') . "/vmware-authd";
+
++ # Never overwrite an existing conf file unless it has the exact modification
++ # date as in the database in which case we can be pretty sure that it is the
++ # one that we wrote and it should be safe to assume that we can overwrite it.
++ if( -f $authd_conf_file ) {
++ my @statbuf = stat( $authd_conf_file );
++ if( ! defined( $statbuf[9] ) ) {
++ error(
++ 'Unable to get the last modification timestamp of file "'
++ . $authd_conf_file . "\".\n\n"
++ );
++ }
++ if(
++ ! db_file_in( $authd_conf_file )
++ || db_file_ts( $authd_conf_file ) != $statbuf[9]
++ ) {
++ query(
++ 'The file "' . $authd_conf_file . '" already exists and seems to have'
++ . ' been modified manually. Consequently, this program cannot add a "'
++ . $authd . '" entry in the file. You will have to do it by hand'
++ . ' before running ' . vmware_product_name() . ".\n\n"
++ . ' Hit enter to continue.',
++ '', 0
++ );
++ return;
++ }
++ }
++
+ # Create the new vmware-authd file
+- # XXX This file should be registered with the installer's database. --hpreg
+ if (not open(CONF, '>' . $authd_conf_file)) {
+- query('Unable to create the "' . $authd_conf_file . '"file. '
++ query('Unable to create the "' . $authd_conf_file . '" file. '
+ . 'Consequently, this program cannot add a "' . $authd . '" entry '
+ . 'in the file. You will have to do it by hand before running '
+ . vmware_product_name() . '.' . "\n\n" . 'Hit enter to continue.',
+@@ -6304,6 +6330,8 @@
+ END
+ close CONF;
+
++ db_add_file( $authd_conf_file, 0x1 );
++
+ # Make sure the IP service is registered, as RH 9.0's xinetd is picky about
+ # that (was bug 26864). --hpreg
+ if (check_port_not_registered($port) == 1) {
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch
new file mode 100644
index 0000000..89c4e16
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch
@@ -0,0 +1,28 @@
+--- vmware-server-distrib/bin/vmware-config.pl 2006-03-20 20:04:45.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl 2006-03-20 20:08:01.000000000 +0000
+@@ -6255,17 +6255,17 @@
+ #Restart xinetd
+ sub restart_xinetd {
+ my $xinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/xinetd';
++ if (!system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) {
++ return;
++ }
+ if (-e $xinetd_restart) {
+- if (!system(shell_string($xinetd_restart) . ' restart')) {
+- return;
++ if (system(shell_string($xinetd_restart) . ' restart')) {
++ query('Unable to make the Internet super-server (xinetd) re-read its '
++ . 'configuration file. Please restart xinetd by hand:' . "\n"
++ . ' killall -v -USR2 xinetd' . "\n\n"
++ . 'Hit enter to continue.', '', 0);
+ }
+ }
+- if (system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) {
+- query('Unable to make the Internet super-server (xinetd) re-read its '
+- . 'configuration file. Please restart xinetd by hand:' . "\n"
+- . ' killall -v -USR2 xinetd' . "\n\n"
+- . 'Hit enter to continue.', '', 0);
+- }
+ }
+
+ # Update the Internet super-server's configuration file, and make the
diff --git a/app-emulation/vmware-server/files/vmware.rc b/app-emulation/vmware-server/files/vmware.rc
index 74c39ab..498589c 100644
--- a/app-emulation/vmware-server/files/vmware.rc
+++ b/app-emulation/vmware-server/files/vmware.rc
@@ -4,7 +4,7 @@
# $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
+ need localmount xinetd
use logger net
after samba
}
diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
index 5e35276..9c3f256 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
@@ -74,6 +74,10 @@ src_unpack() {
epatch ${FILESDIR}/${P}-config3.patch
# patch the configure script not to build the modules
epatch ${FILESDIR}/${P}-config4.patch
+ # patch the config script not to overwrite existing vmware-authd files
+ epatch ${FILESDIR}/${P}-config5.patch
+ # patch the config script to play nice with xinetd
+ epatch ${FILESDIR}/${P}-config6.patch
# patch the services file to modprobe the modules rather than insmod
epatch ${FILESDIR}/${P}-services.patch