[arch-commits] Commit in firefox/trunk (2 files)

[Jan Steffens]

    Date: Thursday, November 21, 2019 @ 23:00:27
  Author: heftig
Revision: 369587

70.0.1-2

Added:
  firefox/trunk/0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch
Modified:
  firefox/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch |   33 ++++++++++
 PKGBUILD                                                        |    7 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

Added: 0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch
===================================================================
--- 0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch	                        (rev 0)
+++ 0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch	2019-11-21 23:00:27 UTC (rev 369587)
@@ -0,0 +1,33 @@
+From 9e8f88c9ae80a2fc984f86f322cd6f2548722789 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 21 Nov 2019 21:32:55 +0100
+Subject: [PATCH] Bug 1593167, ensure that loadable certs are loaded when
+ TransportSecurityInfo::Read is called
+
+Backported to Firefox 70.
+
+https://phabricator.services.mozilla.com/D54135
+---
+ security/manager/ssl/TransportSecurityInfo.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp
+index dd3e12a19d41..224ac86ecf1c 100644
+--- a/security/manager/ssl/TransportSecurityInfo.cpp
++++ b/security/manager/ssl/TransportSecurityInfo.cpp
+@@ -444,6 +444,12 @@ TransportSecurityInfo::Read(nsIObjectInputStream* aStream) {
+     return rv;
+   }
+ 
++  // The logic below needs access to loadable certs.
++  rv = BlockUntilLoadableRootsLoaded();
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++
+   // moved from nsISSLStatus
+   if (!serVersion.EqualsASCII("1")) {
+     // nsISSLStatus may be present
+-- 
+2.24.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-21 21:34:51 UTC (rev 369586)
+++ PKGBUILD	2019-11-21 23:00:27 UTC (rev 369587)
@@ -4,7 +4,7 @@
 
 pkgname=firefox
 pkgver=70.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -24,6 +24,7 @@
         no-relinking.patch
         0001-Update-bindgen.patch
         0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
+        0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop)
 sha256sums=('f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b'
@@ -31,6 +32,7 @@
             '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
             '832d895c90d346fe4acf25b8b8ba9a62bea595fe5fcdeaf545c8e952393993fc'
             '58890388e02af41055e1ec9797b7c094dee499a5219dc9c532c6cfccf2cce972'
+            'c0e8176d7382649b7423d809fd586b01b50e95df816ef34237683c2598802c2f'
             'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
@@ -58,6 +60,9 @@
   patch -Np1 -i ../0001-Update-bindgen.patch
   patch -Np1 -i ../0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
+  patch -Np1 -i ../0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch