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