sync with current 2.57 queue

frg-buildfixes/comm/WIP-1655362-default-zoom-v3.patch → frg-buildfixes/comm/1655362-default-zoom-v4-257.patch

@@ -1,8 +1,8 @@
 # HG changeset patch
 # User Dmitry Butskoy <dmitry@butskoy.name>
 # Date 1595850090 -7200
-# Parent  b0350c4c0fc03da9847ce2c63173a44f71cb9fc8
-Bug 1655362 - Default Zoom support for SeaMonkey. r=IanN a=IanN
+# Parent  c5f3cf19bebca6dbc502892a868e7008ad936db5
+Bug 1655362 - Default Zoom support for SeaMonkey. r=frg a=frg
 
 diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
 --- a/suite/browser/navigator.js
@@ -49,7 +49,7 @@ diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
 diff --git a/suite/components/pref/content/pref-content.js b/suite/components/pref/content/pref-content.js
 --- a/suite/components/pref/content/pref-content.js
 +++ b/suite/components/pref/content/pref-content.js
-@@ -26,16 +26,46 @@ function Startup()
+@@ -26,16 +26,40 @@ function Startup()
  
    minMinValue     = firstValue;
    minElement.min  = minMinValue;
@@ -69,25 +69,19 @@ diff --git a/suite/components/pref/content/pref-content.js b/suite/components/pr
 +  let cps2 = Cc["@mozilla.org/content-pref/service;1"]
 +               .getService(Ci.nsIContentPrefService2);
 +
-+  let value = undefined;
-+
 +  var zoomValue = cps2.getCachedGlobal("browser.content.full-zoom", null);
