Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2025-12-24 09:17:15 +01:00
Code Issues Projects Releases Wiki Activity

vmware: version bump to 7.1.1

Browse source
This commit is contained in:
grimmlin 2010-09-14 23:02:45 +00:00
parent 1ea1515782
commit b51f222e04
6 changed files with 364 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app-emulation/vmware-workstation/Manifest
View file

@ -3,6 +3,9 @@ AUX 7.0.1.227600/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab
AUX 7.0.1.227600/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
AUX 7.0.1.227600/vmware-vix.py.patch 795 RMD160 d230fd802e3f41afd1946aaf13637806923ee860 SHA1 bb3d166726512cd5d8515a87426968b682b342e5 SHA256 34be7416e10ceed19845b4f45756c7e99d1905967ac716b8a8e9e61d5270f4fa
AUX 7.0.1.227600/vmware-workstation.py.patch 3194 RMD160 29ad4872c9269836efe43c3a2b41562d315d9ff9 SHA1 9b2fe24f045d695bb6afa55fb2dae407e39b5662 SHA256 0cd03b9b415cf1289b2da57d76cf96485c77b05204c722094277cba24571c734
AUX 7.1.1.282343/vmware-player-app.py.patch 3461 RMD160 958ff96c5f2f82b2db5819ab583df221b39d406e SHA1 56b0b66a16b1c8f961d1a370fa6c1030162f03bc SHA256 26fb7bd2907585eba0e850a0897ca12711274623ba9680edb84062b2a2523e80
AUX 7.1.1.282343/vmware-vix.py.patch 795 RMD160 d230fd802e3f41afd1946aaf13637806923ee860 SHA1 bb3d166726512cd5d8515a87426968b682b342e5 SHA256 34be7416e10ceed19845b4f45756c7e99d1905967ac716b8a8e9e61d5270f4fa
AUX 7.1.1.282343/vmware-workstation.py.patch 3887 RMD160 2b9c7afe98015f01f9eec638ebb38bf291f491f6 SHA1 6924c5685279220dba866703ea7609c5ccc0f801 SHA256 0a5abee5e8ad3d3407c7bc6c89ebc3f5043b9fb1b8e21c49a8e340cd4a14de74
AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea
AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78
@ -10,12 +13,13 @@ AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8
AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54
AUX vmware-workstation-7.0.1.227600-installer.patch 8007 RMD160 6db58cf39b1fd35074cc305b809740efd8ba6dd0 SHA1 5f085b257d6db09266c6bc9099c7fd29d41b3753 SHA256 ce7bbcdd1e802d8f964301cd10ba29a90aa07e709388d659587516c258abb163
AUX vmware-workstation-7.0.rc 1444 RMD160 cfc983d5606fba3972c89e9094f0f6af89a7a2fb SHA1 fc0ed37ffa96106febb6d7e86e886cbd451481af SHA256 86af02f8d8da8c6acc7a190eef5368782455bc520be1cf3d4fd18d5d312d4bab
AUX vmware-workstation-7.1.1.282343-installer.patch 7999 RMD160 1137a8fd40444ebe8794261dd6494fce109033cb SHA1 c924f0fa80b430e4247c4bb75c2e66271ddb0596 SHA256 e0f83133bf23d27d8b70b26acc315dfca8a541bbfb55fba727772562a332108c
AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e
AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
DIST VMware-Workstation-Full-7.0.1-227600.i386.bundle 286244988 RMD160 9db7f06a3662b4b474cddb61675e36071eb16711 SHA1 f6d0789afa7927ca154973a071603a0bd098e697 SHA256 cc003ff5a811ace83172712e435047d41f0e883320d7d0798e69940389e31d57
DIST VMware-Workstation-Full-7.0.1-227600.x86_64.bundle 292113593 RMD160 ac519500f4b3cfc2849c8a3f5ba4ddd02db0f9a3 SHA1 a901c45a2a02678b0d1722e8f27152c3af12a7ac SHA256 e188381d0569e8cc1f652df8d12f4572e207e40dd9c726af02d09c42503551d3
DIST VMware-Workstation-Full-7.1.0-261024.i386.bundle 321780875 RMD160 52b21952806c1503bddae2f7e5e35c059ce4dcaf SHA1 fce07933a982b3c91bfa81126d6f688a8c643f77 SHA256 de7b3e9cb6034ddb0da00fcb06e3245e30f6b3db6325bca2d1dc3c3ed6db8ed1
DIST VMware-Workstation-Full-7.1.0-261024.x86_64.bundle 328785023 RMD160 f7605e6b466d2b667b42bfce65c21d262643b67a SHA1 7600ba37ccf3d83620b99c95612756eb3da82ae4 SHA256 7a7a9f98398c1b1d224a00ef5c1a11c2d31e628ee2bcfc758e0afff15b16523f
DIST VMware-Workstation-Full-7.1.1-282343.i386.bundle 321650357 RMD160 e26f468dea0d0cf070eb85e0fd86f710d4637914 SHA1 44ac484ef555c7bd82d32dcaf58bb4c763676d4f SHA256 24bef14d608eba60306a7ac586fb3c10a3ea1876a534bb6480667a36d619a349
DIST VMware-Workstation-Full-7.1.1-282343.x86_64.bundle 328655945 RMD160 5c67c89b601f2be764b49feb3b8cd68939061dcc SHA1 b26ee2abf37fe7311a2bbd3c5f383d1c9dcd7c22 SHA256 0d88f04fa7dd3a07b1c5ccb715e832de270cc5e50026e1f9f71a721573cc7638
EBUILD vmware-workstation-7.0.1.227600.ebuild 5590 RMD160 b2d449c5e8eb3b598e328a19382eb2e6f385e04e SHA1 ef09b00ddc04e58508d6187d3176f59ba8ab6fc7 SHA256 db0f7289f1dd9fb3486d81ea2ae7334c92de1ffb0e3ef4c5641e11a9df461ad8
EBUILD vmware-workstation-7.1.0.261024.ebuild 5592 RMD160 1da3902f464bbfd10ce62b8ad6c2cdedd15314b9 SHA1 261c02fadb9ac56bd49a11569384a6add9907db0 SHA256 561468e1b945ce9dabc6b0b83aaa204f84ae33eaae971227d2528a9e2afeccb7
EBUILD vmware-workstation-7.1.1.282343.ebuild 5665 RMD160 32f0fcff37729402b827b18bf701e2dccc4c5b8d SHA1 5c54e2c2764cc1a1014997e12029d45e9872abdb SHA256 f8da0b343d44f7af496b8955100cbb164c24be8aea27a44c669a1c4c9763ab84

