diff --git a/.gitignore b/.gitignore index 3d9efed..1ccfbdf 100644 --- a/.gitignore +++ b/.gitignore @@ -173,3 +173,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-52.1.0.source.tar.xz /thunderbird-langpacks-52.1.0-20170502.tar.xz /l10n-lightning-52.1.0.tar.xz +/thunderbird-langpacks-52.1.1-20170602.tar.xz +/thunderbird-52.1.1.source.tar.xz +/l10n-lightning-52.1.1.tar.xz diff --git a/mozilla-1158578-recursion-fix.patch b/mozilla-1158578-recursion-fix.patch deleted file mode 100644 index 77bc6ef..0000000 --- a/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 b/sources index 66c1a04..d0f4aad 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (thunderbird-52.1.0.source.tar.xz) = 08016334a0cc8af96d5c5b9aad0b8bf1ca3c105ff4a412abbeaeefefda1301cb149eafb4e78314f710567b952267d1d3c999dc8e5534a4a8d06abdcb11ee98c8 -SHA512 (thunderbird-langpacks-52.1.0-20170502.tar.xz) = e9e7fef3b440f6ce7a9cae6ba3ae1b5093d5d582b04c16054ada120c52b62faab1feaa9a4aa4601e1fd2554a31fcfd5460503b25fdc94045b2954976267147d5 -SHA512 (l10n-lightning-52.1.0.tar.xz) = 2e336da73af96deaaf32af4b91af63edbb98538c1ccb137bbf0da6e5a96cefb88b539986ecf73f7f92cd4183f74d4011de99aba373c92af014419251d3bd3395 +SHA512 (thunderbird-langpacks-52.1.1-20170602.tar.xz) = 1fd9ffe84a20757990c690df0890f461aaade416d3bb51f2d8399de2a50734fe58122aa71844e3e9ba8d91eaeeccd16c23d5511153caee6f1a0c0678725ee07e +SHA512 (thunderbird-52.1.1.source.tar.xz) = 84b54ae4401c9728c38f32f58e0df24e049471b3613f9973981b305e0ed09b2e8c2c1b5a35d4fee85ce2cf1d6fa99e80418bc216ae0d35d40e9fdeef61a6c06e +SHA512 (l10n-lightning-52.1.1.tar.xz) = f939a25c167d647e0dee0a7371ec76214042485807f196fc5ea164209471b624b4f2dc85495881a32d7c4c99a9915d6e8d0d17f541c7364b8b178a1cbaa1b36a diff --git a/thunderbird.spec b/thunderbird.spec index 42ce145..c531e27 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -63,13 +63,13 @@ %endif %define tb_version 45.6.0 -%define tarballdir thunderbird-52.1.0 +%define tarballdir thunderbird-52.1.1 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} # Bump one with each minor lightning release %define gdata_version 3.3 # BUMP VERSION THERE: -%define gdata_version_internal 0.2 +%define gdata_version_internal 0.3 %global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc} # The tarball is pretty inconsistent with directory structure. @@ -91,14 +91,14 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 52.1.0 -Release: 2%{?dist} +Version: 52.1.1 +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}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20170502.tar.xz +Source1: thunderbird-langpacks-%{version}-20170602.tar.xz %endif # Locales for lightning Source2: l10n-lightning-%{version}.tar.xz @@ -142,7 +142,6 @@ Patch403: rhbz-1400293-fix-mozilla-1324096.patch # libvpx no longer has compat defines, use the current ones # Upstream patches -Patch500: mozilla-1158578-recursion-fix.patch %if %{official_branding} # Required by Mozilla Corporation @@ -280,7 +279,6 @@ cd .. %patch305 -p1 -b .fix-dupes %patch105 -p1 -b .bad-langs %patch200 -p1 -b .addons -%patch500 -p1 -b .1158578-recursion-fix %if %{official_branding} @@ -727,6 +725,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Jun 2 2017 Jan Horak - 52.1.1-1 +- Update to 52.1.1 + * Mon May 15 2017 Fedora Release Engineering - 52.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild