Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Jan 2018 21:00:32 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r460530 - in branches/2018Q1: mail/thunderbird mail/thunderbird/files www/firefox-esr www/firefox-esr/files www/seamonkey www/seamonkey/files
Message-ID:  <201801312100.w0VL0WwL025765@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jan 31 21:00:31 2018
New Revision: 460530
URL: https://svnweb.freebsd.org/changeset/ports/460530

Log:
  MFH: r460357
  
  www/firefox-esr: work around race on sqlite3 init
  
  PR:		225364
  Obtained from:	upstream (Firefox 56)
  Approved by:	ports-secteam (swills)

Added:
  branches/2018Q1/mail/thunderbird/files/patch-bug1380706
     - copied unchanged from r460357, head/mail/thunderbird/files/patch-bug1380706
  branches/2018Q1/www/firefox-esr/files/patch-bug1380706
     - copied unchanged from r460357, head/www/firefox-esr/files/patch-bug1380706
  branches/2018Q1/www/seamonkey/files/patch-bug1380706
     - copied unchanged from r460357, head/www/seamonkey/files/patch-bug1380706
Modified:
  branches/2018Q1/mail/thunderbird/Makefile
  branches/2018Q1/www/firefox-esr/Makefile
  branches/2018Q1/www/seamonkey/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/mail/thunderbird/Makefile
==============================================================================
--- branches/2018Q1/mail/thunderbird/Makefile	Wed Jan 31 20:58:28 2018	(r460529)
+++ branches/2018Q1/mail/thunderbird/Makefile	Wed Jan 31 21:00:31 2018	(r460530)
@@ -3,6 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	52.6.0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

Copied: branches/2018Q1/mail/thunderbird/files/patch-bug1380706 (from r460357, head/mail/thunderbird/files/patch-bug1380706)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/mail/thunderbird/files/patch-bug1380706	Wed Jan 31 21:00:31 2018	(r460530, copy of r460357, head/mail/thunderbird/files/patch-bug1380706)
@@ -0,0 +1,36 @@
+commit 10b55207992c
+Author: Kai Engert <kaie@kuix.de>
+Date:   Fri Jul 14 15:31:30 2017 +0200
+
+    Bug 1380706, PSM should depend on mozStorage, as a workaround for a sqlite3_config race, r=keeler
+---
+ security/manager/ssl/nsNSSComponent.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git security/manager/ssl/nsNSSComponent.cpp security/manager/ssl/nsNSSComponent.cpp
+index f51f8af47d51..a82c1ed61fba 100644
+--- mozilla/security/manager/ssl/nsNSSComponent.cpp
++++ mozilla/security/manager/ssl/nsNSSComponent.cpp
+@@ -13,6 +13,7 @@
+ #include "SharedSSLState.h"
+ #include "cert.h"
+ #include "certdb.h"
++#include "mozStorageCID.h"
+ #include "mozilla/ArrayUtils.h"
+ #include "mozilla/Assertions.h"
+ #include "mozilla/Casting.h"
+@@ -2032,6 +2033,14 @@ nsNSSComponent::Init()
+     return NS_ERROR_NOT_AVAILABLE;
+   }
+ 
++  // To avoid a sqlite3_config race in NSS init, as a workaround for
++  // bug 730495, we require the storage service to get initialized first.
++  nsCOMPtr<nsISupports> storageService =
++    do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
++  if (!storageService) {
++    return NS_ERROR_NOT_AVAILABLE;
++  }
++
+   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("Beginning NSS initialization\n"));
+ 
+   nsresult rv = InitializePIPNSSBundle();

Modified: branches/2018Q1/www/firefox-esr/Makefile
==============================================================================
--- branches/2018Q1/www/firefox-esr/Makefile	Wed Jan 31 20:58:28 2018	(r460529)
+++ branches/2018Q1/www/firefox-esr/Makefile	Wed Jan 31 21:00:31 2018	(r460530)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	52.6.0
 DISTVERSIONSUFFIX=esr
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

