From 86cccf1cce87645bb7c330253dbfe48567667622 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 15 May 2007 01:47:45 +0000 Subject: Version bump to 5.5.4 for bug #176678 and bug #176647. (Portage version: 2.1.2.3) --- .../files/5.5.4.44386/000_all_initd-location.patch | 31 ++++++++++++++++++++++ .../5.5.4.44386/001_all_fix-permissions.patch | 15 +++++++++++ .../002_all_pagebreak-detection-fix.patch | 15 +++++++++++ .../5.5.4.44386/004_all_do-not-build-modules.patch | 17 ++++++++++++ .../007_all_use-modprobe-over-insmod.patch | 12 +++++++++ .../009_all_init.d-modules-warning.patch | 19 +++++++++++++ .../files/digest-vmware-workstation-5.5.4.44386 | 6 +++++ 7 files changed, 115 insertions(+) create mode 100644 app-emulation/vmware-workstation/files/5.5.4.44386/000_all_initd-location.patch create mode 100644 app-emulation/vmware-workstation/files/5.5.4.44386/001_all_fix-permissions.patch create mode 100644 app-emulation/vmware-workstation/files/5.5.4.44386/002_all_pagebreak-detection-fix.patch create mode 100644 app-emulation/vmware-workstation/files/5.5.4.44386/004_all_do-not-build-modules.patch create mode 100644 app-emulation/vmware-workstation/files/5.5.4.44386/007_all_use-modprobe-over-insmod.patch create mode 100644 app-emulation/vmware-workstation/files/5.5.4.44386/009_all_init.d-modules-warning.patch create mode 100644 app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.4.44386 (limited to 'app-emulation/vmware-workstation/files') diff --git a/app-emulation/vmware-workstation/files/5.5.4.44386/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.4.44386/000_all_initd-location.patch new file mode 100644 index 000000000000..1d864f7e0dd7 --- /dev/null +++ b/app-emulation/vmware-workstation/files/5.5.4.44386/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-workstation/files/5.5.4.44386/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.4.44386/001_all_fix-permissions.patch new file mode 100644 index 000000000000..e646b7b2da5c --- /dev/null +++ b/app-emulation/vmware-workstation/files/5.5.4.44386/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-workstation/files/5.5.4.44386/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.4.44386/002_all_pagebreak-detection-fix.patch new file mode 100644 index 000000000000..fd3fc76ca679 --- /dev/null +++ b/app-emulation/vmware-workstation/files/5.5.4.44386/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-workstation/files/5.5.4.44386/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.4.44386/004_all_do-not-build-modules.patch new file mode 100644 index 000000000000..cec3b3ee4c1d --- /dev/null +++ b/app-emulation/vmware-workstation/files/5.5.4.44386/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-workstation/files/5.5.4.44386/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.4.44386/007_all_use-modprobe-over-insmod.patch new file mode 100644 index 000000000000..c29a87e8f226 --- /dev/null +++ b/app-emulation/vmware-workstation/files/5.5.4.44386/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 -f "$1" || exit 1 + exit 0 + } + diff --git a/app-emulation/vmware-workstation/files/5.5.4.44386/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.4.44386/009_all_init.d-modules-warning.patch new file mode 100644 index 000000000000..4eab043af8dc --- /dev/null +++ b/app-emulation/vmware-workstation/files/5.5.4.44386/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-workstation/files/digest-vmware-workstation-5.5.4.44386 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.4.44386 new file mode 100644 index 000000000000..6eb8aa02df7f --- /dev/null +++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.4.44386 @@ -0,0 +1,6 @@ +MD5 115993a6289f6a27a97584f61a9f436a VMware-workstation-5.5.4-44386.tar.gz 111540721 +RMD160 2a166073291c9012bc2e65921a8a849bab72f864 VMware-workstation-5.5.4-44386.tar.gz 111540721 +SHA256 ae9cc7ac9726bd9a466ab97f16361ccc3b7d233118584fb3f38e4f47c68389c0 VMware-workstation-5.5.4-44386.tar.gz 111540721 +MD5 2b65f2c3867e45a7b0674591f2ca8015 vmware-any-any-update109.tar.gz 295773 +RMD160 823b961d7b8f8a97af02f0bb2ed775fa5840ec54 vmware-any-any-update109.tar.gz 295773 +SHA256 392dd7d4fd990efcbd664f982d71e8ad8ba1d08425ab37e640a1bee0909b67a8 vmware-any-any-update109.tar.gz 295773 -- cgit v1.2.3-65-gdbad