| 1 |
axs 12/10/30 18:49:19 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: thunderbird-10.0.10.ebuild |
| 5 |
Log: |
| 6 |
ESR bump for security bug 439960 |
| 7 |
|
| 8 |
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.173 mail-client/thunderbird/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.173&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.173&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.172&r2=1.173 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v |
| 20 |
retrieving revision 1.172 |
| 21 |
retrieving revision 1.173 |
| 22 |
diff -u -r1.172 -r1.173 |
| 23 |
--- ChangeLog 28 Oct 2012 00:58:16 -0000 1.172 |
| 24 |
+++ ChangeLog 30 Oct 2012 18:49:19 -0000 1.173 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for mail-client/thunderbird |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.172 2012/10/28 00:58:16 anarchy Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.173 2012/10/30 18:49:19 axs Exp $ |
| 30 |
+ |
| 31 |
+*thunderbird-10.0.10 (30 Oct 2012) |
| 32 |
+ |
| 33 |
+ 30 Oct 2012; Ian Stakenvicius <axs@g.o> +thunderbird-10.0.10.ebuild: |
| 34 |
+ ESR bump for security bug 439960 |
| 35 |
|
| 36 |
*thunderbird-16.0.1-r1 (28 Oct 2012) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 mail-client/thunderbird/thunderbird-10.0.10.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.10.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.10.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: thunderbird-10.0.10.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2012 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.10.ebuild,v 1.1 2012/10/30 18:49:19 axs Exp $ |
| 51 |
|
| 52 |
EAPI="3" |
| 53 |
WANT_AUTOCONF="2.1" |
| 54 |
MOZ_ESR="1" |
| 55 |
|
| 56 |
# This list can be updated using scripts/get_langs.sh from the mozilla overlay |
| 57 |
MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi |
| 58 |
fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT |
| 59 |
rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) |
| 60 |
|
| 61 |
# Convert the ebuild version to the upstream mozilla version, used by mozlinguas |
| 62 |
MOZ_PV="${PV/_beta/b}" |
| 63 |
# ESR releases have slightly version numbers |
| 64 |
if [[ ${MOZ_ESR} == 1 ]]; then |
| 65 |
MOZ_PV="${MOZ_PV}esr" |
| 66 |
fi |
| 67 |
MOZ_P="${PN}-${MOZ_PV}" |
| 68 |
|
| 69 |
# Enigmail version |
| 70 |
EMVER="1.3.5" |
| 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/${PN}/releases/" |
| 74 |
|
| 75 |
inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas |
| 76 |
|
| 77 |
DESCRIPTION="Thunderbird Mail Client" |
| 78 |
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" |
| 79 |
|
| 80 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 81 |
SLOT="0" |
| 82 |
LICENSE="MPL-1.1 GPL-2 LGPL-2.1" |
| 83 |
IUSE="bindist gconf +crypt +ipc +lightning +minimal mozdom +webm selinux" |
| 84 |
|
| 85 |
PATCH="thunderbird-10.0-patches-0.1" |
| 86 |
PATCHFF="firefox-10.0-patches-0.9" |
| 87 |
|
| 88 |
SRC_URI="${SRC_URI} |
| 89 |
${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 |
| 90 |
crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) |
| 91 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz |
| 92 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz" |
| 93 |
|
| 94 |
ASM_DEPEND=">=dev-lang/yasm-1.1" |
| 95 |
|
| 96 |
RDEPEND=">=sys-devel/binutils-2.16.1 |
| 97 |
>=dev-libs/nss-3.13.6 |
| 98 |
>=dev-libs/nspr-4.9.2 |
| 99 |
>=dev-libs/glib-2.26 |
| 100 |
gconf? ( >=gnome-base/gconf-1.2.1:2 ) |
| 101 |
>=media-libs/libpng-1.5.9[apng] |
| 102 |
>=x11-libs/cairo-1.10 |
| 103 |
>=x11-libs/pango-1.14.0 |
| 104 |
>=x11-libs/gtk+-2.14 |
| 105 |
webm? ( >=media-libs/libvpx-1.0.0 |
| 106 |
media-libs/alsa-lib ) |
| 107 |
virtual/libffi |
| 108 |
!x11-plugins/enigmail |
| 109 |
system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) |
| 110 |
selinux? ( sec-policy/selinux-thunderbird ) |
| 111 |
crypt? ( || ( |
| 112 |
( >=app-crypt/gnupg-2.0 |
| 113 |
|| ( |
| 114 |
app-crypt/pinentry[gtk] |
| 115 |
app-crypt/pinentry[qt4] |
| 116 |
) |
| 117 |
) |
| 118 |
=app-crypt/gnupg-1.4* |
| 119 |
) )" |
| 120 |
|
| 121 |
DEPEND="${RDEPEND} |
| 122 |
virtual/pkgconfig |
| 123 |
webm? ( x86? ( ${ASM_DEPEND} ) |
| 124 |
amd64? ( ${ASM_DEPEND} ) )" |
| 125 |
|
| 126 |
if [[ ${MOZ_ESR} == 1 ]]; then |
| 127 |
S="${WORKDIR}/comm-esr${PV%%.*}" |
| 128 |
else |
| 129 |
S="${WORKDIR}/comm-release" |
| 130 |
fi |
| 131 |
|
| 132 |
pkg_setup() { |
| 133 |
moz_pkgsetup |
| 134 |
|
| 135 |
export MOZILLA_DIR="${S}/mozilla" |
| 136 |
|
| 137 |
if ! use bindist ; then |
| 138 |
elog "You are enabling official branding. You may not redistribute this build" |
| 139 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
| 140 |
elog "a legal problem with Mozilla Foundation" |
| 141 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
| 142 |
elog |
| 143 |
fi |
| 144 |
|
| 145 |
# Ensure we have enough disk space to compile |
| 146 |
CHECKREQS_DISK_BUILD="4G" |
| 147 |
check-reqs_pkg_setup |
| 148 |
} |
| 149 |
|
| 150 |
src_unpack() { |
| 151 |
unpack ${A} |
| 152 |
|
| 153 |
# Unpack language packs |
| 154 |
mozlinguas_src_unpack |
| 155 |
} |
| 156 |
|
| 157 |
src_prepare() { |
| 158 |
# Apply our Thunderbird patchset |
| 159 |
EPATCH_SUFFIX="patch" \ |
| 160 |
EPATCH_FORCE="yes" \ |
| 161 |
epatch "${WORKDIR}/thunderbird" |
| 162 |
|
| 163 |
# Apply our patchset from firefox to thunderbird as well |
| 164 |
pushd "${S}"/mozilla &>/dev/null || die |
| 165 |
EPATCH_EXCLUDE="5005_use_resource_urls_appropriately.patch |
| 166 |
6012_fix_shlibsign.patch |
| 167 |
6013_fix_abort_declaration.patch" \ |
| 168 |
EPATCH_SUFFIX="patch" \ |
| 169 |
EPATCH_FORCE="yes" \ |
| 170 |
epatch "${WORKDIR}/firefox" |
| 171 |
popd &>/dev/null || die |
| 172 |
|
| 173 |
if use crypt ; then |
| 174 |
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail |
| 175 |
cd "${S}" |
| 176 |
fi |
| 177 |
|
| 178 |
#Fix compilation with curl-7.21.7 bug 376027 |
| 179 |
sed -e '/#include <curl\/types.h>/d' \ |
| 180 |
-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \ |
| 181 |
-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \ |
| 182 |
-i "${S}"/mozilla/config/system-headers \ |
| 183 |
-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed" |
| 184 |
|
| 185 |
# Shell scripts sometimes contain DOS line endings; bug 391889 |
| 186 |
grep -rlZ --include="*.sh" $'\r$' . | |
| 187 |
while read -r -d $'\0' file ; do |
| 188 |
einfo edos2unix "${file}" |
| 189 |
edos2unix "${file}" |
| 190 |
done |
| 191 |
|
| 192 |
# Allow user to apply any additional patches without modifing ebuild |
| 193 |
epatch_user |
| 194 |
|
| 195 |
eautoreconf |
| 196 |
cd "${S}"/mozilla |
| 197 |
eautoconf |
| 198 |
} |
| 199 |
|
| 200 |
src_configure() { |
| 201 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 202 |
MEXTENSIONS="default" |
| 203 |
|
| 204 |
#################################### |
| 205 |
# |
| 206 |
# mozconfig, CFLAGS and CXXFLAGS setup |
| 207 |
# |
| 208 |
#################################### |
| 209 |
|
| 210 |
mozconfig_init |
| 211 |
mozconfig_config |
| 212 |
|
| 213 |
# It doesn't compile on alpha without this LDFLAGS |
| 214 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 215 |
|
| 216 |
mozconfig_annotate '' --prefix="${EPREFIX}"/usr |
| 217 |
mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) |
| 218 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 219 |
mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" |
| 220 |
mozconfig_annotate '' --with-user-appdir=.thunderbird |
| 221 |
mozconfig_annotate '' --with-system-png |
| 222 |
mozconfig_annotate '' --enable-system-ffi |
| 223 |
mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" |
| 224 |
mozconfig_annotate 'regression' --disable-tracejit |
| 225 |
|
| 226 |
# Use enable features |
| 227 |
mozconfig_use_enable lightning calendar |
| 228 |
mozconfig_use_enable gconf |
| 229 |
|
| 230 |
# Bug #72667 |
| 231 |
if use mozdom; then |
| 232 |
MEXTENSIONS="${MEXTENSIONS},inspector" |
| 233 |
fi |
| 234 |
|
| 235 |
# Use an objdir to keep things organized. |
| 236 |
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig |
| 237 |
|
| 238 |
# Finalize and report settings |
| 239 |
mozconfig_final |
| 240 |
|
| 241 |
#################################### |
| 242 |
# |
| 243 |
# Configure and build |
| 244 |
# |
| 245 |
#################################### |
| 246 |
|
| 247 |
# Disable no-print-directory |
| 248 |
MAKEOPTS=${MAKEOPTS/--no-print-directory/} |
| 249 |
|
| 250 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
| 251 |
append-cxxflags -fno-stack-protector |
| 252 |
elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then |
| 253 |
if use amd64 || use x86; then |
| 254 |
append-flags -mno-avx |
| 255 |
fi |
| 256 |
fi |
| 257 |
} |
| 258 |
|
| 259 |
src_compile() { |
| 260 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 261 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 262 |
emake -f client.mk || die |
| 263 |
|
| 264 |
# Only build enigmail extension if crypt enabled. |
| 265 |
if use crypt ; then |
| 266 |
cd "${S}"/mailnews/extensions/enigmail || die |
| 267 |
./makemake -r 2&> /dev/null |
| 268 |
cd "${S}"/tbird/mailnews/extensions/enigmail |
| 269 |
emake || die "make enigmail failed" |
| 270 |
emake xpi || die "make enigmail xpi failed" |
| 271 |
fi |
| 272 |
} |
| 273 |
|
| 274 |
src_install() { |
| 275 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 276 |
declare emid |
| 277 |
local obj_dir="tbird" |
| 278 |
cd "${S}/${obj_dir}" |
| 279 |
|
| 280 |
# Copy our preference before omnijar is created. |
| 281 |
cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \ |
| 282 |
"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die |
| 283 |
|
| 284 |
# Pax mark xpcshell for hardened support, only used for startupcache creation. |
| 285 |
pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell |
| 286 |
|
| 287 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 288 |
|
| 289 |
# Install language packs |
| 290 |
mozlinguas_src_install |
| 291 |
|
| 292 |
if ! use bindist; then |
| 293 |
newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png |
| 294 |
domenu "${FILESDIR}"/icon/${PN}.desktop |
| 295 |
else |
| 296 |
newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png |
| 297 |
newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ |
| 298 |
${PN}.desktop |
| 299 |
|
| 300 |
sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \ |
| 301 |
"${ED}"/usr/share/applications/${PN}.desktop |
| 302 |
fi |
| 303 |
|
| 304 |
if use crypt ; then |
| 305 |
cd "${T}" || die |
| 306 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die |
| 307 |
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
| 308 |
|
| 309 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
| 310 |
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
| 311 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die |
| 312 |
fi |
| 313 |
|
| 314 |
if use lightning ; then |
| 315 |
emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" |
| 316 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 317 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 318 |
unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi |
| 319 |
|
| 320 |
emid="calendar-timezones@×××××××.org" |
| 321 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 322 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 323 |
unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi |
| 324 |
|
| 325 |
emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}" |
| 326 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 327 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 328 |
unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi |
| 329 |
|
| 330 |
# Fix mimetype so it shows up as a calendar application in GNOME 3 |
| 331 |
# This requires that the .desktop file was already installed earlier |
| 332 |
sed -e "s:^\(MimeType=\):\1text/calendar;:" \ |
| 333 |
-e "s:^\(Categories=\):\1Calendar;:" \ |
| 334 |
-i "${ED}"/usr/share/applications/${PN}.desktop |
| 335 |
fi |
| 336 |
|
| 337 |
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin |
| 338 |
|
| 339 |
share_plugins_dir |
| 340 |
|
| 341 |
if use minimal; then |
| 342 |
rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \ |
| 343 |
die "Failed to remove sdk and headers" |
| 344 |
fi |
| 345 |
} |
| 346 |
|
| 347 |
pkg_postinst() { |
| 348 |
elog |
| 349 |
elog "If you are experience problems with plugins please issue the" |
| 350 |
elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ," |
| 351 |
elog "then restart thunderbird" |
| 352 |
} |
Archives