81
app-emulation/vmware-workstation/files/7.1.1.282343/vmware-player-app.py.patch Normal file
View file

@ -0,0 +1,81 @@
diff -Naur payload.orig/install/vmware-player-app/.installer/3.1.1/vmware-player-app.py payload/install/vmware-player-app/.installer/3.1.1/vmware-player-app.py
--- payload.orig/install/vmware-player-app/.installer/3.1.1/vmware-player-app.py 2010-09-14 23:14:09.000000000 +0200
+++ payload/install/vmware-player-app/.installer/3.1.1/vmware-player-app.py 2010-09-15 00:41:30.456229870 +0200
@@ -6,7 +6,8 @@
GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
DEST = LIBDIR/'vmware'
-CONFIG = DEST/'setup/vmware-config'
+import os
+CONFIG=path(os.environ['WORKDIR'])/'vmware-config.sh'
CUPSLIBDIR = LIBDIR/'cups'
SETTINGS = \
{ 'libdir': DEST,
@@ -27,7 +28,7 @@
# Player and Workstation both depend on some configuration living
# in /etc/vmware
-ETCDIR = Destination('/etc/vmware')
+ETCDIR = SYSCONFDIR/'vmware'
class PlayerApp(Installer):
def PreTransactionInstall(self, old, new, upgrade):
@@ -135,14 +136,14 @@
not themeIndex.exists() and self.AddTarget('File', 'files/index.theme', themeIndex)
# Services
- if INITDIR:
- self.RegisterService(name='vmware', src='etc/init.d/services.sh', start=19, stop=8)
+ self.AddTarget('File', 'etc/init.d/services.sh', ETCDIR/'init.d/vmware')
+ # self.RegisterService(name='vmware', src='etc/init.d/services.sh', start=19, stop=8)
# modprobe.d script. Only install this on systems where modprobe.d
# exists.
if path('/etc/modprobe.d').exists():
self.AddTarget('File', 'etc/modprobe.d/modprobe-vmware-fuse.conf',
- '/etc/modprobe.d/vmware-fuse.conf')
+ SYSCONFDIR/'modprobe.d/vmware-fuse.conf')
def _scriptRunnable(self, script):
""" Returns True if the script exists and is in a runnable state """
@@ -201,7 +202,7 @@
for module in modules:
for ext in ('o', 'ko'):
mod = '%s.%s' % (module, ext)
- (base/mod).remove(ignore_errors=True)
+ # (base/mod).remove(ignore_errors=True)
# Make sure we kill all processes that should not be running!
self._killVMwareProcesses()
@@ -261,9 +262,10 @@
for key, val in SETTINGS.items():
self.RunCommand(CONFIG, '-s', key, val)
- bootstrap = ETCDIR/'bootstrap'
+ import os
+ bootstrap = path(os.environ['WORKDIR'])/'vmware-confdir/bootstrap'
# Create the bootstrap file.
- bootstrap.unlink(ignore_errors=True)
+ #bootstrap.unlink(ignore_errors=True)
# Fill it.
for i in ('PREFIX', 'BINDIR', 'SBINDIR', 'LIBDIR', 'DATADIR',
'SYSCONFDIR', 'DOCDIR', 'MANDIR', 'INCLUDEDIR', 'INITDIR',
@@ -346,7 +348,7 @@
# Fall back on /etc/sysctl.conf if /etc/sysctl.d didn't exist
sysctl = path('/etc/sysctl.conf')
- if sysctl.exists():
+ if False:
if addEntry:
return self._AddLineToFile(sysctl, 'kernel.sched_compat_yield=1', addToEnd=True)
else:
@@ -461,7 +463,8 @@
def _isGConfUsable(self):
""" Return True if GConf settings can be configured, otherwise False """
- return self.RunCommand('gconftool-2', '--help', ignoreErrors=True, noLogging=True).retCode == 0
+ return False
+# return self.RunCommand('gconftool-2', '--help', ignoreErrors=True, noLogging=True).retCode == 0
def _configureVMStreamingHandlers(self):
""" Configures handlers for vm:// and vms:// used for VM streaming """

21
app-emulation/vmware-workstation/files/7.1.1.282343/vmware-vix.py.patch Normal file
View file

@ -0,0 +1,21 @@
--- vmware-vix.py.orig 2010-02-04 19:50:56.000000000 +0100
+++ vmware-vix.py 2010-02-05 02:17:54.000000000 +0100
@@ -6,7 +6,8 @@
DEST = LIBDIR/'vmware-vix'
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware',
'vix.libdir': DEST, }
-CONF = DEST/'setup/vmware-config'
+import os
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
class VIX(Installer):
def PreTransactionInstall(self, old, new, upgrade):
@@ -29,7 +30,7 @@
for key, val in SETTINGS.items():
self.RunCommand(CONF, '-s', key, val)
# Add link to deprecated uninstall mechanism to catch downgrades
- self.AddUninstallLinks('vix')
+ # self.AddUninstallLinks('vix')
def PreUninstall(self, old, new, upgrade):
# XXX: VIX may have been removed out from underneath us if

