Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/
Date: Tue, 04 Oct 2016 20:58:51
Message-Id: 1475614715.2c295d1491240cea85d1d291390e0ecdd8c39857.axs@gentoo
1 commit: 2c295d1491240cea85d1d291390e0ecdd8c39857
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 4 20:50:59 2016 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 4 20:58:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c295d14
7
8 mail-client/thunderbird: remove old/vuln 45.3.0-r2
9
10 Package-Manager: portage-2.2.28
11
12 mail-client/thunderbird/Manifest | 1 -
13 .../thunderbird/thunderbird-45.3.0-r2.ebuild | 390 ---------------------
14 2 files changed, 391 deletions(-)
15
16 diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
17 index f8a67b5..aa973df 100644
18 --- a/mail-client/thunderbird/Manifest
19 +++ b/mail-client/thunderbird/Manifest
20 @@ -15,7 +15,6 @@ DIST lightning-2.6.5.xpi 3645840 SHA256 c4bc84f7e21148d6d06f4f61de70c7b4e331b53d
21 DIST lightning-3.3.xpi 4226096 SHA256 eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34 WHIRLPOOL abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
22 DIST lightning-4.0.8.tar.xz 2307984 SHA256 7a0e2550edf3d5a6d8e2566dc20f20630c8cd6eda0fcbffaf554ef88a7d46eba SHA512 4e03f42dda58b6bbed79adcf050ca7b5e8cfc82befde22d4a0a029e5187204d40a731907259cbe41adc8b813ed7a2bfccfd4ce91b1ff05c107c8eb3ec4e4ef32 WHIRLPOOL 196ecfa01932ac1d153baa231023b3cb970ef33e55b8193ff420ff58e2d0b55e72376a993ac6712faaf995c1c239a63cebff14369adba479d1451dbc0126e4c0
23 DIST lightning-4.7.2.tar.xz 1927008 SHA256 55a2c26941834600364aec1444443797662e92a6a8203c4f5f2b315830755d80 SHA512 878fa278b8f8a6b7733e81aed0864104ef3c60d0236b729c71cc5e4e453b97255c3e4e4140c053e1ceb586142c46ee57b21539e23256a0bf78b6b8628405de88 WHIRLPOOL 53979b914e944f9026ae9d93b9ced6e69d9872ed4f7f385037fbc5314ad496deb489bc1d6435cf27aa74d9db4f615fe17a06ba022daa496f4d2de30aa2bfb48f
24 -DIST lightning-4.7.3.repack.tar.xz 1927348 SHA256 1602f5f7d0e51161ca2057ad3b7f77c976c5d6c9ef6a852afa607fc32fd9af61 SHA512 19b66daeba7686ba59942e582ba5ae5feb8215ea97f1580cf42347b3ebcc4947775e40975b728091d0515051e5fcee01d73b29f78dc243c17dd1f0077f0d1627 WHIRLPOOL 0da115a00ad2be42999d316663ac45369d3157c344127e7b14f66b42354363b890a5087d01d44de5b87bd9499d7e20060da1d3e7e9d64629fae17ae0698bb9d1
25 DIST lightning-4.7.3.tar.xz 1134460 SHA256 8834c59a58797af747805f9a67ebcc311607a98bea4d185689d7c35f024bce7b SHA512 ebca7d74413a15f404ce094e5a4d047d79f250a04c6c1e78a3ab5aa49946e1e1ac81a1f7703bf2e631d841b98df66a21982788ee15af14eefe1d51eca29e1d48 WHIRLPOOL 34a28dcf707fe564433a663c2ac3efc79dff409cf22383425f38d4ac06184ac980f35a6ee81ab8e9d7030189538188ffe2d5fa426e0aa1cb8a11ebe6191a5fd1
26 DIST lightning-4.7.4.tar.xz 1927800 SHA256 24310e7ef2e5dfdf35c52cce4480553c1641368558f1c388e8ba3a99d4c8f2f2 SHA512 65b398d71897a942cae30924de15ae47e2fed83cb70a58b3d99271246eaaabf48703a1b8b5ea74799bf66a4908df56ae2fa75422f62979036f1d322fe77fdae1 WHIRLPOOL 499deb17bf2cb28b028dd68f41c973185282703dc87963ae5df60d81f8e8004feda9a9e5ec202f94ddf87249402e78679330ddd74e51347a12702d005d2ddf38
27 DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
28
29 diff --git a/mail-client/thunderbird/thunderbird-45.3.0-r2.ebuild b/mail-client/thunderbird/thunderbird-45.3.0-r2.ebuild
30 deleted file mode 100644
31 index a23cb2f..00000000
32 --- a/mail-client/thunderbird/thunderbird-45.3.0-r2.ebuild
33 +++ /dev/null
34 @@ -1,390 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=6
40 -WANT_AUTOCONF="2.1"
41 -MOZ_ESR=""
42 -MOZ_LIGHTNING_VER="4.7.3"
43 -MOZ_LIGHTNING_GDATA_VER="2.6"
44 -
45 -# This list can be updated using scripts/get_langs.sh from the mozilla overlay
46 -MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
47 -es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
48 -nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
49 -uk vi zh-CN zh-TW )
50 -
51 -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
52 -MOZ_PV="${PV/_beta/b}"
53 -# ESR releases have slightly version numbers
54 -if [[ ${MOZ_ESR} == 1 ]]; then
55 - MOZ_PV="${MOZ_PV}esr"
56 -fi
57 -MOZ_P="${PN}-${MOZ_PV}"
58 -
59 -# Enigmail version
60 -EMVER="1.9.1"
61 -
62 -# Patches
63 -PATCH="thunderbird-38.0-patches-0.1"
64 -PATCHFF="firefox-45.0-patches-06"
65 -
66 -MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
67 -
68 -MOZCONFIG_OPTIONAL_JIT="enabled"
69 -inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 fdo-mime gnome2-utils
70 -
71 -DESCRIPTION="Thunderbird Mail Client"
72 -HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
73 -
74 -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
75 -SLOT="0"
76 -LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
77 -IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
78 -RESTRICT="!bindist? ( bindist )"
79 -
80 -PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
81 -SRC_URI="${SRC_URI}
82 - ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
83 - https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.repack.tar.xz
84 - lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}-r1.tar.xz )
85 - crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
86 - ${PATCH_URIS[@]}"
87 -
88 -ASM_DEPEND=">=dev-lang/yasm-1.1"
89 -
90 -CDEPEND="
91 - >=dev-libs/nss-3.21.1
92 - >=dev-libs/nspr-4.12
93 - !x11-plugins/enigmail
94 - crypt? ( || (
95 - ( >=app-crypt/gnupg-2.0
96 - || (
97 - app-crypt/pinentry[gtk(-)]
98 - app-crypt/pinentry[qt4(-)]
99 - app-crypt/pinentry[qt5(-)]
100 - )
101 - )
102 - =app-crypt/gnupg-1.4*
103 - ) )"
104 -
105 -DEPEND="${CDEPEND}
106 - amd64? ( ${ASM_DEPEND}
107 - virtual/opengl )
108 - x86? ( ${ASM_DEPEND}
109 - virtual/opengl )"
110 -
111 -RDEPEND="${CDEPEND}
112 - selinux? ( sec-policy/selinux-thunderbird )
113 -"
114 -
115 -S="${WORKDIR}/${MOZ_P}"
116 -
117 -BUILD_OBJ_DIR="${S}/tbird"
118 -
119 -pkg_setup() {
120 - moz_pkgsetup
121 -
122 - export MOZILLA_DIR="${S}/mozilla"
123 -
124 - if ! use bindist ; then
125 - elog "You are enabling official branding. You may not redistribute this build"
126 - elog "to any users on your network or the internet. Doing so puts yourself into"
127 - elog "a legal problem with Mozilla Foundation"
128 - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
129 - elog
130 - fi
131 -}
132 -
133 -pkg_pretend() {
134 - # Ensure we have enough disk space to compile
135 - CHECKREQS_DISK_BUILD="4G"
136 - check-reqs_pkg_setup
137 -
138 - if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
139 - ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
140 - ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
141 - ewarn "Please ensure you know what you are doing. If you don't, please consider"
142 - ewarn "emerging the package with USE=-jit"
143 - fi
144 -}
145 -
146 -src_unpack() {
147 - unpack ${A}
148 -
149 - # Unpack language packs
150 - mozlinguas_src_unpack
151 -
152 - # this version of lightning is a .tar.xz, no xpi needed
153 - #xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
154 -
155 - # this version of gdata-provider is a .tar.xz , no xpi needed
156 - #use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
157 -}
158 -
159 -src_prepare() {
160 - # Apply our Thunderbird patchset
161 - rm -f "${WORKDIR}"/thunderbird/2001_ldap_respect_cflags.patch
162 - eapply "${WORKDIR}/thunderbird"
163 -
164 - # Apply our patchset from firefox to thunderbird as well
165 - pushd "${S}"/mozilla &>/dev/null || die
166 - eapply "${WORKDIR}/firefox"
167 - popd &>/dev/null || die
168 -
169 - # Ensure that are plugins dir is enabled as default
170 - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
171 - "${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
172 - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
173 - "${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
174 -
175 - # Don't exit with error when some libs are missing which we have in
176 - # system.
177 - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
178 - -i "${S}"/mail/installer/Makefile.in || die
179 -
180 - # Don't error out when there's no files to be removed:
181 - sed 's@\(xargs rm\)$@\1 -f@' \
182 - -i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
183 -
184 - # Shell scripts sometimes contain DOS line endings; bug 391889
185 - grep -rlZ --include="*.sh" $'\r$' . |
186 - while read -r -d $'\0' file ; do
187 - einfo edos2unix "${file}"
188 - edos2unix "${file}"
189 - done
190 -
191 - # Allow user to apply any additional patches without modifing ebuild
192 - eapply_user
193 -
194 - # Confirm the version of lightning being grabbed for langpacks is the same
195 - # as that used in thunderbird
196 - local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
197 - if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
198 - eqawarn "The version of lightning used for localization differs from the version"
199 - eqawarn "in thunderbird. Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
200 - eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
201 - fi
202 -
203 - eautoreconf
204 - # Ensure we run eautoreconf in mozilla to regenerate configure
205 - cd "${S}"/mozilla || die
206 - eautoconf
207 - cd "${S}"/mozilla/js/src || die
208 - eautoconf
209 -}
210 -
211 -src_configure() {
212 - MEXTENSIONS="default"
213 -
214 - ####################################
215 - #
216 - # mozconfig, CFLAGS and CXXFLAGS setup
217 - #
218 - ####################################
219 -
220 - mozconfig_init
221 - mozconfig_config
222 -
223 - # It doesn't compile on alpha without this LDFLAGS
224 - use alpha && append-ldflags "-Wl,--no-relax"
225 -
226 - # Add full relro support for hardened
227 - use hardened && append-ldflags "-Wl,-z,relro,-z,now"
228 -
229 - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
230 - mozconfig_annotate '' --disable-mailnews
231 - mozconfig_annotate '' --enable-calendar
232 -
233 - # Other tb-specific settings
234 - mozconfig_annotate '' --with-user-appdir=.thunderbird
235 -
236 - mozconfig_use_enable ldap
237 -
238 - mozlinguas_mozconfig
239 -
240 - # Bug #72667
241 - if use mozdom; then
242 - MEXTENSIONS="${MEXTENSIONS},inspector"
243 - fi
244 -
245 - # Use an objdir to keep things organized.
246 - echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
247 -
248 - # Finalize and report settings
249 - mozconfig_final
250 -
251 - ####################################
252 - #
253 - # Configure and build
254 - #
255 - ####################################
256 -
257 - # Disable no-print-directory
258 - MAKEOPTS=${MAKEOPTS/--no-print-directory/}
259 -
260 - if [[ $(gcc-major-version) -lt 4 ]]; then
261 - append-cxxflags -fno-stack-protector
262 - fi
263 -
264 - if use crypt; then
265 - pushd "${WORKDIR}"/enigmail &>/dev/null ||die
266 - econf
267 - popd &>/dev/null ||die
268 - fi
269 -}
270 -
271 -src_compile() {
272 - mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
273 -
274 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
275 - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
276 - emake -f "${S}"/client.mk
277 -
278 - # Only build enigmail extension if crypt enabled.
279 - if use crypt ; then
280 - einfo "Building enigmail"
281 - pushd "${WORKDIR}"/enigmail &>/dev/null || die
282 - emake -j1
283 - emake -j1 xpi
284 - popd &>/dev/null || die
285 - fi
286 -}
287 -
288 -src_install() {
289 - declare emid
290 - cd "${BUILD_OBJ_DIR}" || die
291 -
292 - # Copy our preference before omnijar is created.
293 - cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
294 - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
295 - || die
296 -
297 - mozconfig_install_prefs \
298 - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
299 -
300 - # dev-db/sqlite does not have FTS3_TOKENIZER support.
301 - # gloda needs it to function, and bad crashes happen when its enabled and doesn't work
302 - if in_iuse system-sqlite && use system-sqlite ; then
303 - echo "lockPref(\"mailnews.database.global.indexer.enabled\", false);" \
304 - >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
305 - fi
306 -
307 - # Pax mark xpcshell for hardened support, only used for startupcache creation.
308 - pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
309 -
310 - MOZ_MAKE_FLAGS="${MAKEOPTS}" \
311 - emake DESTDIR="${D}" install
312 -
313 - # Install language packs
314 - mozlinguas_src_install
315 -
316 - local size sizes icon_path icon
317 - if ! use bindist; then
318 - icon_path="${S}/other-licenses/branding/thunderbird"
319 - icon="${PN}-icon"
320 -
321 - domenu "${FILESDIR}"/icon/${PN}.desktop
322 - else
323 - icon_path="${S}/mail/branding/aurora"
324 - icon="${PN}-icon-unbranded"
325 -
326 - newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
327 - ${PN}.desktop
328 -
329 - sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
330 - "${ED}"/usr/share/applications/${PN}.desktop
331 - fi
332 -
333 - # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
334 - newicon "${icon_path}"/mailicon48.png "${icon}".png
335 - # Install icons for menu entry
336 - sizes="16 22 24 32 48 256"
337 - for size in ${sizes}; do
338 - newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
339 - done
340 -
341 - local emid
342 - # stage extra locales for lightning and install over existing
343 - mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
344 - "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
345 -
346 - emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
347 - mkdir -p "${T}/${emid}" || die
348 - cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
349 - insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
350 - doins -r "${T}/${emid}"
351 -
352 - if use lightning; then
353 - # move lightning out of distribution/extensions and into extensions for app-global install
354 - mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
355 -
356 - # stage extra locales for gdata-provider and install app-global
357 - mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
358 - "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
359 - emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
360 - mkdir -p "${T}/${emid}" || die
361 - cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
362 - insinto ${MOZILLA_FIVE_HOME}/extensions
363 - doins -r "${T}/${emid}"
364 - fi
365 -
366 - if use crypt ; then
367 - local enigmail_xpipath="${WORKDIR}/enigmail/build"
368 - cd "${T}" || die
369 - unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
370 - emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
371 -
372 - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
373 - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
374 - unzip "${enigmail_xpipath}"/enigmail*.xpi || die
375 - fi
376 -
377 - # Required in order for jit to work on hardened, for mozilla-31 and above
378 - use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
379 -
380 - # Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
381 - # continue to work as expected.
382 - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
383 -
384 - if use minimal; then
385 - rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
386 - die "Failed to remove sdk and headers"
387 - fi
388 -}
389 -
390 -pkg_preinst() {
391 - gnome2_icon_savelist
392 -}
393 -
394 -pkg_postinst() {
395 - fdo-mime_desktop_database_update
396 - gnome2_icon_cache_update
397 -
398 - if use crypt; then
399 - local peimpl=$(eselect --brief --colour=no pinentry show)
400 - case "${peimpl}" in
401 - *gtk*|*qt*) ;;
402 - *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
403 - ewarn "You may be prompted for your password in an inaccessible shell!!"
404 - ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
405 - ;;
406 - esac
407 - fi
408 - elog
409 - elog "If you experience problems with plugins please issue the"
410 - elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
411 - elog "then restart thunderbird"
412 - if ! use lightning; then
413 - elog
414 - elog "If calendar fails to show up in extensions please open config editor"
415 - elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
416 - elog "fails to show the calendar extension after restarting with above change"
417 - elog "please file a bug report."
418 - fi
419 -}
420 -
421 -pkg_postrm() {
422 - fdo-mime_desktop_database_update
423 - gnome2_icon_cache_update
424 -}