Copied: branches/2018Q1/www/firefox-esr/files/patch-bug1380706 (from r460357, head/www/firefox-esr/files/patch-bug1380706)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/www/firefox-esr/files/patch-bug1380706	Wed Jan 31 21:00:31 2018	(r460530, copy of r460357, head/www/firefox-esr/files/patch-bug1380706)
@@ -0,0 +1,36 @@
+commit 10b55207992c
+Author: Kai Engert <kaie@kuix.de>
+Date:   Fri Jul 14 15:31:30 2017 +0200
+
+    Bug 1380706, PSM should depend on mozStorage, as a workaround for a sqlite3_config race, r=keeler
+---
+ security/manager/ssl/nsNSSComponent.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git security/manager/ssl/nsNSSComponent.cpp security/manager/ssl/nsNSSComponent.cpp
+index f51f8af47d51..a82c1ed61fba 100644
+--- security/manager/ssl/nsNSSComponent.cpp
++++ security/manager/ssl/nsNSSComponent.cpp
+@@ -13,6 +13,7 @@
+ #include "SharedSSLState.h"
+ #include "cert.h"
+ #include "certdb.h"
++#include "mozStorageCID.h"
+ #include "mozilla/ArrayUtils.h"
+ #include "mozilla/Assertions.h"
+ #include "mozilla/Casting.h"
+@@ -2032,6 +2033,14 @@ nsNSSComponent::Init()
+     return NS_ERROR_NOT_AVAILABLE;
+   }
+ 
++  // To avoid a sqlite3_config race in NSS init, as a workaround for
++  // bug 730495, we require the storage service to get initialized first.
++  nsCOMPtr<nsISupports> storageService =
++    do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
++  if (!storageService) {
++    return NS_ERROR_NOT_AVAILABLE;
++  }
++
+   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("Beginning NSS initialization\n"));
+ 
+   nsresult rv = InitializePIPNSSBundle();

Modified: branches/2018Q1/www/seamonkey/Makefile
==============================================================================
--- branches/2018Q1/www/seamonkey/Makefile	Wed Jan 31 20:58:28 2018	(r460529)
+++ branches/2018Q1/www/seamonkey/Makefile	Wed Jan 31 21:00:31 2018	(r460530)
@@ -3,8 +3,8 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.49.1
-PORTREVISION=	7
 MOZILLA_VER=	52 # above + 3
+PORTREVISION=	8
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source

Copied: branches/2018Q1/www/seamonkey/files/patch-bug1380706 (from r460357, head/www/seamonkey/files/patch-bug1380706)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/www/seamonkey/files/patch-bug1380706	Wed Jan 31 21:00:31 2018	(r460530, copy of r460357, head/www/seamonkey/files/patch-bug1380706)
@@ -0,0 +1,36 @@
+commit 10b55207992c
+Author: Kai Engert <kaie@kuix.de>
+Date:   Fri Jul 14 15:31:30 2017 +0200
+
+    Bug 1380706, PSM should depend on mozStorage, as a workaround for a sqlite3_config race, r=keeler
+---
+ security/manager/ssl/nsNSSComponent.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git security/manager/ssl/nsNSSComponent.cpp security/manager/ssl/nsNSSComponent.cpp
+index f51f8af47d51..a82c1ed61fba 100644
+--- mozilla/security/manager/ssl/nsNSSComponent.cpp
++++ mozilla/security/manager/ssl/nsNSSComponent.cpp
+@@ -13,6 +13,7 @@
+ #include "SharedSSLState.h"
+ #include "cert.h"
+ #include "certdb.h"
++#include "mozStorageCID.h"
+ #include "mozilla/ArrayUtils.h"
+ #include "mozilla/Assertions.h"
+ #include "mozilla/Casting.h"
+@@ -2032,6 +2033,14 @@ nsNSSComponent::Init()
+     return NS_ERROR_NOT_AVAILABLE;
+   }
+ 
++  // To avoid a sqlite3_config race in NSS init, as a workaround for
++  // bug 730495, we require the storage service to get initialized first.
++  nsCOMPtr<nsISupports> storageService =
++    do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
++  if (!storageService) {
++    return NS_ERROR_NOT_AVAILABLE;
++  }
++
+   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("Beginning NSS initialization\n"));
+ 
+   nsresult rv = InitializePIPNSSBundle();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801312100.w0VL0WwL025765>