From 63838d8b5b2b5b13ff4de889e3381e5fe38a7a04 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 21 2017 03:12:44 +0000 Subject: import thunderbird-52.2.0-1.el7_3 --- diff --git a/.gitignore b/.gitignore index ecf4df3..3fb42f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/Python-2.7.8.tgz SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm SOURCES/gcc48-4.8.2-16.el5.src.rpm -SOURCES/l10n-lightning-52.1.0.tar.xz -SOURCES/thunderbird-52.1.0.source.tar.xz -SOURCES/thunderbird-langpacks-52.1.0-20170502.tar.xz +SOURCES/l10n-lightning-52.2.0.tar.xz +SOURCES/thunderbird-52.2.0.source.tar.xz +SOURCES/thunderbird-langpacks-52.2.0-20170615.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index b6debf2..532bdf6 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,7 +1,7 @@ 511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz 467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm -f1bb15ef9bbdfb1a668417b359e392aa3e54f08a SOURCES/l10n-lightning-52.1.0.tar.xz -09704d01e0fd78af688883b8eb6745feff29202b SOURCES/thunderbird-52.1.0.source.tar.xz -3d3dbf1a0020d1278544653c332666a0a5d63ca1 SOURCES/thunderbird-langpacks-52.1.0-20170502.tar.xz +71aff40f5d233e4e70821134ccc1c64228439ece SOURCES/l10n-lightning-52.2.0.tar.xz +8dde2a8dd3e2b625ab55f81818da2f9451ebec7e SOURCES/thunderbird-52.2.0.source.tar.xz +fca8138957374e4cc8d30c5fe66163a98f1723c9 SOURCES/thunderbird-langpacks-52.2.0-20170615.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SOURCES/build-nss-version.patch b/SOURCES/build-nss-version.patch index 36c2632..30b670b 100644 --- a/SOURCES/build-nss-version.patch +++ b/SOURCES/build-nss-version.patch @@ -5,8 +5,8 @@ diff -up firefox-52.0esr/old-configure.in.nss-ver firefox-52.0esr/old-configure. _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.28.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.28.5, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_SYSTEM_NSS"; then diff --git a/SOURCES/mozilla-1158578-recursion-fix.patch b/SOURCES/mozilla-1158578-recursion-fix.patch deleted file mode 100644 index 77bc6ef..0000000 --- a/SOURCES/mozilla-1158578-recursion-fix.patch +++ /dev/null @@ -1,147 +0,0 @@ -# vim: se ft=diff : -# HG changeset patch -# User Jan Horak -# Date 2017-04-26 02:36 -# Parent 540cd06b1aea0bfa6f906b86393f5480914c01c2 -Bug 1158578 - fix crash when compacting IMAP account. r=jorgk - -diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp ---- a/mailnews/base/src/nsMsgFolderCompactor.cpp -+++ b/mailnews/base/src/nsMsgFolderCompactor.cpp -@@ -31,16 +31,17 @@ - #include "nsIMsgStatusFeedback.h" - #include "nsMsgBaseCID.h" - #include "nsIMsgFolderNotificationService.h" - #include "nsIMsgPluggableStore.h" - #include "nsMsgFolderCompactor.h" - #include - #include "nsIOutputStream.h" - #include "nsIInputStream.h" -+#include "nsPrintfCString.h" - - - ////////////////////////////////////////////////////////////////////////////// - // nsFolderCompactState - ////////////////////////////////////////////////////////////////////////////// - - NS_IMPL_ISUPPORTS(nsFolderCompactState, nsIMsgFolderCompactor, nsIRequestObserver, nsIStreamListener, nsICopyMessageStreamListener, nsIUrlListener) - -@@ -1096,16 +1097,24 @@ nsOfflineStoreCompactState::OnStopReques - // check for it specifically and don't terminate the compaction. - if (NS_FAILED(rv) && rv != NS_MSG_ERROR_MSG_NOT_OFFLINE) - goto done; - uri = do_QueryInterface(ctxt, &rv); - if (NS_FAILED(rv)) goto done; - rv = GetMessage(getter_AddRefs(msgHdr)); - if (NS_FAILED(rv)) goto done; - -+ // This is however an unexpected condition, so let's print a warning. -+ if (rv == NS_MSG_ERROR_MSG_NOT_OFFLINE) { -+ nsAutoCString spec; -+ uri->GetSpec(spec); -+ nsPrintfCString msg("Message expectedly not available offline: %s", spec.get()); -+ NS_WARNING(msg.get()); -+ } -+ - if (msgHdr) - { - if (NS_SUCCEEDED(status)) - { - msgHdr->SetMessageOffset(m_startOfNewMsg); - char storeToken[100]; - PR_snprintf(storeToken, sizeof(storeToken), "%lld", m_startOfNewMsg); - msgHdr->SetStringProperty("storeToken", storeToken); -diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp ---- a/mailnews/imap/src/nsImapProtocol.cpp -+++ b/mailnews/imap/src/nsImapProtocol.cpp -@@ -9500,35 +9500,66 @@ nsresult nsImapMockChannel::ReadFromMemC - // Content is modified so return an error so we try to open it the - // old fashioned way. - rv = NS_ERROR_FAILURE; - } - - return rv; - } - -+class nsReadFromImapConnectionFailure : public mozilla::Runnable -+{ -+public: -+ nsReadFromImapConnectionFailure(nsImapMockChannel *aChannel) -+ : mImapMockChannel(aChannel) -+ {} -+ -+ NS_IMETHOD Run() -+ { -+ if (mImapMockChannel) { -+ mImapMockChannel->RunOnStopRequestFailure(); -+ } -+ return NS_OK; -+ } -+private: -+ RefPtr mImapMockChannel; -+}; -+ -+ -+nsresult nsImapMockChannel::RunOnStopRequestFailure() -+{ -+ if (m_channelListener) { -+ m_channelListener->OnStopRequest(this, m_channelContext, -+ NS_MSG_ERROR_MSG_NOT_OFFLINE); -+ } -+ return NS_OK; -+} -+ - // the requested url isn't in any of our caches so create an imap connection - // to process it. - nsresult nsImapMockChannel::ReadFromImapConnection() - { - nsresult rv = NS_OK; - nsCOMPtr imapUrl = do_QueryInterface(m_url); - nsCOMPtr mailnewsUrl = do_QueryInterface(m_url); - - bool localOnly = false; - imapUrl->GetLocalFetchOnly(&localOnly); - if (localOnly) - { - // This will cause an OnStartRunningUrl, and the subsequent close - // will then cause an OnStopRunningUrl with the cancel status. - NotifyStartEndReadFromCache(true); - Cancel(NS_MSG_ERROR_MSG_NOT_OFFLINE); -- if (m_channelListener) -- m_channelListener->OnStopRequest(this, m_channelContext, -- NS_MSG_ERROR_MSG_NOT_OFFLINE); -+ -+ // Dispatch error notification, so ReadFromImapConnection() returns *before* -+ // the error is sent to the listener's OnStopRequest(). This avoids -+ // endless recursion where the caller relies on async execution. -+ nsCOMPtr event = new nsReadFromImapConnectionFailure(this); -+ NS_DispatchToCurrentThread(event); - return NS_MSG_ERROR_MSG_NOT_OFFLINE; - } - - nsCOMPtr loadGroup; - GetLoadGroup(getter_AddRefs(loadGroup)); - if (!loadGroup) // if we don't have one, the url will snag one from the msg window... - mailnewsUrl->GetLoadGroup(getter_AddRefs(loadGroup)); - -diff --git a/mailnews/imap/src/nsImapProtocol.h b/mailnews/imap/src/nsImapProtocol.h ---- a/mailnews/imap/src/nsImapProtocol.h -+++ b/mailnews/imap/src/nsImapProtocol.h -@@ -714,16 +714,17 @@ public: - NS_DECL_NSIIMAPMOCKCHANNEL - NS_DECL_NSICHANNEL - NS_DECL_NSIREQUEST - NS_DECL_NSICACHEENTRYOPENCALLBACK - NS_DECL_NSITRANSPORTEVENTSINK - - nsImapMockChannel(); - static nsresult Create (const nsIID& iid, void **result); -+ nsresult RunOnStopRequestFailure(); - - protected: - virtual ~nsImapMockChannel(); - nsCOMPtr m_url; - - nsCOMPtr m_originalUrl; - nsCOMPtr m_loadGroup; - nsCOMPtr m_loadInfo; diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.el6 b/SOURCES/thunderbird-redhat-default-prefs.js.el6 deleted file mode 100644 index 013aa21..0000000 --- a/SOURCES/thunderbird-redhat-default-prefs.js.el6 +++ /dev/null @@ -1,28 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -# Allow users to set custom colors -# pref("browser.display.use_system_colors", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1") -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.el7 b/SOURCES/thunderbird-redhat-default-prefs.js.el7 deleted file mode 100644 index 013aa21..0000000 --- a/SOURCES/thunderbird-redhat-default-prefs.js.el7 +++ /dev/null @@ -1,28 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -# Allow users to set custom colors -# pref("browser.display.use_system_colors", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1") -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 new file mode 100644 index 0000000..af23193 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 @@ -0,0 +1,28 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1") +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 new file mode 100644 index 0000000..af23193 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 @@ -0,0 +1,28 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1") +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 30e892f..f71603c 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -1,6 +1,6 @@ %define system_nss 1 %global nspr_version 4.13.1 -%global nss_version 3.28.2 +%global nss_version 3.28.4 %define system_sqlite 0 %define sqlite_version 3.8.4.2 %define system_ffi 1 @@ -74,19 +74,19 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 52.1.0 +Version: 52.2.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -%define tarballdir thunderbird-52.1.0 +%define tarballdir thunderbird-52.2.0 %define objdir objdir # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20170502.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20170615.tar.xz %endif # Locales for lightning Source2: l10n-lightning-%{version}.tar.xz @@ -102,9 +102,9 @@ Source300: gcc48-%{gcc_version}.el5.src.rpm Source301: yasm-1.2.0-3.el5.src.rpm Source302: devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm Source600: thunderbird.sh.in.rhel6 -Source601: thunderbird-redhat-default-prefs.js.el6 +Source601: thunderbird-redhat-default-prefs.js.rhel6 Source700: thunderbird.sh.in.rhel7 -Source701: thunderbird-redhat-default-prefs.js.el7 +Source701: thunderbird-redhat-default-prefs.js.rhel7 # Mozilla (XULRunner) patches Patch0: firefox-install-dir.patch @@ -131,7 +131,6 @@ Patch114: rhbz-1423012.patch # Upstream patches # Kaie's patch, we'll most likely need this one Patch202: mozilla-1152515.patch -Patch203: mozilla-1158578-recursion-fix.patch # Thunderbird patches Patch1000: thunderbird-objdir.patch @@ -378,7 +377,6 @@ cd mozilla cd .. -%patch203 -p1 -b .mozbz-1158578-recursion-fix %patch1000 -p2 -b .objdir %patch1001 -p1 -b .badlangs %patch1002 -p1 -b .addons @@ -859,9 +857,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue May 9 2017 Johnny Hughes - 52.1.0-1 -- Manual CentOS Debranding - +* Thu Jun 15 2017 Jan Horak - 52.2.0-1 +- Update to 52.2.0 + * Tue May 2 2017 Jan Horak - 52.1.0-1 - Update to 52.1.0