Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Robin Cook (ab1b718299717a231505ed0cdc452328c5f61832)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Robin Cook (ab1b718299717a231505ed0cdc452328c5f61832)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Robin Cook (ab1b718299717a231505ed0cdc452328c5f61832)
  • Date: Thu, 29 Nov 2007 00:15:10 -0600
GIT changes to master z-rejected grimoire by Robin Cook <rcook AT wyrms.net>:

ChangeLog | 3
dev/null |binary
gurus.gpg |binary
z-emulators/vmware6/DETAILS | 2
z-emulators/vmware6/HISTORY | 5
z-emulators/vmware6/INSTALL | 8
z-emulators/vmware6/VMware-workstation-6.0.0-45731.i386.tar.gz.sig | 0
z-emulators/vmware6/VMware-workstation-6.0.0-45731.x86_64.tar.gz.sig | 0
z-emulators/vmware6/VMware-workstation-6.0.2-59824.i386.tar.gz.sig |binary
z-emulators/vmware6/VMware-workstation-6.0.2-59824.x86_64.tar.gz.sig |binary
z-emulators/vmware6/vmware-vix.patch | 86
++++++++++
z-emulators/vmware6/vmware.patch | 29
++-
12 files changed, 120 insertions(+), 13 deletions(-)

New commits:
commit 327e33d255a8e932ddd78905a7e4a069e1c58bec
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gurus.gpg: added my new key

commit 6f6990deb938719ef017ea6e234e4720b8f7ef98
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

vmware6: updated to 6.0.2

diff --git a/ChangeLog b/ChangeLog
index b39e2d3..01ae5d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-11-29 Robin Cook <rcook AT wyrms.net>
+ * gurus.gpg: added my key
+
2007-11-28 Arjan Bouter <abouter AT sourcemage.org>
* z-kernels/zd1211-firmware: new spell, firmware for the
zd1211 kernel driver
diff --git a/gurus.gpg b/gurus.gpg
index fb7ac71..2001299 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/z-emulators/vmware6/DETAILS b/z-emulators/vmware6/DETAILS
index 0fd8921..df85dea 100755
--- a/z-emulators/vmware6/DETAILS
+++ b/z-emulators/vmware6/DETAILS
@@ -1,5 +1,5 @@
SPELL=vmware6
- VERSION=6.0.0-45731
+ VERSION=6.0.2-59824
SOURCE=VMware-workstation-${VERSION}.${VMWARE_X86}.tar.gz
SOURCE_URL[0]=http://www.vmware.com/download/ws/
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/vmware-distrib
diff --git a/z-emulators/vmware6/HISTORY b/z-emulators/vmware6/HISTORY
index b753cc6..e131746 100644
--- a/z-emulators/vmware6/HISTORY
+++ b/z-emulators/vmware6/HISTORY
@@ -1,3 +1,8 @@
+2007-11-29 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 6.0.2
+ * INSTALL: updated vmware.patch
+ added new patch vmware-vix.patch
+
2007-05-27 Robin Cook <rcook AT wyrms.net>
* Created from the vmware5 spell

diff --git a/z-emulators/vmware6/INSTALL b/z-emulators/vmware6/INSTALL
index a895262..920c36b 100755
--- a/z-emulators/vmware6/INSTALL
+++ b/z-emulators/vmware6/INSTALL
@@ -1,4 +1,10 @@
-patch -p1 < $SCRIPT_DIRECTORY/vmware.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/vmware.patch &&
+
+cd vmware-vix &&
+tar xvzf vmware-vix.tar.gz > /dev/null &&
+patch -p0 < $SCRIPT_DIRECTORY/vmware-vix.patch &&
+tar cvzf vmware-vix.tar.gz vmware-vix-distrib > /dev/null &&
+cd $SOURCE_DIRECTORY &&

./vmware-install.pl