-+  if (zoomValue && zoomValue.value)
-+    value = zoomValue.value;
-+  else {
-+    cps2.getGlobal("browser.content.full-zoom", null, {
-+      handleResult(pref) {
-+        value = pref.value;
-+      },
-+      handleCompletion(reason) {}
-+    });
-+  }
-+
-+  if (value === undefined) {
-+    value = 1.0
++  if (zoomValue && zoomValue.value) {
++    defaultElement.value = Math.round(zoomValue.value * 100);
++    return;
 +  }
 +
-+  defaultElement.value = Math.round(value * 100);
++  defaultElement.value = 100;
++  cps2.getGlobal("browser.content.full-zoom", null, {
++    handleResult(pref) {
++      defaultElement.value = Math.round(pref.value * 100);
++    },
++    handleCompletion(reason) {}
++  });
  }
  
  /**
@@ -96,7 +90,7 @@ diff --git a/suite/components/pref/content/pref-content.js b/suite/components/pr
  function DisableMinCheck(element)
  {
    element.min = 0;
-@@ -49,16 +79,23 @@ function AdjustMaxZoom()
+@@ -49,16 +73,23 @@ function AdjustMaxZoom()
    let minElement  = document.getElementById("minZoom");
    let maxElement  = document.getElementById("maxZoom");
    let maxPref     = document.getElementById("zoom.maxPercent");
@@ -120,7 +114,7 @@ diff --git a/suite/components/pref/content/pref-content.js b/suite/components/pr
   */
  function AdjustMinZoom()
  {
-@@ -67,16 +104,41 @@ function AdjustMinZoom()
+@@ -67,16 +98,41 @@ function AdjustMinZoom()
    let minPref     = document.getElementById("zoom.minPercent");
    let maxValue    = maxElement.valueNumber < maxMinValue ?
                      maxMinValue : maxElement.valueNumber;
@@ -149,11 +143,11 @@ diff --git a/suite/components/pref/content/pref-content.js b/suite/components/pr
 +
 +  if (defaultElement.valueNumber == 100) {
 +    cps2.removeGlobal("browser.content.full-zoom", null);
-+  } else {
-+    let new_value = defaultElement.valueNumber / 100.;
-+
-+    cps2.setGlobal("browser.content.full-zoom", new_value, null);
++    return;
 +  }
++
++  let new_value = defaultElement.valueNumber / 100.;
++  cps2.setGlobal("browser.content.full-zoom", new_value, null);
  }
  
  /**

frg-buildfixes/comm/1675947-updates-257.patch

@@ -0,0 +1,51 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs@blueyonder.co.uk>
+# Date 1604763247 0
+# Parent  0fe40d6585e90f36fd2f4f288fc7567d1d00767f
+Bug 1675947 - Point to new updates server (updates.sm-p.o). r=ewong a=frg
+
+diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
+--- a/suite/app/profile/suite-prefs.js
++++ b/suite/app/profile/suite-prefs.js
+@@ -493,17 +493,17 @@ pref("app.update.enabled", true);
+ 
+ // This preference allows automatic download and install to take place.
+ pref("app.update.auto", true);
+ 
+ // If set to true, the Update Service will present no UI for any event.
+ pref("app.update.silent", false);
+ 
+ // Update service URL:
+-pref("app.update.url", "https://aus2-community.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
++pref("app.update.url", "https://updates.seamonkey-project.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
+ // URL user can browse to manually if for some reason all update installation
+ // attempts fail.
+ pref("app.update.url.manual", "chrome://branding/locale/brand.properties");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard.
+ pref("app.update.url.details", "chrome://branding/locale/brand.properties");
+ 
+ // User-settable override to app.update.url for testing purposes.
+@@ -541,20 +541,18 @@ pref("app.update.cert.maxErrors", 5);
+ // present the following conditions apply for a successful update check:
+ // 1. the uri scheme must be https
+ // 2. the preference name must exist as an attribute name on the certificate and
+ //    the value for the name must be the same as the value for the attribute
+ //    name on the certificate.
+ // If these conditions aren't met it will be treated the same as when there is
+ // no update available. This validation will not be performed when using the
+ // |app.update.url.override| preference for update checking.
+-pref("app.update.certs.1.issuerName", "CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US");
+-pref("app.update.certs.1.commonName", "aus2-community.mozilla.org");
+-pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US");
+-pref("app.update.certs.2.commonName", "aus2-community.mozilla.org");
++pref("app.update.certs.1.issuerName", "CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US");
++pref("app.update.certs.1.commonName", "updates.seamonkey-project.org");
+ 
+ // Interval: Time between checks for a new version (in seconds)
+ //           default=1 day
+ pref("app.update.interval", 86400);
+ // The minimum delay in seconds for the timer to fire.
+ // default=2 minutes
+ pref("app.update.timerMinimumDelay", 120);
+ #ifdef RELEASE_OR_BETA

frg-buildfixes/comm/series

@@ -308,19 +308,20 @@ BACKOUT-1176399-yield-257.patch
 1669070-msgHdrViewSMIMEOverlay-V1_1-257.patch
 1669070-msgCompSMIMEOverlay-V2-257.patch
 1655283-startpage-v1_1-257.patch
+1673959-subscribe-1425962-257.patch
+1673959-subscribe-1466705-257.patch
+1675947-updates-257.patch
 1491419-cc-64a1.patch
 PPPPPPP-tbbranding-257.patch
 WIP-1451081-viewSource-257.patch
 WIP-9999999-modern-scrollbar-hack-257.patch
-WIP-1655362-default-zoom-v3.patch
+9999999-disablemaint-comm-257.patch
 1645892-1-port1475647-257.patch
 1645892-2-port1468222-257.patch
 1646495-remove-nsIHTTPIndex-v1_1-257.patch
-9999999-disablemaint-comm-257.patch
+WIP-1441016-2-port-1414390-257.patch
 1600103-port296655-257.patch
-1673959-subscribe-1425962-257.patch
-1673959-subscribe-1466705-257.patch
 1434570-1-lwt-suite-257.patch
-WIP-1441016-2-port-1414390-257.patch
 1475060-cc-63a1.patch
 9999999-kill-taskcluster-cc-257.patch
+1655362-default-zoom-v4-257.patch

frg-buildfixes/mozilla/1529227-2-nsssymbols-257.patch

@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Parent  32fe0f30f36955a05578227d1176a87100fa9b67
+Bug 1529227 - Fix Firefox build with later NSS. r=me a=me
+SeaMonkey release branch only.
+
+diff --git a/security/nss.symbols b/security/nss.symbols
+--- a/security/nss.symbols
++++ b/security/nss.symbols
+@@ -189,16 +189,17 @@ NSS_CMSEncoder_Start
+ NSS_CMSMessage_ContentLevel
+ NSS_CMSMessage_Create
+ NSS_CMSMessage_CreateFromDER
+ NSS_CMSMessage_Destroy
+ NSS_CMSMessage_GetContentInfo
+ NSS_CMSMessage_IsEncrypted
+ NSS_CMSMessage_IsSigned
+ NSS_CMSSignedData_AddCertificate
++NSS_CMSSignedData_AddCertList
+ NSS_CMSSignedData_CreateCertsOnly
+ NSS_CMSSignedData_Destroy
+ NSS_CMSSignedData_GetSignerInfo
+ NSS_CMSSignedData_SignerInfoCount
+ NSS_CMSSignerInfo_GetSigningCertificate
+ NSS_CMSSignerInfo_Verify
+ NSS_FindCertKEAType
+ NSS_GetAlgorithmPolicy

frg-buildfixes/mozilla/1656697-78.patch → frg-buildfixes/mozilla/1656697-v2-78.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Kershaw Chang <kershaw@mozilla.com>
-# Date 1600244357 0
-# Node ID 005391f69f10fd4a2afa986565b39ef12f908632
-# Parent  d9f17c177046a231b1d028b2c2f6b7ef0dc726bb
-Bug 1656697. r=valentin, a=RyanVM
+# Date 1601996310 0
+# Node ID 38ecbf5f1b5b17b6bc589f9f936dc594ee4cbcc8
+# Parent  a891219c7da42b02cf7ad8d83da36e8a7e414def
+Bug 1656697, r=valentin, a=jcristau
 
 The root cause in this bug is that the connection info used by `SpdyConnectTransaction` is the same instance as the connection info in `nsHttpTransaction`, so we should clone it and let `SpdyConnectTransaction` use the cloned one.
 
@@ -62,29 +62,3 @@ new file mode 100644
 + 
 + void Http2Session::ProcessWaitingWebsockets() {
 +   MOZ_ASSERT(!mProcessedWaitingWebsockets);
-diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
---- a/netwerk/protocol/http/nsHttpTransaction.cpp
-+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
-@@ -1851,19 +1851,19 @@ void nsHttpTransaction::ReleaseBlockingT
-        "in ReleaseBlockingTransaction() - was %p\n",
-        this, mRequestContext.get()));
-   mRequestContext = nullptr;
- }
- 
- void nsHttpTransaction::DisableSpdy() {
-   mCaps |= NS_HTTP_DISALLOW_SPDY;
-   if (mConnInfo) {
--    // This is our clone of the connection info, not the persistent one that
--    // is owned by the connection manager, so we're safe to change this here
--    mConnInfo->SetNoSpdy(true);
-+    RefPtr<nsHttpConnectionInfo> connInfo = mConnInfo->Clone();
-+    connInfo->SetNoSpdy(true);
-+    mConnInfo.swap(connInfo);
-   }
- }
- 
- void nsHttpTransaction::CheckForStickyAuthScheme() {
-   LOG(("nsHttpTransaction::CheckForStickyAuthScheme this=%p", this));
- 
-   MOZ_ASSERT(mHaveAllHeaders);
-   MOZ_ASSERT(mResponseHead);

frg-buildfixes/mozilla/series

@@ -2436,7 +2436,7 @@ TOP-9999999-fixlangpack-257.patch
 1368270-78.patch
 1660901-1no2-78.patch
 1660901-3-78.patch
-1656697-78.patch
+1656697-v2-78.patch
 1663642-78.patch
 1663439-1-78.patch
 1663439-2-78.patch
@@ -2509,6 +2509,7 @@ TOP-9999999-fixlangpack-257.patch
 1490575-3-64a1.patch
 1490575-4-64a1.patch
 9999999-disablemaint-mozilla-257.patch
+1529227-2-nsssymbols-257.patch
 1520340-1-66a1.patch
 1520340-2-66a1.patch
 1520340-3-66a1.patch