[gentoo-commits] gentoo-x86 commit in app-emulation/vmware-player/files/2.0.2.59824: 002_all_pagebreak-detection-fix.patch 007_all_use-modprobe-over-insmod.patch 001_all_fix-permissions.patch 004_all_do-not-build-modules.patch 009_all_init.d-modules-warning.patch 011_all_legit-modules-only.patch 000_all_initd-location.patch

[Mike Auty (ikelos)]

ikelos      07/11/25 12:59:46

  Added:                002_all_pagebreak-detection-fix.patch
                        007_all_use-modprobe-over-insmod.patch
                        001_all_fix-permissions.patch
                        004_all_do-not-build-modules.patch
                        009_all_init.d-modules-warning.patch
                        011_all_legit-modules-only.patch
                        000_all_initd-location.patch
  Log:
  Version bump to 2.0.2, and update to vmware-any-any-update114.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  app-emulation/vmware-player/files/2.0.2.59824/002_all_pagebreak-detection-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/002_all_pagebreak-detection-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/002_all_pagebreak-detection-fix.patch?rev=1.1&content-type=text/plain

Index: 002_all_pagebreak-detection-fix.patch
===================================================================
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') {



1.1                  app-emulation/vmware-player/files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch?rev=1.1&content-type=text/plain

Index: 007_all_use-modprobe-over-insmod.patch
===================================================================
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
 }
 



1.1                  app-emulation/vmware-player/files/2.0.2.59824/001_all_fix-permissions.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/001_all_fix-permissions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/001_all_fix-permissions.patch?rev=1.1&content-type=text/plain

Index: 001_all_fix-permissions.patch
===================================================================
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';



1.1                  app-emulation/vmware-player/files/2.0.2.59824/004_all_do-not-build-modules.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/004_all_do-not-build-modules.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/004_all_do-not-build-modules.patch?rev=1.1&content-type=text/plain

Index: 004_all_do-not-build-modules.patch
===================================================================
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
@@ -10158,13 +10158,13 @@
     configure_gtk2();
 #   createMimePackageFile();
 #   configureDesktopFiles();
-    configure_mon();
+#   configure_mon();
     if (isDesktopProduct()) {
-      build_vmblock();
+#     build_vmblock();
     }
-    configure_pp();
+#   configure_pp();
     configure_net();
-    build_vmnet();
+#   build_vmnet();
   }
 
    configure_eclipse_plugin();



1.1                  app-emulation/vmware-player/files/2.0.2.59824/009_all_init.d-modules-warning.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/009_all_init.d-modules-warning.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/009_all_init.d-modules-warning.patch?rev=1.1&content-type=text/plain

Index: 009_all_init.d-modules-warning.patch
===================================================================
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



1.1                  app-emulation/vmware-player/files/2.0.2.59824/011_all_legit-modules-only.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/011_all_legit-modules-only.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/011_all_legit-modules-only.patch?rev=1.1&content-type=text/plain

Index: 011_all_legit-modules-only.patch
===================================================================
diff -uNr vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
--- vmware-distrib.orig/bin/vmware-config.pl	2007-08-22 02:58:41.000000000 +0100
+++ vmware-distrib/bin/vmware-config.pl	2007-09-19 20:04:57.000000000 +0100
@@ -10127,7 +10127,7 @@
    }
 
    my @modules = non_vmware_modules_installed();
-   if (scalar(@modules) > 0) {
+   if (scalar(@modules) < 0) {
       error("The following VMware kernel modules have been found on your system that " .
             "were not installed by the VMware Installer.  Please remove them then run " .
             "this installer again.\n\n" . join("\n", @modules) . "\n\n");



1.1                  app-emulation/vmware-player/files/2.0.2.59824/000_all_initd-location.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/000_all_initd-location.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.0.2.59824/000_all_initd-location.patch?rev=1.1&content-type=text/plain

Index: 000_all_initd-location.patch
===================================================================
--- 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{'skip-stop-start'}) {
-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
+    system(shell_string('/etc/init.d' . '/vmware') . ' start');
     print "\n";
   }
 



-- 
gentoo-commits@g.o mailing list