89
app-emulation/vmware-workstation/files/7.1.1.282343/vmware-workstation.py.patch Normal file
View file

@ -0,0 +1,89 @@
diff -Naur payload.orig/install/vmware-workstation/.installer/7.1.1/vmware-workstation.py payload/install/vmware-workstation/.installer/7.1.1/vmware-workstation.py
--- payload.orig/install/vmware-workstation/.installer/7.1.1/vmware-workstation.py 2010-09-14 23:14:24.000000000 +0200
+++ payload/install/vmware-workstation/.installer/7.1.1/vmware-workstation.py 2010-09-15 00:01:22.009604731 +0200
@@ -4,11 +4,12 @@
VMware Workstation component installer.
"""
DEST = LIBDIR/'vmware'
-conf = DEST/'setup/vmware-config'
+import os
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
-LIMITSFILE = Destination('/etc/security/limits.conf')
+LIMITSFILE = SYSCONFDIR/'security/limits.conf'
NOFILE_MINIMUM = 4096
-PAMLOGINFILE = Destination('/etc/pam.d/login')
+PAMLOGINFILE = SYSCONFDIR/'pam.d/login'
vmwareSentinel = '# Automatically generated by the VMware Installer - DO NOT REMOVE\n'
pamLoginLine = 'session required pam_limits.so\n'
@@ -109,7 +110,7 @@
self.SetPermission(DEST/'bin/*', BINARY)
eclipse = self.GetAnswer('eclipse')
- eclipse and self.AddTarget('Link', DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
+ False and self.AddTarget('Link', DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
def _killVMwareProcesses(self):
@@ -179,13 +180,13 @@
# Player is still installed though, so we want to be
# sure to restart the services for Player.
script = INITSCRIPTDIR/'vmware'
- if INITSCRIPTDIR and script.exists():
+ if False and script.exists():
self.RunCommand(script, 'stop', ignoreErrors=True)
self.RunCommand(script, 'start')
def _ClearVMwareEclipseINI(self):
eclipse = self.GetAnswer('eclipse')
- if eclipse:
+ if False:
try:
# Check if our section already exists at the beginning
# of the file. If it does clear it.
@@ -202,7 +203,7 @@
def _ModifyEclipseINI(self):
eclipse = self.GetAnswer('eclipse')
log.Debug('ModifyINI: Eclipse is: %s', eclipse)
- if eclipse:
+ if False:
log.Debug('ModifyINI: Eclipse path was found at %s', eclipse)
# Modify the eclipse.ini file to include the lines:
# -vm
@@ -234,7 +235,7 @@
missingFeatures = []
pluginDir = DEST/'eclipse-ng'
xmlfile = pluginDir/'feature.xml'
- if xmlfile.exists():
+ if False:
text = xmlfile.bytes()
req = str(re.findall('<requires>.*</requires>', text, re.DOTALL))
reqPlugins = re.findall('import plugin="(.*?)"', str(req), re.DOTALL)
@@ -279,7 +280,7 @@
# Before installing, we need to make sure that all of our references in that
# file are ***removed*** or it will cause problems later on reinstall/upgrade.
artifact = path(eclipse)/'artifacts.xml'
- if artifact.exists():
+ if False:
# Load it and remove all <artifact ....></artifact> references with
# vmware in the name.
txt = artifact.bytes()
@@ -300,7 +301,7 @@
eclipse = self.GetAnswer('eclipse')
eclipseCCPP = self.GetAnswer('eclipseCCPP')
log.Debug('Eclipse(C/C++): Eclipse is: %s', eclipse)
- if eclipse and eclipseCCPP.lower() == 'yes':
+ if False and eclipseCCPP.lower() == 'yes':
if install:
action = 'installation'
instCmd = '-installIU'
@@ -488,7 +489,7 @@
# to check.
nofileHL = self.GetAnswer('nofileHardLimit')
if nofileHL and (self.hardLimit != int(nofileHL)):
- limitsFile = Destination('/etc/security/limits.conf')
+ limitsFile = LIMITSFILE
if limitsFile.exists():
self._ClearVMwareLimitsConf(limitsFile, restoreEntry=False)
log.Debug('Modifying /etc/security/limits.conf hard limit from '

163
app-emulation/vmware-workstation/files/vmware-workstation-7.1.1.282343-installer.patch Normal file
View file

@ -0,0 +1,163 @@
diff -Naur payload.orig/install/vmware-installer/.installer/1.1/vmware-installer.py payload/install/vmware-installer/.installer/1.1/vmware-installer.py
--- payload.orig/install/vmware-installer/.installer/1.1/vmware-installer.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/.installer/1.1/vmware-installer.py 2010-09-14 23:26:16.719483781 +0200
@@ -10,7 +10,7 @@
# The 1.0 Installer looks in very specific locations for existing installs
# (/etc/vmware and /etc/vmware-vix)
-OLDCONFDIR = Destination('/etc/vmware')
+OLDCONFDIR = SYSCONFDIR/'vmware'
OLDBOOTSTRAPS = ['/etc/vmware', '/etc/vmware-vix']
installerLinks = ['vmware-installer', 'vmware-uninstall',
@@ -150,7 +150,8 @@
path(bin/'vmware-installer').symlink(str(BINDIR/'vmware-installer'))
# Create necessary bootstrap files
- bootstrap = CONFDIR/'bootstrap'
+ import os
+ bootstrap = path(os.environ['WORKDIR'])/'vmware-confdir/bootstrap'
bootstrap.write_bytes('VMWARE_INSTALLER="%s"\n\n' % DEST, append=False)
bootstrap.write_bytes('VERSION="%s"\n' % '1.1', append=True)
bootstrap.write_bytes('VMISPYVERSION="%s"\n' % PYTHON_VERSION, append=True)
@@ -160,7 +161,7 @@
# don't already exist
for bstrap in OLDBOOTSTRAPS:
bootstrap = path(bstrap)/'bootstrap'
- if not bootstrap.exists():
+ if False:
try:
path(bstrap).makedirs()
except OSError:
@@ -229,7 +230,7 @@
# don't clean up the bootstrap files.
for suffix in ['', '-vix']:
oldfile = path('/etc/vmware%s/bootstrap' % suffix)
- if oldfile.exists():
+ if False:
text = oldfile.bytes()
if text.find('VERSION="1.0"') != -1:
bstraps.remove('/etc/vmware%s' % suffix)
diff -Naur payload.orig/install/vmware-installer/vmis/core/common.py payload/install/vmware-installer/vmis/core/common.py
--- payload.orig/install/vmware-installer/vmis/core/common.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/core/common.py 2010-09-14 23:26:16.720358920 +0200
@@ -247,4 +247,3 @@
# nonexistant DB.
SYSTEM_BOOTSTRAP = path('/etc/vmware-installer/bootstrap')
SYSTEM_DATABASE = path('/etc/vmware-installer/database')
-
diff -Naur payload.orig/install/vmware-installer/vmis/core/dependency.py payload/install/vmware-installer/vmis/core/dependency.py
--- payload.orig/install/vmware-installer/vmis/core/dependency.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/core/dependency.py 2010-09-14 23:26:16.720358920 +0200
@@ -291,7 +291,7 @@
log.debug(' found match: %s' % possibleDep)
node.addDependency(possibleDep, dependency.optional)
matched = True
- if not matched and not dependency.optional and not force:
+ if False:
exception = UnsatisfiedDependency('Component %s has unsatisfied '
'dependency: %s' % (node.component,
dependency))
diff -Naur payload.orig/install/vmware-installer/vmis/core/env.py payload/install/vmware-installer/vmis/core/env.py
--- payload.orig/install/vmware-installer/vmis/core/env.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/core/env.py 2010-09-14 23:26:16.720358920 +0200
@@ -305,6 +305,8 @@
# Python will interpret as being a module separator
moduleName = component.name.replace('.', '')
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
+ fileObj = file(pathName)
componentCoreVersion = component.coreVersion
if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
diff -Naur payload.orig/install/vmware-installer/vmis/core/files.py payload/install/vmware-installer/vmis/core/files.py
--- payload.orig/install/vmware-installer/vmis/core/files.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/core/files.py 2010-09-14 23:26:16.720358920 +0200
@@ -17,7 +17,8 @@
Check to see if VMIS_COMPONENT_ONLY is defined. Return true if it is,
false otherwise.
"""
- return 'VMIS_COMPONENT_ONLY' in globals()
+ return False
+# return 'VMIS_COMPONENT_ONLY' in globals()
# XXX: This could be handled better.
@@ -196,6 +197,7 @@
id = 0
def Install(self, component, dest, precopy=None):
+
if self.IsRelative():
entries = list(component.Glob(self))
diff -Naur payload.orig/install/vmware-installer/vmis/core/questions.py payload/install/vmware-installer/vmis/core/questions.py
--- payload.orig/install/vmware-installer/vmis/core/questions.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/core/questions.py 2010-09-14 23:26:16.721480149 +0200
@@ -266,6 +266,9 @@
if answer == '':
return answer
+ ### GENTOO PATCH ### Finish early
+ return True
+
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
answer = path(answer)
diff -Naur payload.orig/install/vmware-installer/vmis/db.py payload/install/vmware-installer/vmis/db.py
--- payload.orig/install/vmware-installer/vmis/db.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/db.py 2010-09-14 23:26:16.721480149 +0200
@@ -569,7 +569,7 @@
if row:
coreID = row['id'];
- else:
+ elif False:
cur = self._db.execute(u'SELECT id, name, version FROM components WHERE name="vmware-installer"')
rows = cur.fetchone();
cur.close();
diff -Naur payload.orig/install/vmware-installer/vmis/__init__.py payload/install/vmware-installer/vmis/__init__.py
--- payload.orig/install/vmware-installer/vmis/__init__.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/__init__.py 2010-09-14 23:26:16.721480149 +0200
@@ -20,7 +20,7 @@
MAJOR_VERSION = VERSION_INFO[0]
VMISPYVERSION = os.environ.get('VMISPYVERSION')
-CONFDIR = path(u'/etc/vmware-installer')
+CONFDIR = path(u'./vmware-confdir')
DATABASE_PATH = CONFDIR/'database'
# Database setting for use by the installer and its component.
diff -Naur payload.orig/install/vmware-installer/vmis/util/log.py payload/install/vmware-installer/vmis/util/log.py
--- payload.orig/install/vmware-installer/vmis/util/log.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmis/util/log.py 2010-09-14 23:26:16.721480149 +0200
@@ -24,12 +24,13 @@
username = pwd.getpwuid(os.getuid())[0]
dirname = '/tmp/vmware-%s' % username
LOG_FILE = '%s/vmware-installer.log' % dirname
+LOG_FILE = './vmware-installer.log'
# Make sure this directory exists. Assuming /tmp exists.
- try:
- os.mkdir(dirname)
- except OSError:
+# try:
+# os.mkdir(dirname)
+# except OSError:
# It's okay if it already exists
- pass
+# pass
if level <= logging.DEBUG:
MAX_BYTES = 0
diff -Naur payload.orig/install/vmware-installer/vmware-installer.py payload/install/vmware-installer/vmware-installer.py
--- payload.orig/install/vmware-installer/vmware-installer.py 2010-09-14 23:14:27.000000000 +0200
+++ payload/install/vmware-installer/vmware-installer.py 2010-09-14 23:26:16.721480149 +0200
@@ -206,7 +206,7 @@
# if it exists and continue with installation.
dbase = SYSTEM_DATABASE
if dbase.exists():
- dbase.remove(ignore_errors=True);
+# dbase.remove(ignore_errors=True);
log.error('Bootstrap file was missing, but database file exists. '
'Installer system state is corrupted. Removing '
'%s and starting with an empty installer database.'

5
app-emulation/vmware-workstation/vmware-workstation-7.1.0.261024.ebuild → app-emulation/vmware-workstation/vmware-workstation-7.1.1.282343.ebuild
View file

@ -22,7 +22,7 @@ SRC_URI="
LICENSE="vmware"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
KEYWORDS="-* amd64 x86"
IUSE=""
RESTRICT="strip fetch binchecks"
PROPERTIES="interactive"
@ -32,7 +32,7 @@ PROPERTIES="interactive"
DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
dev-python/lxml"
RDEPEND="
~app-emulation/vmware-modules-1.0.0.26
~app-emulation/vmware-modules-1.0.0.27
dev-cpp/cairomm
dev-cpp/libgnomecanvasmm
dev-cpp/libsexymm
@ -174,6 +174,7 @@ pkg_postinst() {
ewarn "Before you can use vmware-workstation, you must configure a default network setup."
ewarn "You can do this by running 'emerge --config ${PN}'."
ewarn "You must also add kernel.sched_compat_yield=1 to /etc/sysctl.conf"
}
pkg_prerm() {