From 59e474028d85b3925e5d2b139a17000e5d93b140 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Jun 2013 16:29:10 +0200 Subject: Thunderbird 17.0.7 --- rhbz-966424.patch | 24 ++++++++++++++++++++++++ thunderbird-mozconfig | 1 - thunderbird-mozconfig-debuginfo | 5 ----- thunderbird.spec | 28 ++++++++++++++++++++-------- 4 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 rhbz-966424.patch delete mode 100644 thunderbird-mozconfig-debuginfo diff --git a/rhbz-966424.patch b/rhbz-966424.patch new file mode 100644 index 0000000..37ddc6e --- /dev/null +++ b/rhbz-966424.patch @@ -0,0 +1,24 @@ +diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/toolkit/mozapps/shared/CertUtils.jsm +--- a/toolkit/mozapps/shared/CertUtils.jsm ++++ b/toolkit/mozapps/shared/CertUtils.jsm +@@ -170,17 +170,19 @@ this.checkCert = + issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); + var tokenNames = issuerCert.getAllTokenNames({}); + + if (!tokenNames || !tokenNames.some(isBuiltinToken)) + throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); + } + + function isBuiltinToken(tokenName) { +- return tokenName == "Builtin Object Token"; ++ return tokenName == "Builtin Object Token" || ++ tokenName == "Default Trust" || ++ tokenName == "System Trust"; + } + + /** + * This class implements nsIBadCertListener. Its job is to prevent "bad cert" + * security dialogs from being shown to the user. It is better to simply fail + * if the certificate is bad. See bug 304286. + * + * @param aAllowNonBuiltInCerts (optional) diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig index ab3b28c..bd801a0 100644 --- a/thunderbird-mozconfig +++ b/thunderbird-mozconfig @@ -24,7 +24,6 @@ ac_add_options --enable-pango ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-system-hunspell -ac_add_options --disable-crashreporter ac_add_options --disable-necko-wifi ac_add_options --disable-updater ac_add_options --enable-startup-notification diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo deleted file mode 100644 index 4dd2427..0000000 --- a/thunderbird-mozconfig-debuginfo +++ /dev/null @@ -1,5 +0,0 @@ -# For mozilla's debuginfo: -export CFLAGS="$CFLAGS -gdwarf-2" -export CXXFLAGS="$CXXFLAGS -gdwarf-2" -export MOZ_DEBUG_SYMBOLS=1 -ac_add_options --enable-crashreporter diff --git a/thunderbird.spec b/thunderbird.spec index 2484121..d502124 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -69,19 +69,18 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 17.0.6 +Version: 17.0.7 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20130514.tar.xz +Source1: thunderbird-langpacks-%{version}-20130625.tar.xz %endif Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js -Source13: thunderbird-mozconfig-debuginfo Source20: thunderbird.desktop Source21: thunderbird.sh.in Source100: find-external-requires @@ -102,6 +101,9 @@ Patch300: xulrunner-16.0-jemalloc-ppc.patch Patch301: rhbz-855923.patch Patch302: mozilla-746112.patch +# Fedora specific patches +Patch400: rhbz-966424.patch + %if %{official_branding} # Required by Mozilla Corporation @@ -212,6 +214,7 @@ cd mozilla %patch9 -p1 -b .791626 %patch104 -p1 -b .gcc47 %patch302 -p2 -b .746112 +%patch400 -p1 -b .966424 cd .. %patch200 -p1 -b .addons @@ -247,9 +250,6 @@ echo "ac_add_options --disable-libjpeg-turbo" >> .mozconfig %if %{official_branding} %{__cat} %{SOURCE11} >> .mozconfig %endif -%if %{enable_mozilla_crashreporter} -%{__cat} %{SOURCE13} >> .mozconfig -%endif %if %{?system_nss} echo "ac_add_options --with-system-nspr" >> .mozconfig @@ -502,11 +502,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/256x256/apps/thunderbird.png %{_datadir}/icons/hicolor/32x32/apps/thunderbird.png %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png -%if %{enable_mozilla_crashreporter} +#if %{enable_mozilla_crashreporter} %{mozappdir}/crashreporter %{mozappdir}/crashreporter.ini %{mozappdir}/Throbber-small.gif -%endif +#endif %if !%{?system_nss} %{mozappdir}/*.chk %endif @@ -520,6 +520,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Jun 25 2013 Remi Collet - 17.0.7-1 +- Update to 17.0.7, sync with rawhide + +* Tue Jun 25 2013 Jan Horak - 17.0.7-1 +- Update to 17.0.7 + +* Tue Jun 25 2013 Jan Horak - 17.0.7-1 +- Update to 17.0.7 + +* Wed Jun 12 2013 Jan Horak - 17.0.6-2 +- Fixed rhbz#973371 - unable to install addons + * Wed May 15 2013 Remi Collet - 17.0.6-1 - Update to 17.0.6, sync with rawhide -- cgit