1 |
ikelos 08/09/30 16:45:03 |
2 |
|
3 |
Added: 000_all_initd-location.patch |
4 |
001_all_fix-permissions.patch |
5 |
002_all_pagebreak-detection-fix.patch |
6 |
004_all_do-not-build-modules.patch |
7 |
007_all_use-modprobe-over-insmod.patch |
8 |
009_all_init.d-modules-warning.patch |
9 |
011_all_legit-modules-only.patch |
10 |
Log: |
11 |
Clear out old/masked versions and bump to 5.5.8 and 6.0.5. |
12 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686) |
13 |
(Signed Manifest commit) |
14 |
|
15 |
Revision Changes Path |
16 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/000_all_initd-location.patch |
17 |
|
18 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/000_all_initd-location.patch?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/000_all_initd-location.patch?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: 000_all_initd-location.patch |
22 |
=================================================================== |
23 |
--- vmware-distrib/bin/vmware-config.pl.ori 2005-11-09 01:45:08.000000000 +0000 |
24 |
+++ vmware-distrib/bin/vmware-config.pl 2005-11-09 01:48:21.000000000 +0000 |
25 |
@@ -8433,7 +8433,7 @@ |
26 |
error('Please shut down any running VMs and run this script again.' . |
27 |
"\n\n"); |
28 |
} else { |
29 |
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') |
30 |
+ if (system(shell_string('/etc/init.d' . '/vmware') |
31 |
. ' stop')) { |
32 |
error('Unable to stop services for ' . vmware_product_name() . |
33 |
"\n\n"); |
34 |
@@ -8463,8 +8463,8 @@ |
35 |
} |
36 |
if (vmware_product() ne 'server') { |
37 |
configure_gtk2(); |
38 |
- createMimePackageFile(); |
39 |
- configureDesktopFiles(); |
40 |
+# createMimePackageFile(); |
41 |
+# configureDesktopFiles(); |
42 |
configure_mon(); |
43 |
configure_pp(); |
44 |
configure_net(); |
45 |
@@ -8532,7 +8532,7 @@ |
46 |
db_save(); |
47 |
# Then start VMware's services |
48 |
if (!$gOption{'skip-stop-start'}) { |
49 |
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start'); |
50 |
+ system(shell_string('/etc/init.d' . '/vmware') . ' start'); |
51 |
print "\n"; |
52 |
} |
53 |
|
54 |
|
55 |
|
56 |
|
57 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/001_all_fix-permissions.patch |
58 |
|
59 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/001_all_fix-permissions.patch?rev=1.1&view=markup |
60 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/001_all_fix-permissions.patch?rev=1.1&content-type=text/plain |
61 |
|
62 |
Index: 001_all_fix-permissions.patch |
63 |
=================================================================== |
64 |
diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl |
65 |
--- vmware-distrib.orig/bin/vmware-config.pl 2005-12-16 00:51:03.000000000 -0500 |
66 |
+++ vmware-distrib/bin/vmware-config.pl 2005-12-21 14:34:03.000000000 -0500 |
67 |
@@ -7327,7 +7327,10 @@ |
68 |
error('Unable to write configuration file "' . $name . '".' . "\n\n"); |
69 |
} |
70 |
db_add_file($name, 0x1); |
71 |
- safe_chmod(0644, $name); |
72 |
+ safe_chmod(0664, $name); |
73 |
+ my $gid = (getgrnam('vmware'))[2]; |
74 |
+ my $uid = (stat($name))[4]; |
75 |
+ safe_chown($uid,$gid,$name); |
76 |
|
77 |
# Append the promotional configuration if it exists |
78 |
$promoconfig = $libdir . '/configurator/PROMOCONFIG'; |
79 |
|
80 |
|
81 |
|
82 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/002_all_pagebreak-detection-fix.patch |
83 |
|
84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/002_all_pagebreak-detection-fix.patch?rev=1.1&view=markup |
85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/002_all_pagebreak-detection-fix.patch?rev=1.1&content-type=text/plain |
86 |
|
87 |
Index: 002_all_pagebreak-detection-fix.patch |
88 |
=================================================================== |
89 |
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl |
90 |
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100 |
91 |
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100 |
92 |
@@ -2015,9 +2015,9 @@ |
93 |
. shell_string($pattern)); |
94 |
chomp($header_page_offset); |
95 |
# Ignore PAGE_OFFSET if we cannot parse it. |
96 |
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) { |
97 |
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) { |
98 |
# We found a valid page offset |
99 |
- $header_page_offset = $1; |
100 |
+ $header_page_offset = $2; |
101 |
if (defined($gSystem{'page_offset'}) and |
102 |
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) { |
103 |
if ($source eq 'user') { |
104 |
|
105 |
|
106 |
|
107 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/004_all_do-not-build-modules.patch |
108 |
|
109 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/004_all_do-not-build-modules.patch?rev=1.1&view=markup |
110 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/004_all_do-not-build-modules.patch?rev=1.1&content-type=text/plain |
111 |
|
112 |
Index: 004_all_do-not-build-modules.patch |
113 |
=================================================================== |
114 |
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl |
115 |
--- vmware-server-distrib.orig/bin/vmware-config.pl 2006-02-18 18:12:26.000000000 +0000 |
116 |
+++ vmware-server-distrib/bin/vmware-config.pl 2006-02-18 18:14:17.000000000 +0000 |
117 |
@@ -10158,13 +10158,13 @@ |
118 |
configure_gtk2(); |
119 |
# createMimePackageFile(); |
120 |
# configureDesktopFiles(); |
121 |
- configure_mon(); |
122 |
+# configure_mon(); |
123 |
if (isDesktopProduct()) { |
124 |
- build_vmblock(); |
125 |
+# build_vmblock(); |
126 |
} |
127 |
- configure_pp(); |
128 |
+# configure_pp(); |
129 |
configure_net(); |
130 |
- build_vmnet(); |
131 |
+# build_vmnet(); |
132 |
} |
133 |
|
134 |
configure_eclipse_plugin(); |
135 |
|
136 |
|
137 |
|
138 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch |
139 |
|
140 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch?rev=1.1&view=markup |
141 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch?rev=1.1&content-type=text/plain |
142 |
|
143 |
Index: 007_all_use-modprobe-over-insmod.patch |
144 |
=================================================================== |
145 |
diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh |
146 |
--- vmware-server-distrib/installer/services.sh 2006-02-05 00:21:25.000000000 +0000 |
147 |
+++ vmware-server-distrib.new/installer/services.sh 2006-02-20 23:48:07.000000000 +0000 |
148 |
@@ -538,7 +538,7 @@ |
149 |
} |
150 |
|
151 |
vmware_load_module() { |
152 |
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1 |
153 |
+ /sbin/modprobe -s "$1" || exit 1 |
154 |
exit 0 |
155 |
} |
156 |
|
157 |
|
158 |
|
159 |
|
160 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/009_all_init.d-modules-warning.patch |
161 |
|
162 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/009_all_init.d-modules-warning.patch?rev=1.1&view=markup |
163 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/009_all_init.d-modules-warning.patch?rev=1.1&content-type=text/plain |
164 |
|
165 |
Index: 009_all_init.d-modules-warning.patch |
166 |
=================================================================== |
167 |
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh |
168 |
--- vmware-server-distrib.orig/installer/services.sh 2006-07-01 03:14:16.000000000 +0000 |
169 |
+++ vmware-server-distrib/installer/services.sh 2006-07-14 11:59:28.000000000 +0000 |
170 |
@@ -606,8 +606,13 @@ |
171 |
start) |
172 |
if [ -e "$vmware_etc_dir"/not_configured ]; then |
173 |
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured' |
174 |
- echo 'for the running kernel. To (re-)configure it, invoke the' |
175 |
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.' |
176 |
+ echo 'for the running kernel.' |
177 |
+ echo |
178 |
+ echo 'Please ensure that the modules have been compiled for this kernel:' |
179 |
+ echo ' emerge --oneshot vmware-modules' |
180 |
+ echo |
181 |
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:' |
182 |
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl' |
183 |
echo |
184 |
|
185 |
exit 1 |
186 |
|
187 |
|
188 |
|
189 |
1.1 app-emulation/vmware-workstation/files/6.0.5.109488/011_all_legit-modules-only.patch |
190 |
|
191 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/011_all_legit-modules-only.patch?rev=1.1&view=markup |
192 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/6.0.5.109488/011_all_legit-modules-only.patch?rev=1.1&content-type=text/plain |
193 |
|
194 |
Index: 011_all_legit-modules-only.patch |
195 |
=================================================================== |
196 |
diff -uNr vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl |
197 |
--- vmware-distrib.orig/bin/vmware-config.pl 2007-08-22 02:58:41.000000000 +0100 |
198 |
+++ vmware-distrib/bin/vmware-config.pl 2007-09-19 20:04:57.000000000 +0100 |
199 |
@@ -10127,7 +10127,7 @@ |
200 |
} |
201 |
|
202 |
my @modules = non_vmware_modules_installed(); |
203 |
- if (scalar(@modules) > 0) { |
204 |
+ if (scalar(@modules) < 0) { |
205 |
error("The following VMware kernel modules have been found on your system that " . |
206 |
"were not installed by the VMware Installer. Please remove them then run " . |
207 |
"this installer again.\n\n" . join("\n", @modules) . "\n\n"); |