1 |
vadimk 09/10/29 13:24:13 |
2 |
|
3 |
Added: 004_all_do-not-build-modules.patch |
4 |
009_all_init.d-modules-warning.patch |
5 |
002_all_pagebreak-detection-fix.patch |
6 |
000_all_initd-location.patch |
7 |
012_all_rc-config.patch |
8 |
007_all_use-modprobe-over-insmod.patch |
9 |
001_all_fix-permissions.patch |
10 |
011_all_legit-modules-only.patch |
11 |
Log: |
12 |
version bump. bug 290702 |
13 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
14 |
|
15 |
Revision Changes Path |
16 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/004_all_do-not-build-modules.patch |
17 |
|
18 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/004_all_do-not-build-modules.patch?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/004_all_do-not-build-modules.patch?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: 004_all_do-not-build-modules.patch |
22 |
=================================================================== |
23 |
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl |
24 |
index 363f9cb..7ffc212 100755 |
25 |
--- a/bin/vmware-config.pl |
26 |
+++ b/bin/vmware-config.pl |
27 |
@@ -10404,16 +10404,16 @@ sub main { |
28 |
} |
29 |
|
30 |
if (vmware_product() ne 'server') { |
31 |
- configure_mon(); |
32 |
- configure_vmci(); |
33 |
- configure_vsock(); |
34 |
- configure_pp(); |
35 |
+ #configure_mon(); |
36 |
+ #configure_vmci(); |
37 |
+ #configure_vsock(); |
38 |
+ #configure_pp(); |
39 |
|
40 |
if (vmware_product() eq 'wgs') { |
41 |
configure_net(); |
42 |
} |
43 |
|
44 |
- build_vmnet(); |
45 |
+ #build_vmnet(); |
46 |
} |
47 |
|
48 |
if (isDesktopProduct()) { |
49 |
|
50 |
|
51 |
|
52 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/009_all_init.d-modules-warning.patch |
53 |
|
54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/009_all_init.d-modules-warning.patch?rev=1.1&view=markup |
55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/009_all_init.d-modules-warning.patch?rev=1.1&content-type=text/plain |
56 |
|
57 |
Index: 009_all_init.d-modules-warning.patch |
58 |
=================================================================== |
59 |
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh |
60 |
--- vmware-server-distrib.orig/installer/services.sh 2007-12-02 12:08:09.000000000 +0000 |
61 |
+++ vmware-server-distrib/installer/services.sh 2007-12-02 12:12:08.000000000 +0000 |
62 |
@@ -823,8 +823,13 @@ |
63 |
check_configured() { |
64 |
if [ -e "$vmware_etc_dir"/not_configured ]; then |
65 |
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured' |
66 |
- echo 'for the running kernel. To (re-)configure it, invoke the' |
67 |
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.' |
68 |
+ echo 'for the running kernel.' |
69 |
+ echo |
70 |
+ echo 'Please ensure that the modules have been compiled for this kernel:' |
71 |
+ echo ' emerge --oneshot vmware-modules' |
72 |
+ echo |
73 |
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:' |
74 |
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl.' |
75 |
echo |
76 |
|
77 |
exit 1 |
78 |
|
79 |
|
80 |
|
81 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/002_all_pagebreak-detection-fix.patch |
82 |
|
83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/002_all_pagebreak-detection-fix.patch?rev=1.1&view=markup |
84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/002_all_pagebreak-detection-fix.patch?rev=1.1&content-type=text/plain |
85 |
|
86 |
Index: 002_all_pagebreak-detection-fix.patch |
87 |
=================================================================== |
88 |
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl |
89 |
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100 |
90 |
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100 |
91 |
@@ -2015,9 +2015,9 @@ |
92 |
. shell_string($pattern)); |
93 |
chomp($header_page_offset); |
94 |
# Ignore PAGE_OFFSET if we cannot parse it. |
95 |
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) { |
96 |
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) { |
97 |
# We found a valid page offset |
98 |
- $header_page_offset = $1; |
99 |
+ $header_page_offset = $2; |
100 |
if (defined($gSystem{'page_offset'}) and |
101 |
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) { |
102 |
if ($source eq 'user') { |
103 |
|
104 |
|
105 |
|
106 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch?rev=1.1&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch?rev=1.1&content-type=text/plain |
110 |
|
111 |
Index: 000_all_initd-location.patch |
112 |
=================================================================== |
113 |
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl |
114 |
--- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:40:41.000000000 +0000 |
115 |
+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:43:29.000000000 +0000 |
116 |
@@ -10162,7 +10162,7 @@ |
117 |
error('Please shut down any running VMs and run this script again.' . |
118 |
"\n\n"); |
119 |
} else { |
120 |
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') |
121 |
+ if (system(shell_string('/etc/init.d' . '/vmware') |
122 |
. ' stop')) { |
123 |
error('Unable to stop services for ' . vmware_product_name() . "\n\n"); |
124 |
} |
125 |
@@ -10212,8 +10212,8 @@ |
126 |
|
127 |
if (isDesktopProduct()) { |
128 |
build_vmblock(); |
129 |
- createMimePackageFile(); |
130 |
- configureDesktopFiles(); |
131 |
+ # createMimePackageFile(); |
132 |
+ # configureDesktopFiles(); |
133 |
if (vmware_binary() ne "vmplayer") { |
134 |
configure_eclipse_plugin(); |
135 |
} |
136 |
@@ -10283,7 +10283,7 @@ |
137 |
db_save(); |
138 |
# Then start VMware's services |
139 |
if (!$gOption{'skip-stop-start'}) { |
140 |
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start'); |
141 |
+ system(shell_string('/etc/init.d' . '/vmware') . ' start'); |
142 |
print "\n"; |
143 |
} |
144 |
|
145 |
|
146 |
|
147 |
|
148 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch |
149 |
|
150 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch?rev=1.1&view=markup |
151 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch?rev=1.1&content-type=text/plain |
152 |
|
153 |
Index: 012_all_rc-config.patch |
154 |
=================================================================== |
155 |
--- bin.old/vmware-config.pl 2009-07-02 17:56:08.873568674 -0400 |
156 |
+++ bin/vmware-config.pl 2009-07-02 17:56:59.000000000 -0400 |
157 |
@@ -1341,6 +1341,14 @@ |
158 |
} |
159 |
} |
160 |
|
161 |
+ # Try using Genoot's rc-config |
162 |
+ if ($gHelper{'rc-config'} ne '') { |
163 |
+ if(0 == system(shell_string($gHelper{'rc-config'}) . ' add ' |
164 |
+ . $service . ' default')) { |
165 |
+ return; |
166 |
+ } |
167 |
+ } |
168 |
+ |
169 |
# Set up vmware to start/stop at run levels 2, 3 and 5 |
170 |
link_runlevel(2, $service, $S_level, $K_level); |
171 |
link_runlevel(3, $service, $S_level, $K_level); |
172 |
@@ -2552,6 +2560,7 @@ |
173 |
} |
174 |
$gHelper{'insserv'} = internal_which('insserv'); |
175 |
$gHelper{'chkconfig'} = internal_which('/sbin/chkconfig'); |
176 |
+ $gHelper{'rc-config'} = internal_which('/usr/bin/rc-config'); |
177 |
if (vmware_product() eq 'server' && |
178 |
$gHelper{'chkconfig'} eq '') { |
179 |
error('No initscript installer found.' . "\n\n"); |
180 |
|
181 |
|
182 |
|
183 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch |
184 |
|
185 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch?rev=1.1&view=markup |
186 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch?rev=1.1&content-type=text/plain |
187 |
|
188 |
Index: 007_all_use-modprobe-over-insmod.patch |
189 |
=================================================================== |
190 |
diff --git a/installer/services.sh b/installer/services.sh |
191 |
index 402ad79..2fb53ab 100755 |
192 |
--- a/installer/services.sh |
193 |
+++ b/installer/services.sh |
194 |
@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() { |
195 |
} |
196 |
|
197 |
vmware_load_module() { |
198 |
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1 |
199 |
+ /sbin/modprobe -s "$1" || exit 1 |
200 |
return 0 |
201 |
} |
202 |
|
203 |
|
204 |
|
205 |
|
206 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch |
207 |
|
208 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch?rev=1.1&view=markup |
209 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch?rev=1.1&content-type=text/plain |
210 |
|
211 |
Index: 001_all_fix-permissions.patch |
212 |
=================================================================== |
213 |
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl |
214 |
--- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:16:42.000000000 +0000 |
215 |
+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:25:36.000000000 +0000 |
216 |
@@ -9097,7 +9097,10 @@ |
217 |
error('Unable to write configuration file "' . $name . '".' . "\n\n"); |
218 |
} |
219 |
db_add_file($name, $cFlagTimestamp | $cFlagConfig); |
220 |
- safe_chmod(0644, $name); |
221 |
+ safe_chmod(0664, $name); |
222 |
+ my $gid = (getgrnam('vmware'))[2]; |
223 |
+ my $uid = (stat($name))[4]; |
224 |
+ safe_chown($uid,$gid,$name); |
225 |
|
226 |
# Append the promotional configuration if it exists |
227 |
$promoconfig = $libdir . '/configurator/PROMOCONFIG'; |
228 |
|
229 |
|
230 |
|
231 |
1.1 app-emulation/vmware-server/files/2.0.2.203138/011_all_legit-modules-only.patch |
232 |
|
233 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/011_all_legit-modules-only.patch?rev=1.1&view=markup |
234 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/2.0.2.203138/011_all_legit-modules-only.patch?rev=1.1&content-type=text/plain |
235 |
|
236 |
Index: 011_all_legit-modules-only.patch |
237 |
=================================================================== |
238 |
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl |
239 |
index bb9d04f..458a14b 100755 |
240 |
--- a/bin/vmware-config.pl |
241 |
+++ b/bin/vmware-config.pl |
242 |
@@ -10315,7 +10315,7 @@ sub main { |
243 |
|
244 |
if ($gOption{'tools-switch'} == 0) { |
245 |
my @modules = non_vmware_modules_installed(); |
246 |
- if (scalar(@modules) > 0) { |
247 |
+ if (scalar(@modules) < 0) { |
248 |
my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r'); |
249 |
chomp($osVersion); |
250 |
error("The following VMware kernel modules have been found on your " . |