diff --git
a/z-emulators/vmware6/VMware-workstation-6.0.0-45731.i386.tar.gz.sig
b/z-emulators/vmware6/VMware-workstation-6.0.0-45731.i386.tar.gz.sig
deleted file mode 100644
index 58678ef..0000000
Binary files
a/z-emulators/vmware6/VMware-workstation-6.0.0-45731.i386.tar.gz.sig and
/dev/null differ
diff --git
a/z-emulators/vmware6/VMware-workstation-6.0.0-45731.x86_64.tar.gz.sig
b/z-emulators/vmware6/VMware-workstation-6.0.0-45731.x86_64.tar.gz.sig
deleted file mode 100644
index 665141f..0000000
Binary files
a/z-emulators/vmware6/VMware-workstation-6.0.0-45731.x86_64.tar.gz.sig and
/dev/null differ
diff --git
a/z-emulators/vmware6/VMware-workstation-6.0.2-59824.i386.tar.gz.sig
b/z-emulators/vmware6/VMware-workstation-6.0.2-59824.i386.tar.gz.sig
new file mode 100644
index 0000000..bf1a0d6
Binary files /dev/null and
b/z-emulators/vmware6/VMware-workstation-6.0.2-59824.i386.tar.gz.sig differ
diff --git
a/z-emulators/vmware6/VMware-workstation-6.0.2-59824.x86_64.tar.gz.sig
b/z-emulators/vmware6/VMware-workstation-6.0.2-59824.x86_64.tar.gz.sig
new file mode 100644
index 0000000..ecb8ab8
Binary files /dev/null and
b/z-emulators/vmware6/VMware-workstation-6.0.2-59824.x86_64.tar.gz.sig differ
diff --git a/z-emulators/vmware6/vmware-vix.patch
b/z-emulators/vmware6/vmware-vix.patch
new file mode 100644
index 0000000..b601369
--- /dev/null
+++ b/z-emulators/vmware6/vmware-vix.patch
@@ -0,0 +1,86 @@
+diff -u -r vmware-vix-distrib-orig/bin/vmware-uninstall-vix.pl
vmware-vix-distrib/bin/vmware-uninstall-vix.pl
+--- vmware-vix-distrib-orig/bin/vmware-uninstall-vix.pl 2007-10-08
10:18:10.000000000 -0500
++++ vmware-vix-distrib/bin/vmware-uninstall-vix.pl 2007-11-28
23:21:18.000000000 -0600
+@@ -7,11 +7,15 @@
+
+ use strict;
+
++$| = 1;
++
+ # BEGINNING_OF_UTIL_DOT_PL
+ #!/usr/bin/perl
+
+ use strict;
+
++$| = 1;
++
+ # Moved out of config.pl to support $gOption in spacechk_answer
+ my %gOption;
+ # Moved from various scripts that include util.pl
+@@ -2737,45 +2741,11 @@
+ return $initscriptsdir;
+ }
+
+- # The "SuSE version >= 7.1" way
+- $initdir = '/etc/init.d';
+- if (check_answer_initdirpath($initdir, 'default') eq '') {
+- # The "SuSE version < 7.1" way
+- $initdir = '/sbin/init.d';
+- if (check_answer_initdirpath($initdir, 'default') eq '') {
+- # The "RedHat" way
+- $initdir = '/etc/rc.d';
+- if (check_answer_initdirpath($initdir, 'default') eq '') {
+- # The "Debian" way
+- $initdir = '/etc';
+- if (check_answer_initdirpath($initdir, 'default') eq '') {
+- $initdir = '';
+- }
+- }
+- }
+- }
+- $answer = get_persistent_answer('What is the directory that contains the
init'
+- .' directories (rc0.d/ to rc6.d/)?'
+- , 'INITDIR', 'initdirpath', $initdir);
+-
+- # The usual way
+- $initscriptsdir = $answer . '/init.d';
+- if ( $answer =~ m/init.d/ ) {
+- # if the string contains init.d, do not default to containing init.d,
+- # instead just default to the initdir as the initscripstdir
+- $initscriptsdir = $answer;
+- }
+-
+- if (check_answer_initscriptsdirpath($initscriptsdir, 'default') eq '') {
+- # The "SuSE version >= 7.1" way
+- $initscriptsdir = $answer;
+- if (check_answer_initscriptsdirpath($initscriptsdir, 'default') eq '') {
+- $initscriptsdir = '';
+- }
+- }
+- $answer = get_persistent_answer('What is the directory that contains the
init'
+- .' scripts?', 'INITSCRIPTSDIR'
+- , 'initscriptsdirpath', $initscriptsdir);
++ # The "Fake smgl" way
++ $initscriptsdir = $answer = $initdir = '/tmp/vmware_rc.d';
++ db_add_answer('INITDIR', $answer);
++ db_add_answer('INITSCRIPTSDIR', $answer);
++
+ return $answer;
+ }
+
+diff -u -r vmware-vix-distrib-orig/installer/services.sh
vmware-vix-distrib/installer/services.sh
+--- vmware-vix-distrib-orig/installer/services.sh 2007-10-08
10:18:11.000000000 -0500
++++ vmware-vix-distrib/installer/services.sh 2007-11-28 23:22:22.000000000
-0600
+@@ -26,6 +26,11 @@
+ # BEGINNING_OF_UTIL_DOT_SH
+ #!/bin/sh
+
++function echo ()
++{
++ builtin echo "$@"
++}
++
+ # A few utility functions used by our shell scripts. These are patched in
+ # during make.
+
+Only in vmware-vix-distrib-orig: vmware-install.pl
diff --git a/z-emulators/vmware6/vmware.patch
b/z-emulators/vmware6/vmware.patch
index 70ddbbb..7504523 100644
--- a/z-emulators/vmware6/vmware.patch
+++ b/z-emulators/vmware6/vmware.patch
@@ -1,6 +1,6 @@
-diff -u -r vmware-distrib.orig/bin/vmware-config.pl
vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl 2007-05-01 23:52:50.000000000
-0500
-+++ vmware-distrib/bin/vmware-config.pl 2007-05-27 20:35:13.000000000
-0500
+diff -u -r vmware-distrib-orig/bin/vmware-config.pl
vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib-orig/bin/vmware-config.pl 2007-11-28 21:38:25.000000000
-0600
++++ vmware-distrib/bin/vmware-config.pl 2007-11-28 22:00:51.000000000
-0600
@@ -7,6 +7,8 @@

