Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

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