Gentoo Archives: gentoo-commits

From: "Ian Stakenvicius (axs)" <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/firefox-bin: firefox-bin-38.0.1-r1.ebuild firefox-bin-31.7.0-r1.ebuild ChangeLog firefox-bin-31.6.0.ebuild firefox-bin-38.0.1.ebuild
Date: Sun, 31 May 2015 14:20:20
Message-Id: 20150531142009.4789BA17@oystercatcher.gentoo.org
1 axs 15/05/31 14:20:09
2
3 Modified: ChangeLog
4 Added: firefox-bin-38.0.1-r1.ebuild
5 firefox-bin-31.7.0-r1.ebuild
6 Removed: firefox-bin-31.6.0.ebuild firefox-bin-38.0.1.ebuild
7 Log:
8 disabled ssl3.dhe_* in prefs to prevent Logjam, bug 550288
9
10 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
11
12 Revision Changes Path
13 1.235 www-client/firefox-bin/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.235&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.235&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?r1=1.234&r2=1.235
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v
22 retrieving revision 1.234
23 retrieving revision 1.235
24 diff -u -r1.234 -r1.235
25 --- ChangeLog 23 May 2015 19:04:31 -0000 1.234
26 +++ ChangeLog 31 May 2015 14:20:09 -0000 1.235
27 @@ -1,6 +1,15 @@
28 # ChangeLog for www-client/firefox-bin
29 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.234 2015/05/23 19:04:31 zlogene Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.235 2015/05/31 14:20:09 axs Exp $
32 +
33 +*firefox-bin-31.7.0-r1 (31 May 2015)
34 +*firefox-bin-38.0.1-r1 (31 May 2015)
35 +
36 + 31 May 2015; Ian Stakenvicius (_AxS_) <axs@g.o>
37 + +files/all-gentoo-1-cve-2015-4000.js, +firefox-bin-31.7.0-r1.ebuild,
38 + +firefox-bin-38.0.1-r1.ebuild, -firefox-bin-31.6.0.ebuild,
39 + -firefox-bin-38.0.1.ebuild:
40 + disabled ssl3.dhe_* in prefs to prevent Logjam, bug 550288
41
42 23 May 2015; Mikle Kolyada <zlogene@g.o> firefox-bin-31.7.0.ebuild:
43 x86 stable wrt bug #549356
44
45
46
47 1.1 www-client/firefox-bin/firefox-bin-38.0.1-r1.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-38.0.1-r1.ebuild?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-38.0.1-r1.ebuild?rev=1.1&content-type=text/plain
51
52 Index: firefox-bin-38.0.1-r1.ebuild
53 ===================================================================
54 # Copyright 1999-2015 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-38.0.1-r1.ebuild,v 1.1 2015/05/31 14:20:09 axs Exp $
57
58 EAPI="5"
59
60 # Can be updated using scripts/get_langs.sh from mozilla overlay
61 # Not officially supported as of yet
62 # csb
63 MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
64 en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
65 gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko lt lv mai mk ml mr nb-NO
66 nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
67 te tr uk vi zh-CN zh-TW)
68
69 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
70 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
71 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
72 MOZ_PN="${PN/-bin}"
73 MOZ_P="${MOZ_PN}-${MOZ_PV}"
74
75 # Upstream ftp release URI that's used by mozlinguas.eclass
76 # We don't use the http mirror because it deletes old tarballs.
77 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
78
79 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
80
81 DESCRIPTION="Firefox Web Browser"
82 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
83 SRC_URI="${SRC_URI}
84 amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
85 x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
86 HOMEPAGE="http://www.mozilla.com/firefox"
87 RESTRICT="strip mirror"
88
89 KEYWORDS="-* ~amd64 ~x86"
90 SLOT="0"
91 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
92 IUSE="selinux startup-notification"
93
94 DEPEND="app-arch/unzip"
95 RDEPEND="dev-libs/atk
96 >=sys-apps/dbus-0.60
97 >=dev-libs/dbus-glib-0.72
98 >=dev-libs/glib-2.26:2
99 >=media-libs/alsa-lib-1.0.16
100 media-libs/fontconfig
101 >=media-libs/freetype-2.4.10
102 >=x11-libs/cairo-1.10[X]
103 x11-libs/gdk-pixbuf
104 >=x11-libs/gtk+-2.14:2
105 x11-libs/libX11
106 x11-libs/libXcomposite
107 x11-libs/libXdamage
108 x11-libs/libXext
109 x11-libs/libXfixes
110 x11-libs/libXrender
111 x11-libs/libXt
112 >=x11-libs/pango-1.22.0
113 virtual/freedesktop-icon-theme
114 selinux? ( sec-policy/selinux-mozilla )
115 "
116
117 QA_PREBUILT="
118 opt/${MOZ_PN}/*.so
119 opt/${MOZ_PN}/${MOZ_PN}
120 opt/${MOZ_PN}/${PN}
121 opt/${MOZ_PN}/crashreporter
122 opt/${MOZ_PN}/webapprt-stub
123 opt/${MOZ_PN}/plugin-container
124 opt/${MOZ_PN}/mozilla-xremote-client
125 opt/${MOZ_PN}/updater
126 "
127
128 S="${WORKDIR}/${MOZ_PN}"
129
130 src_unpack() {
131 unpack ${A}
132
133 # Unpack language packs
134 mozlinguas_src_unpack
135 }
136
137 src_install() {
138 declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
139
140 local size sizes icon_path icon name
141 sizes="16 32 48"
142 icon_path="${S}/browser/chrome/icons/default"
143 icon="${PN}"
144 name="Mozilla Firefox"
145
146 # Install icons and .desktop for menu entry
147 for size in ${sizes}; do
148 insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
149 newins "${icon_path}/default${size}.png" "${icon}.png" || die
150 done
151 # The 128x128 icon has a different name
152 insinto "/usr/share/icons/hicolor/128x128/apps"
153 newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
154 # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
155 newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
156 domenu "${FILESDIR}"/${PN}.desktop
157 sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
158 "${ED}/usr/share/applications/${PN}.desktop" || die
159
160 # Add StartupNotify=true bug 237317
161 if use startup-notification; then
162 echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
163 fi
164
165 # Install firefox in /opt
166 dodir ${MOZILLA_FIVE_HOME%/*}
167 mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
168
169 # Fix prefs that make no sense for a system-wide install
170 insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
171 doins "${FILESDIR}"/local-settings.js
172 # Copy preferences file so we can do a simple rename.
173 cp "${FILESDIR}"/all-gentoo-1-cve-2015-4000.js "${D}"${MOZILLA_FIVE_HOME}/all-gentoo.js
174
175 # Install language packs
176 mozlinguas_src_install
177
178 local LANG=${linguas%% *}
179 if [[ -n ${LANG} && ${LANG} != "en" ]]; then
180 elog "Setting default locale to ${LANG}"
181 echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
182 >> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
183 die "sed failed to change locale"
184 fi
185
186 # Create /usr/bin/firefox-bin
187 dodir /usr/bin/
188 cat <<-EOF >"${D}"/usr/bin/${PN}
189 #!/bin/sh
190 unset LD_PRELOAD
191 LD_LIBRARY_PATH="/opt/firefox/"
192 GTK_PATH=/usr/lib/gtk-2.0/
193 exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
194 EOF
195 fperms 0755 /usr/bin/${PN}
196
197 # revdep-rebuild entry
198 insinto /etc/revdep-rebuild
199 echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
200 doins "${T}"/10${PN} || die
201
202 # Plugins dir
203 share_plugins_dir
204
205 # Required in order to use plugins and even run firefox on hardened.
206 pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
207 }
208
209 pkg_preinst() {
210 gnome2_icon_savelist
211 }
212
213 pkg_postinst() {
214 if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
215 || ! has_version 'net-misc/curl'; then
216 einfo
217 einfo "For using the crashreporter, you need gnome-base/gconf,"
218 einfo "gnome-base/orbit and net-misc/curl emerged."
219 einfo
220 fi
221 # Drop requirement of curl not built with nss as it's not necessary anymore
222 #if has_version 'net-misc/curl[nss]'; then
223 # einfo
224 # einfo "Crashreporter won't be able to send reports"
225 # einfo "if you have curl emerged with the nss USE-flag"
226 # einfo
227 #fi
228
229 # Update mimedb for the new .desktop file
230 fdo-mime_desktop_database_update
231 gnome2_icon_cache_update
232 }
233
234 pkg_postrm() {
235 gnome2_icon_cache_update
236 }
237
238
239
240 1.1 www-client/firefox-bin/firefox-bin-31.7.0-r1.ebuild
241
242 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-31.7.0-r1.ebuild?rev=1.1&view=markup
243 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-31.7.0-r1.ebuild?rev=1.1&content-type=text/plain
244
245 Index: firefox-bin-31.7.0-r1.ebuild
246 ===================================================================
247 # Copyright 1999-2015 Gentoo Foundation
248 # Distributed under the terms of the GNU General Public License v2
249 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-31.7.0-r1.ebuild,v 1.1 2015/05/31 14:20:09 axs Exp $
250
251 EAPI="5"
252 MOZ_ESR="1"
253
254 # Can be updated using scripts/get_langs.sh from mozilla overlay
255 MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
256 en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
257 gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lt lv mai mk ml mr nb-NO
258 nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
259 te tr uk vi zh-CN zh-TW zu)
260
261 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
262 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
263 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
264 MOZ_PN="${PN/-bin}"
265 if [[ ${MOZ_ESR} == 1 ]]; then
266 # ESR releases have slightly version numbers
267 MOZ_PV="${MOZ_PV}esr"
268 fi
269 MOZ_P="${MOZ_PN}-${MOZ_PV}"
270
271 # Upstream ftp release URI that's used by mozlinguas.eclass
272 # We don't use the http mirror because it deletes old tarballs.
273 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
274
275 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
276
277 DESCRIPTION="Firefox Web Browser"
278 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
279 SRC_URI="${SRC_URI}
280 amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
281 x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
282 HOMEPAGE="http://www.mozilla.com/firefox"
283 RESTRICT="strip mirror"
284
285 KEYWORDS="-* ~amd64 ~x86"
286 SLOT="0"
287 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
288 IUSE="selinux startup-notification"
289
290 DEPEND="app-arch/unzip"
291 RDEPEND="dev-libs/atk
292 >=dev-libs/dbus-glib-0.72
293 dev-libs/glib:2
294 >=media-libs/alsa-lib-1.0.16
295 media-libs/fontconfig
296 >=media-libs/freetype-2.4.10:2
297 >=sys-apps/dbus-0.60
298 >=x11-libs/cairo-1.10[X]
299 x11-libs/gdk-pixbuf:2
300 >=x11-libs/gtk+-2.14:2
301 x11-libs/libX11
302 x11-libs/libXext
303 x11-libs/libXrender
304 x11-libs/libXt
305 >=x11-libs/pango-1.22.0
306 virtual/freedesktop-icon-theme
307 selinux? ( sec-policy/selinux-mozilla )
308 "
309
310 QA_PREBUILT="
311 opt/${MOZ_PN}/*.so
312 opt/${MOZ_PN}/${MOZ_PN}
313 opt/${MOZ_PN}/${PN}
314 opt/${MOZ_PN}/crashreporter
315 opt/${MOZ_PN}/webapprt-stub
316 opt/${MOZ_PN}/plugin-container
317 opt/${MOZ_PN}/mozilla-xremote-client
318 opt/${MOZ_PN}/updater
319 "
320
321 S="${WORKDIR}/${MOZ_PN}"
322
323 src_unpack() {
324 unpack ${A}
325
326 # Unpack language packs
327 mozlinguas_src_unpack
328 }
329
330 src_install() {
331 declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
332
333 local size sizes icon_path icon name
334 sizes="16 32 48"
335 icon_path="${S}/browser/chrome/icons/default"
336 icon="${PN}"
337 name="Mozilla Firefox"
338
339 # Install icons and .desktop for menu entry
340 for size in ${sizes}; do
341 insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
342 newins "${icon_path}/default${size}.png" "${icon}.png" || die
343 done
344 # The 128x128 icon has a different name
345 insinto "/usr/share/icons/hicolor/128x128/apps"
346 newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
347 # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
348 newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
349 domenu "${FILESDIR}"/${PN}.desktop
350 sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
351 "${ED}/usr/share/applications/${PN}.desktop" || die
352
353 # Add StartupNotify=true bug 237317
354 if use startup-notification; then
355 echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
356 fi
357
358 # Install firefox in /opt
359 dodir ${MOZILLA_FIVE_HOME%/*}
360 mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
361
362 # Fix prefs that make no sense for a system-wide install
363 insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
364 doins "${FILESDIR}"/local-settings.js
365 # Copy preferences file so we can do a simple rename.
366 cp "${FILESDIR}"/all-gentoo-1-cve-2015-4000.js "${D}"${MOZILLA_FIVE_HOME}/all-gentoo.js
367
368 # Install language packs
369 mozlinguas_src_install
370
371 local LANG=${linguas%% *}
372 if [[ -n ${LANG} && ${LANG} != "en" ]]; then
373 elog "Setting default locale to ${LANG}"
374 echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
375 >> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
376 die "sed failed to change locale"
377 fi
378
379 # Create /usr/bin/firefox-bin
380 dodir /usr/bin/
381 cat <<-EOF >"${D}"/usr/bin/${PN}
382 #!/bin/sh
383 unset LD_PRELOAD
384 LD_LIBRARY_PATH="/opt/firefox/"
385 GTK_PATH=/usr/lib/gtk-2.0/
386 exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
387 EOF
388 fperms 0755 /usr/bin/${PN}
389
390 # revdep-rebuild entry
391 insinto /etc/revdep-rebuild
392 echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
393 doins "${T}"/10${PN} || die
394
395 # Plugins dir
396 share_plugins_dir
397
398 # Required in order to use plugins and even run firefox on hardened.
399 pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
400 }
401
402 pkg_preinst() {
403 gnome2_icon_savelist
404 }
405
406 pkg_postinst() {
407 if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
408 || ! has_version 'net-misc/curl'; then
409 einfo
410 einfo "For using the crashreporter, you need gnome-base/gconf,"
411 einfo "gnome-base/orbit and net-misc/curl emerged."
412 einfo
413 fi
414 # Drop requirement of curl not built with nss as it's not necessary anymore
415 #if has_version 'net-misc/curl[nss]'; then
416 # einfo
417 # einfo "Crashreporter won't be able to send reports"
418 # einfo "if you have curl emerged with the nss USE-flag"
419 # einfo
420 #fi
421
422 # Update mimedb for the new .desktop file
423 fdo-mime_desktop_database_update
424 gnome2_icon_cache_update
425 }
426
427 pkg_postrm() {
428 gnome2_icon_cache_update
429 }