use strict;
@@ -29,9 +29,9 @@ diff -u -r vmware-distrib.orig/bin/vmware-config.pl
vmware-distrib/bin/vmware-co
# Moved out of config.pl to support $gOption in spacechk_answer
my %gOption;
# Moved from various scripts that include util.pl
-diff -u -r vmware-distrib.orig/bin/vmware-uninstall.pl
vmware-distrib/bin/vmware-uninstall.pl
---- vmware-distrib.orig/bin/vmware-uninstall.pl 2007-05-01
23:52:33.000000000 -0500
-+++ vmware-distrib/bin/vmware-uninstall.pl 2007-05-27 20:39:24.000000000
-0500
+diff -u -r vmware-distrib-orig/bin/vmware-uninstall.pl
vmware-distrib/bin/vmware-uninstall.pl
+--- vmware-distrib-orig/bin/vmware-uninstall.pl 2007-11-28
21:38:24.000000000 -0600
++++ vmware-distrib/bin/vmware-uninstall.pl 2007-11-28 22:04:11.000000000
-0600
@@ -7,11 +7,15 @@

use strict;
@@ -48,7 +48,7 @@ diff -u -r vmware-distrib.orig/bin/vmware-uninstall.pl
vmware-distrib/bin/vmware
# Moved out of config.pl to support $gOption in spacechk_answer
my %gOption;
# Moved from various scripts that include util.pl
-@@ -2712,39 +2716,11 @@
+@@ -2737,45 +2741,11 @@
return $initscriptsdir;
}

@@ -75,6 +75,12 @@ diff -u -r vmware-distrib.orig/bin/vmware-uninstall.pl
vmware-distrib/bin/vmware
-
- # The usual way
- $initscriptsdir = $answer . '/init.d';
+- if ( $answer =~ m/init.d/ ) {
+- # if the string contains init.d, do not default to containing init.d,
+- # instead just default to the initdir as the initscripstdir
+- $initscriptsdir = $answer;
+- }
+-
- if (check_answer_initscriptsdirpath($initscriptsdir, 'default') eq '') {
- # The "SuSE version >= 7.1" way
- $initscriptsdir = $answer;
@@ -93,9 +99,9 @@ diff -u -r vmware-distrib.orig/bin/vmware-uninstall.pl
vmware-distrib/bin/vmware
return $answer;
}

-diff -u -r vmware-distrib.orig/installer/services.sh
vmware-distrib/installer/services.sh
---- vmware-distrib.orig/installer/services.sh 2007-05-01 23:52:51.000000000
-0500
-+++ vmware-distrib/installer/services.sh 2007-05-27 20:40:41.000000000
-0500
+diff -u -r vmware-distrib-orig/installer/services.sh
vmware-distrib/installer/services.sh
+--- vmware-distrib-orig/installer/services.sh 2007-11-28 21:38:26.000000000
-0600
++++ vmware-distrib/installer/services.sh 2007-11-28 22:00:51.000000000
-0600
@@ -26,6 +26,11 @@
# BEGINNING_OF_UTIL_DOT_SH
#!/bin/sh
@@ -107,4 +113,5 @@ diff -u -r vmware-distrib.orig/installer/services.sh
vmware-distrib/installer/se
+
# A few utility functions used by our shell scripts. These are patched in
# during make.
-
+
+Only in vmware-distrib-orig: vmware-install.pl


  • [SM-Commit] GIT changes to master z-rejected grimoire by Robin Cook (ab1b718299717a231505ed0cdc452328c5f61832), Robin Cook, 11/29/2007

Archive powered by MHonArc 2.6.24.

Top of Page