1 |
phajdan.jr 13/05/01 21:30:19 |
2 |
|
3 |
Modified: chromium-28.0.1490.2.ebuild ChangeLog |
4 |
chromium-9999-r1.ebuild |
5 |
chromium-27.0.1453.65.ebuild |
6 |
Log: |
7 |
Disable unmaintained upstream SELinux mode, bug #465574 by swift, bug #467954 by Dominik Kriegner. |
8 |
|
9 |
(Portage version: 2.1.11.55/cvs/Linux i686, signed Manifest commit with key 30427902) |
10 |
|
11 |
Revision Changes Path |
12 |
1.2 www-client/chromium/chromium-28.0.1490.2.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-28.0.1490.2.ebuild?rev=1.2&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-28.0.1490.2.ebuild?rev=1.2&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-28.0.1490.2.ebuild?r1=1.1&r2=1.2 |
17 |
|
18 |
Index: chromium-28.0.1490.2.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1490.2.ebuild,v |
21 |
retrieving revision 1.1 |
22 |
retrieving revision 1.2 |
23 |
diff -u -r1.1 -r1.2 |
24 |
--- chromium-28.0.1490.2.ebuild 1 May 2013 21:24:55 -0000 1.1 |
25 |
+++ chromium-28.0.1490.2.ebuild 1 May 2013 21:30:19 -0000 1.2 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2013 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1490.2.ebuild,v 1.1 2013/05/01 21:24:55 phajdan.jr Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1490.2.ebuild,v 1.2 2013/05/01 21:30:19 phajdan.jr Exp $ |
31 |
|
32 |
EAPI="5" |
33 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
34 |
@@ -70,10 +70,7 @@ |
35 |
x11-libs/libXScrnSaver:= |
36 |
x11-libs/libXtst:= |
37 |
kerberos? ( virtual/krb5 ) |
38 |
- selinux? ( |
39 |
- sec-policy/selinux-chromium |
40 |
- sys-libs/libselinux:= |
41 |
- )" |
42 |
+ selinux? ( sec-policy/selinux-chromium )" |
43 |
DEPEND="${RDEPEND} |
44 |
${PYTHON_DEPS} |
45 |
!arm? ( |
46 |
@@ -110,9 +107,7 @@ |
47 |
# Make sure the build system will use the right python, bug #344367. |
48 |
python-any-r1_pkg_setup |
49 |
|
50 |
- if ! use selinux; then |
51 |
- chromium_suid_sandbox_check_kernel_config |
52 |
- fi |
53 |
+ chromium_suid_sandbox_check_kernel_config |
54 |
|
55 |
if use bindist && ! use system-ffmpeg; then |
56 |
elog "bindist enabled: H.264 video support will be disabled." |
57 |
@@ -269,8 +264,7 @@ |
58 |
$(gyp_use gps linux_use_libgps) |
59 |
$(gyp_use gps linux_link_libgps) |
60 |
$(gyp_use kerberos) |
61 |
- $(gyp_use pulseaudio) |
62 |
- $(gyp_use selinux selinux)" |
63 |
+ $(gyp_use pulseaudio)" |
64 |
|
65 |
if use system-sqlite; then |
66 |
elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/" |
67 |
@@ -293,12 +287,10 @@ |
68 |
myconf+=" |
69 |
-Dusb_ids_path=/usr/share/misc/usb.ids" |
70 |
|
71 |
- if ! use selinux; then |
72 |
- # Enable SUID sandbox. |
73 |
- myconf+=" |
74 |
- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
75 |
- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
76 |
- fi |
77 |
+ # Enable SUID sandbox. |
78 |
+ myconf+=" |
79 |
+ -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
80 |
+ -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
81 |
|
82 |
# Never use bundled gold binary. Disable gold linker flags for now. |
83 |
myconf+=" |
84 |
@@ -366,10 +358,7 @@ |
85 |
test_targets+=" ${x}_unittests" |
86 |
done |
87 |
|
88 |
- local make_targets="chrome chromedriver" |
89 |
- if ! use selinux; then |
90 |
- make_targets+=" chrome_sandbox" |
91 |
- fi |
92 |
+ local make_targets="chrome chrome_sandbox chromedriver" |
93 |
if use test; then |
94 |
make_targets+=" $test_targets" |
95 |
fi |
96 |
@@ -461,10 +450,8 @@ |
97 |
exeinto "${CHROMIUM_HOME}" |
98 |
doexe out/Release/chrome || die |
99 |
|
100 |
- if ! use selinux; then |
101 |
- doexe out/Release/chrome_sandbox || die |
102 |
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
103 |
- fi |
104 |
+ doexe out/Release/chrome_sandbox || die |
105 |
+ fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
106 |
|
107 |
doexe out/Release/chromedriver || die |
108 |
|
109 |
|
110 |
|
111 |
|
112 |
1.873 www-client/chromium/ChangeLog |
113 |
|
114 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.873&view=markup |
115 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.873&content-type=text/plain |
116 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.872&r2=1.873 |
117 |
|
118 |
Index: ChangeLog |
119 |
=================================================================== |
120 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
121 |
retrieving revision 1.872 |
122 |
retrieving revision 1.873 |
123 |
diff -u -r1.872 -r1.873 |
124 |
--- ChangeLog 1 May 2013 21:24:55 -0000 1.872 |
125 |
+++ ChangeLog 1 May 2013 21:30:19 -0000 1.873 |
126 |
@@ -1,6 +1,12 @@ |
127 |
# ChangeLog for www-client/chromium |
128 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
129 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.872 2013/05/01 21:24:55 phajdan.jr Exp $ |
130 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.873 2013/05/01 21:30:19 phajdan.jr Exp $ |
131 |
+ |
132 |
+ 01 May 2013; Pawel Hajdan jr <phajdan.jr@g.o> |
133 |
+ chromium-27.0.1453.65.ebuild, chromium-28.0.1490.2.ebuild, |
134 |
+ chromium-9999-r1.ebuild: |
135 |
+ Disable unmaintained upstream SELinux mode, bug #465574 by swift, bug #467954 |
136 |
+ by Dominik Kriegner. |
137 |
|
138 |
*chromium-28.0.1490.2 (01 May 2013) |
139 |
|
140 |
|
141 |
|
142 |
|
143 |
1.191 www-client/chromium/chromium-9999-r1.ebuild |
144 |
|
145 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.191&view=markup |
146 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.191&content-type=text/plain |
147 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.190&r2=1.191 |
148 |
|
149 |
Index: chromium-9999-r1.ebuild |
150 |
=================================================================== |
151 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v |
152 |
retrieving revision 1.190 |
153 |
retrieving revision 1.191 |
154 |
diff -u -r1.190 -r1.191 |
155 |
--- chromium-9999-r1.ebuild 1 May 2013 21:24:55 -0000 1.190 |
156 |
+++ chromium-9999-r1.ebuild 1 May 2013 21:30:19 -0000 1.191 |
157 |
@@ -1,6 +1,6 @@ |
158 |
# Copyright 1999-2013 Gentoo Foundation |
159 |
# Distributed under the terms of the GNU General Public License v2 |
160 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.190 2013/05/01 21:24:55 phajdan.jr Exp $ |
161 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.191 2013/05/01 21:30:19 phajdan.jr Exp $ |
162 |
|
163 |
EAPI="5" |
164 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
165 |
@@ -69,10 +69,7 @@ |
166 |
x11-libs/libXScrnSaver:= |
167 |
x11-libs/libXtst:= |
168 |
kerberos? ( virtual/krb5 ) |
169 |
- selinux? ( |
170 |
- sec-policy/selinux-chromium |
171 |
- sys-libs/libselinux:= |
172 |
- )" |
173 |
+ selinux? ( sec-policy/selinux-chromium )" |
174 |
DEPEND="${RDEPEND} |
175 |
${PYTHON_DEPS} |
176 |
!arm? ( |
177 |
@@ -167,9 +164,7 @@ |
178 |
# Make sure the build system will use the right python, bug #344367. |
179 |
python-any-r1_pkg_setup |
180 |
|
181 |
- if ! use selinux; then |
182 |
- chromium_suid_sandbox_check_kernel_config |
183 |
- fi |
184 |
+ chromium_suid_sandbox_check_kernel_config |
185 |
|
186 |
if use bindist && ! use system-ffmpeg; then |
187 |
elog "bindist enabled: H.264 video support will be disabled." |
188 |
@@ -326,8 +321,7 @@ |
189 |
$(gyp_use gps linux_use_libgps) |
190 |
$(gyp_use gps linux_link_libgps) |
191 |
$(gyp_use kerberos) |
192 |
- $(gyp_use pulseaudio) |
193 |
- $(gyp_use selinux selinux)" |
194 |
+ $(gyp_use pulseaudio)" |
195 |
|
196 |
if use system-sqlite; then |
197 |
elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/" |
198 |
@@ -350,12 +344,10 @@ |
199 |
myconf+=" |
200 |
-Dusb_ids_path=/usr/share/misc/usb.ids" |
201 |
|
202 |
- if ! use selinux; then |
203 |
- # Enable SUID sandbox. |
204 |
- myconf+=" |
205 |
- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
206 |
- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
207 |
- fi |
208 |
+ # Enable SUID sandbox. |
209 |
+ myconf+=" |
210 |
+ -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
211 |
+ -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
212 |
|
213 |
# Never use bundled gold binary. Disable gold linker flags for now. |
214 |
myconf+=" |
215 |
@@ -423,10 +415,7 @@ |
216 |
test_targets+=" ${x}_unittests" |
217 |
done |
218 |
|
219 |
- local make_targets="chrome chromedriver" |
220 |
- if ! use selinux; then |
221 |
- make_targets+=" chrome_sandbox" |
222 |
- fi |
223 |
+ local make_targets="chrome chrome_sandbox chromedriver" |
224 |
if use test; then |
225 |
make_targets+=" $test_targets" |
226 |
fi |
227 |
@@ -517,10 +506,8 @@ |
228 |
exeinto "${CHROMIUM_HOME}" |
229 |
doexe out/Release/chrome || die |
230 |
|
231 |
- if ! use selinux; then |
232 |
- doexe out/Release/chrome_sandbox || die |
233 |
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
234 |
- fi |
235 |
+ doexe out/Release/chrome_sandbox || die |
236 |
+ fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
237 |
|
238 |
doexe out/Release/chromedriver || die |
239 |
|
240 |
|
241 |
|
242 |
|
243 |
1.2 www-client/chromium/chromium-27.0.1453.65.ebuild |
244 |
|
245 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1453.65.ebuild?rev=1.2&view=markup |
246 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1453.65.ebuild?rev=1.2&content-type=text/plain |
247 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1453.65.ebuild?r1=1.1&r2=1.2 |
248 |
|
249 |
Index: chromium-27.0.1453.65.ebuild |
250 |
=================================================================== |
251 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1453.65.ebuild,v |
252 |
retrieving revision 1.1 |
253 |
retrieving revision 1.2 |
254 |
diff -u -r1.1 -r1.2 |
255 |
--- chromium-27.0.1453.65.ebuild 27 Apr 2013 02:40:46 -0000 1.1 |
256 |
+++ chromium-27.0.1453.65.ebuild 1 May 2013 21:30:19 -0000 1.2 |
257 |
@@ -1,6 +1,6 @@ |
258 |
# Copyright 1999-2013 Gentoo Foundation |
259 |
# Distributed under the terms of the GNU General Public License v2 |
260 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1453.65.ebuild,v 1.1 2013/04/27 02:40:46 floppym Exp $ |
261 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1453.65.ebuild,v 1.2 2013/05/01 21:30:19 phajdan.jr Exp $ |
262 |
|
263 |
EAPI="5" |
264 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
265 |
@@ -70,10 +70,7 @@ |
266 |
x11-libs/libXScrnSaver:= |
267 |
x11-libs/libXtst:= |
268 |
kerberos? ( virtual/krb5 ) |
269 |
- selinux? ( |
270 |
- sec-policy/selinux-chromium |
271 |
- sys-libs/libselinux:= |
272 |
- )" |
273 |
+ selinux? ( sec-policy/selinux-chromium )" |
274 |
DEPEND="${RDEPEND} |
275 |
${PYTHON_DEPS} |
276 |
!arm? ( |
277 |
@@ -110,9 +107,7 @@ |
278 |
# Make sure the build system will use the right python, bug #344367. |
279 |
python-any-r1_pkg_setup |
280 |
|
281 |
- if ! use selinux; then |
282 |
- chromium_suid_sandbox_check_kernel_config |
283 |
- fi |
284 |
+ chromium_suid_sandbox_check_kernel_config |
285 |
|
286 |
if use bindist && ! use system-ffmpeg; then |
287 |
elog "bindist enabled: H.264 video support will be disabled." |
288 |
@@ -278,8 +273,7 @@ |
289 |
$(gyp_use gps linux_use_libgps) |
290 |
$(gyp_use gps linux_link_libgps) |
291 |
$(gyp_use kerberos) |
292 |
- $(gyp_use pulseaudio) |
293 |
- $(gyp_use selinux selinux)" |
294 |
+ $(gyp_use pulseaudio)" |
295 |
|
296 |
if use system-sqlite; then |
297 |
elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/" |
298 |
@@ -301,12 +295,10 @@ |
299 |
myconf+=" |
300 |
-Dusb_ids_path=/usr/share/misc/usb.ids" |
301 |
|
302 |
- if ! use selinux; then |
303 |
- # Enable SUID sandbox. |
304 |
- myconf+=" |
305 |
- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
306 |
- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
307 |
- fi |
308 |
+ # Enable SUID sandbox. |
309 |
+ myconf+=" |
310 |
+ -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
311 |
+ -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
312 |
|
313 |
# Never use bundled gold binary. Disable gold linker flags for now. |
314 |
myconf+=" |
315 |
@@ -373,10 +365,7 @@ |
316 |
test_targets+=" ${x}_unittests" |
317 |
done |
318 |
|
319 |
- local make_targets="chrome chromedriver" |
320 |
- if ! use selinux; then |
321 |
- make_targets+=" chrome_sandbox" |
322 |
- fi |
323 |
+ local make_targets="chrome chrome_sandbox chromedriver" |
324 |
if use test; then |
325 |
make_targets+=" $test_targets" |
326 |
fi |
327 |
@@ -468,10 +457,8 @@ |
328 |
exeinto "${CHROMIUM_HOME}" |
329 |
doexe out/Release/chrome || die |
330 |
|
331 |
- if ! use selinux; then |
332 |
- doexe out/Release/chrome_sandbox || die |
333 |
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
334 |
- fi |
335 |
+ doexe out/Release/chrome_sandbox || die |
336 |
+ fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
337 |
|
338 |
doexe out/Release/chromedriver || die |