1 |
anarchy 09/10/29 00:31:55 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mozilla-firefox-3.5.4.ebuild |
5 |
Log: |
6 |
update for security fixes |
7 |
(Portage version: 2.1.7.1/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.559 www-client/mozilla-firefox/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.559&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.559&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?r1=1.558&r2=1.559 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v |
19 |
retrieving revision 1.558 |
20 |
retrieving revision 1.559 |
21 |
diff -u -r1.558 -r1.559 |
22 |
--- ChangeLog 25 Oct 2009 20:11:45 -0000 1.558 |
23 |
+++ ChangeLog 29 Oct 2009 00:31:55 -0000 1.559 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for www-client/mozilla-firefox |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.558 2009/10/25 20:11:45 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.559 2009/10/29 00:31:55 anarchy Exp $ |
29 |
+ |
30 |
+*mozilla-firefox-3.5.4 (29 Oct 2009) |
31 |
+ |
32 |
+ 29 Oct 2009; Jory A. Pratt <anarchy@g.o> |
33 |
+ +mozilla-firefox-3.5.4.ebuild: |
34 |
+ update for security bugs |
35 |
|
36 |
25 Oct 2009; Samuli Suominen <ssuominen@g.o> |
37 |
-mozilla-firefox-3.5.2-r3.ebuild, mozilla-firefox-3.5.3-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: mozilla-firefox-3.5.4.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild,v 1.1 2009/10/29 00:31:55 anarchy Exp $ |
51 |
EAPI="2" |
52 |
WANT_AUTOCONF="2.1" |
53 |
|
54 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension |
55 |
|
56 |
LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR |
57 |
es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja |
58 |
ka kk kn ko ku lt lv mk ml mn mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro |
59 |
ru si sk sl sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW" |
60 |
NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" |
61 |
|
62 |
XUL_PV="1.9.1.3" |
63 |
MAJ_XUL_PV="1.9.1" |
64 |
MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff |
65 |
DESKTOP_PV="3.5" |
66 |
MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI |
67 |
MY_PV="${PV/_/}" # Handle rcs for SRC_URI |
68 |
PATCH="${PN}-3.5.2-patches-0.1" |
69 |
|
70 |
DESCRIPTION="Firefox Web Browser" |
71 |
HOMEPAGE="http://www.mozilla.com/firefox" |
72 |
|
73 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86" |
74 |
SLOT="0" |
75 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
76 |
IUSE="+alsa bindist java mozdevelop restrict-javascript -sqlite iceweasel" # qt-experimental |
77 |
|
78 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" |
79 |
SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 |
80 |
http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" |
81 |
|
82 |
for X in ${LANGS} ; do |
83 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
84 |
SRC_URI="${SRC_URI} |
85 |
linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
86 |
fi |
87 |
IUSE="${IUSE} linguas_${X/-/_}" |
88 |
# english is handled internally |
89 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
90 |
if [ "${X}" != "en-US" ]; then |
91 |
SRC_URI="${SRC_URI} |
92 |
linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
93 |
fi |
94 |
IUSE="${IUSE} linguas_${X%%-*}" |
95 |
fi |
96 |
done |
97 |
|
98 |
# Not working. |
99 |
# qt-experimental? ( |
100 |
# x11-libs/qt-gui |
101 |
# x11-libs/qt-core ) |
102 |
# =net-libs/xulrunner-${XUL_PV}*[java=,qt-experimental=] |
103 |
|
104 |
RDEPEND=" |
105 |
>=sys-devel/binutils-2.16.1 |
106 |
>=dev-libs/nss-3.12.2 |
107 |
>=dev-libs/nspr-4.7.3 |
108 |
>=app-text/hunspell-1.2 |
109 |
sqlite? ( >=dev-db/sqlite-3.6.10 ) |
110 |
alsa? ( media-libs/alsa-lib ) |
111 |
>=net-libs/xulrunner-${XUL_PV}[java=,sqlite=] |
112 |
>=x11-libs/cairo-1.8.8[X] |
113 |
x11-libs/pango[X]" |
114 |
|
115 |
DEPEND="${RDEPEND} |
116 |
dev-util/pkgconfig" |
117 |
|
118 |
PDEPEND="restrict-javascript? ( >=www-plugins/noscript-1.9.6.6 )" |
119 |
|
120 |
S="${WORKDIR}/mozilla-1.9.1" |
121 |
|
122 |
# Needed by src_compile() and src_install(). |
123 |
# Would do in pkg_setup but that loses the export attribute, they |
124 |
# become pure shell variables. |
125 |
export BUILD_OFFICIAL=1 |
126 |
export MOZILLA_OFFICIAL=1 |
127 |
|
128 |
linguas() { |
129 |
local LANG SLANG |
130 |
for LANG in ${LINGUAS}; do |
131 |
if has ${LANG} en en_US; then |
132 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
133 |
continue |
134 |
elif has ${LANG} ${LANGS//-/_}; then |
135 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
136 |
continue |
137 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
138 |
for X in ${LANGS}; do |
139 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
140 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
141 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
142 |
continue 2 |
143 |
fi |
144 |
done |
145 |
fi |
146 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
147 |
done |
148 |
} |
149 |
|
150 |
pkg_setup() { |
151 |
if ! use bindist ; then |
152 |
elog "You are enabling official branding. You may not redistribute this build" |
153 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
154 |
elog "a legal problem with Mozilla Foundation" |
155 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
156 |
fi |
157 |
|
158 |
if use iceweasel ; then |
159 |
elog "You have enabled iceweasel useflag which does nothing in current ebuild." |
160 |
elog "Please 'emerge -C mozilla-firefox; emerge icecat' if you wish to have same support" |
161 |
elog "as you currently had with iceweasel useflag." |
162 |
eerror "Please 'emerge -C mozilla-firefox; emerge icecat' to have a same support" |
163 |
fi |
164 |
} |
165 |
|
166 |
src_unpack() { |
167 |
unpack ${A} |
168 |
|
169 |
linguas |
170 |
for X in ${linguas}; do |
171 |
# FIXME: Add support for unpacking xpis to portage |
172 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
173 |
done |
174 |
if [[ ${linguas} != "" && ${linguas} != "en" ]]; then |
175 |
einfo "Selected language packs (first will be default): ${linguas}" |
176 |
fi |
177 |
} |
178 |
|
179 |
src_prepare() { |
180 |
# Apply our patches |
181 |
EPATCH_SUFFIX="patch" \ |
182 |
EPATCH_FORCE="yes" \ |
183 |
epatch "${WORKDIR}" |
184 |
|
185 |
eautoreconf |
186 |
|
187 |
cd js/src |
188 |
eautoreconf |
189 |
|
190 |
# We need to re-patch this because autoreconf overwrites it |
191 |
epatch "${FILESDIR}/000_flex-configure-LANG.patch" |
192 |
} |
193 |
|
194 |
src_configure() { |
195 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
196 |
MEXTENSIONS="default" |
197 |
|
198 |
#################################### |
199 |
# |
200 |
# mozconfig, CFLAGS and CXXFLAGS setup |
201 |
# |
202 |
#################################### |
203 |
|
204 |
mozconfig_init |
205 |
mozconfig_config |
206 |
|
207 |
# It doesn't compile on alpha without this LDFLAGS |
208 |
use alpha && append-ldflags "-Wl,--no-relax" |
209 |
|
210 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
211 |
mozconfig_annotate '' --enable-application=browser |
212 |
mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 |
213 |
mozconfig_annotate '' --disable-mailnews |
214 |
mozconfig_annotate 'broken' --disable-crashreporter |
215 |
mozconfig_annotate '' --enable-image-encoder=all |
216 |
mozconfig_annotate '' --enable-canvas |
217 |
# Bug 60668: Galeon doesn't build without oji enabled, so enable it |
218 |
# regardless of java setting. |
219 |
mozconfig_annotate '' --enable-oji --enable-mathml |
220 |
mozconfig_annotate 'places' --enable-storage --enable-places |
221 |
mozconfig_annotate '' --enable-safe-browsing |
222 |
|
223 |
# System-wide install specs |
224 |
mozconfig_annotate '' --disable-installer |
225 |
mozconfig_annotate '' --disable-updater |
226 |
mozconfig_annotate '' --disable-strip |
227 |
mozconfig_annotate '' --disable-install-strip |
228 |
|
229 |
# Use system libraries |
230 |
mozconfig_annotate '' --enable-system-cairo |
231 |
mozconfig_annotate '' --enable-system-hunspell |
232 |
mozconfig_annotate '' --with-system-nspr |
233 |
mozconfig_annotate '' --with-system-nss |
234 |
mozconfig_annotate '' --enable-system-lcms |
235 |
mozconfig_annotate '' --with-system-bz2 |
236 |
mozconfig_annotate '' --with-system-libxul |
237 |
mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV} |
238 |
|
239 |
# Enable/Disable based on useflag |
240 |
mozconfig_use_enable sqlite system-sqlite |
241 |
mozconfig_use_enable mozdevelop jsd |
242 |
mozconfig_use_enable mozdevelop xpctools |
243 |
mozconfig_use_enable alsa ogg |
244 |
mozconfig_use_enable alsa wave |
245 |
|
246 |
if ! use bindist ; then |
247 |
mozconfig_annotate '' --enable-official-branding |
248 |
fi |
249 |
|
250 |
# Finalize and report settings |
251 |
mozconfig_final |
252 |
|
253 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
254 |
append-cxxflags -fno-stack-protector |
255 |
fi |
256 |
|
257 |
#################################### |
258 |
# |
259 |
# Configure and build |
260 |
# |
261 |
#################################### |
262 |
|
263 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf |
264 |
} |
265 |
|
266 |
src_compile() { |
267 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
268 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
269 |
emake ${jobs} || die |
270 |
} |
271 |
|
272 |
src_install() { |
273 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
274 |
|
275 |
emake DESTDIR="${D}" install || die "emake install failed" |
276 |
|
277 |
linguas |
278 |
for X in ${linguas}; do |
279 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" |
280 |
done |
281 |
|
282 |
# Install icon and .desktop for menu entry |
283 |
if ! use bindist ; then |
284 |
newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png |
285 |
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ |
286 |
${PN}-${DESKTOP_PV}.desktop |
287 |
else |
288 |
newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png |
289 |
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ |
290 |
${PN}-${DESKTOP_PV}.desktop |
291 |
sed -i -e "s:Bon Echo:Shiretoko:" \ |
292 |
"${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!" |
293 |
fi |
294 |
|
295 |
# Add StartupNotify=true bug 237317 |
296 |
if use startup-notification ; then |
297 |
echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop |
298 |
fi |
299 |
|
300 |
pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/firefox |
301 |
|
302 |
# Enable very specific settings not inherited from xulrunner |
303 |
cp "${FILESDIR}"/firefox-default-prefs.js \ |
304 |
"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ |
305 |
die "failed to cp xulrunner-default-prefs.js" |
306 |
|
307 |
# Plugins dir |
308 |
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ |
309 |
|| die "failed to symlink" |
310 |
} |
311 |
|
312 |
pkg_postinst() { |
313 |
ewarn "All the packages built against ${PN} won't compile," |
314 |
ewarn "any package that fails to build warrants a bug report." |
315 |
elog |
316 |
|
317 |
# Update mimedb for the new .desktop file |
318 |
fdo-mime_desktop_database_update |
319 |
} |