Bug511861 fixed Bug 1503837 TB only

comm-esr52/patches/1503837.patch

@@ -0,0 +1,53 @@
+
+# HG changeset patch
+# User aceman <acelists@atlas.sk>
+# Date 1541675520 -3600
+# Node ID 5ca1b2b18ca0fad0ca0e64665b88d651b5fa5c24
+# Parent  d198e27e20dbf0f45b3ee5a54064c056313b18ab
+Bug 1503837 - Bug 1503654 follow-up: Adapt to inverted logic of ChromeUtils.isOriginAttributesEqual in cookies dialog. r+a=jorgk
+
+diff --git a/mail/components/preferences/cookies.js b/mail/components/preferences/cookies.js
+--- a/mail/components/preferences/cookies.js
++++ b/mail/components/preferences/cookies.js
+@@ -63,18 +63,18 @@ var gCookiesWindow = {
+     this._saveState();
+   },
+ 
+   _cookieEquals: function (aCookieA, aCookieB, aStrippedHost)
+   {
+     return aCookieA.rawHost == aStrippedHost &&
+            aCookieA.name == aCookieB.name &&
+            aCookieA.path == aCookieB.path &&
+-           !ChromeUtils.isOriginAttributesEqual(aCookieA.originAttributes,
+-                                                aCookieB.originAttributes);
++           ChromeUtils.isOriginAttributesEqual(aCookieA.originAttributes,
++                                               aCookieB.originAttributes);
+   },
+ 
+   observe: function (aCookie, aTopic, aData)
+   {
+     if (aTopic != "cookie-changed")
+       return;
+ 
+     if (aCookie instanceof Components.interfaces.nsICookie) {
+@@ -283,18 +283,18 @@ var gCookiesWindow = {
+         gCookiesWindow._hosts[item.rawHost] = null;
+       } else {
+         var parent = this._getItemAtIndex(item.parentIndex);
+         for (var i = 0; i < parent.cookies.length; ++i) {
+           var cookie = parent.cookies[i];
+           if (item.rawHost == cookie.rawHost &&
+               item.name == cookie.name &&
+               item.path == cookie.path &&
+-              !ChromeUtils.isOriginAttributesEqual(item.originAttributes,
+-                                                   cookie.originAttributes)) {
++              ChromeUtils.isOriginAttributesEqual(item.originAttributes,
++                                                  cookie.originAttributes)) {
+             parent.cookies.splice(i, removeCount);
+           }
+         }
+       }
+     },
+ 
+     _invalidateCache: function (aIndex)
+     {

comm-esr52/patches/521861-Account_Creation.patch → comm-esr52/patches/521861-Account_Creation-249.patch

@@ -1,12 +1,30 @@
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
-# Parent  76b95caa256af24d798f862065da2f89c23c6f40
+# Parent  f6aef73aa4b6bde1406b7d1d49f520fc1bfc7cba
 Bug 521861 - Remove mail.server.serverx.valid prefs during startup.
 
 diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsgAccountManager.cpp
 --- a/mailnews/base/src/nsMsgAccountManager.cpp
 +++ b/mailnews/base/src/nsMsgAccountManager.cpp
-@@ -369,16 +369,56 @@ nsMsgAccountManager::GetUniqueServerKey(
+@@ -66,16 +66,17 @@
+ #include "nsILineInputStream.h"
+ #include "nsThreadUtils.h"
+ #include "nsNetUtil.h"
+ #include "nsIStringBundle.h"
+ #include "nsMsgMessageFlags.h"
+ #include "nsIMsgFilterList.h"
+ #include "nsDirectoryServiceUtils.h"
+ #include "mozilla/Services.h"
++#include <string>
+ #include <algorithm>
+ #include "nsIFileStreams.h"
+ #include "nsIOutputStream.h"
+ #include "nsISafeOutputStream.h"
+ 
+ #define PREF_MAIL_ACCOUNTMANAGER_ACCOUNTS "mail.accountmanager.accounts"
+ #define PREF_MAIL_ACCOUNTMANAGER_DEFAULTACCOUNT "mail.accountmanager.defaultaccount"
+ #define PREF_MAIL_ACCOUNTMANAGER_LOCALFOLDERSSERVER "mail.accountmanager.localfoldersserver"
+@@ -369,16 +370,56 @@ nsMsgAccountManager::GetUniqueServerKey(
        aResult.AssignLiteral(SERVER_PREFIX);
        aResult.AppendInt(i++);
        m_incomingServers.Get(aResult, getter_AddRefs(server));
@@ -63,7 +81,7 @@ diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsg
    nsAutoCString key;
    nsCOMPtr<nsIMsgIdentity> identity;
    int32_t i = 1;
-@@ -1154,16 +1194,19 @@ nsMsgAccountManager::LoadAccounts()
+@@ -1154,16 +1195,19 @@ nsMsgAccountManager::LoadAccounts()
        rv = prefBranch->SetIntPref(APPEND_ACCOUNTS_VERSION_PREF_NAME, appendAccountsCurrentVersion + 1);
      }
    }

comm-esr52/patches/series

@@ -1,3 +1,4 @@
 frg-249-5.patch
-521861-Account_Creation.patch
+521861-Account_Creation-249.patch
 1503654-cookies.patch
+1503837.patch