svn commit: r460357 - in head: mail/thunderbird mail/thunderbird/files www/firefox-esr www/firefox-esr/files www/seamonkey www/seamonkey/files
Jan Beich
jbeich at FreeBSD.org
Tue Jan 30 00:54:17 UTC 2018
Author: jbeich
Date: Tue Jan 30 00:54:15 2018
New Revision: 460357
URL: https://svnweb.freebsd.org/changeset/ports/460357
Log:
www/firefox-esr: work around race on sqlite3 init
PR: 225364
Obtained from: upstream (Firefox 56)
MFH: 2018Q1 (r459458 follow up)
Added:
head/mail/thunderbird/files/patch-bug1380706 (contents, props changed)
head/www/firefox-esr/files/patch-bug1380706 (contents, props changed)
head/www/seamonkey/files/patch-bug1380706 (contents, props changed)
Modified:
head/mail/thunderbird/Makefile (contents, props changed)
head/www/firefox-esr/Makefile (contents, props changed)
head/www/seamonkey/Makefile (contents, props changed)
Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile Tue Jan 30 00:53:51 2018 (r460356)
+++ head/mail/thunderbird/Makefile Tue Jan 30 00:54:15 2018 (r460357)
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 52.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Added: head/mail/thunderbird/files/patch-bug1380706
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1380706 Tue Jan 30 00:54:15 2018 (r460357)
@@ -0,0 +1,36 @@
+commit 10b55207992c
+Author: Kai Engert <kaie at 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: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile Tue Jan 30 00:53:51 2018 (r460356)
+++ head/www/firefox-esr/Makefile Tue Jan 30 00:54:15 2018 (r460357)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 52.6.0
DISTVERSIONSUFFIX=esr
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
Added: head/www/firefox-esr/files/patch-bug1380706
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1380706 Tue Jan 30 00:54:15 2018 (r460357)
@@ -0,0 +1,36 @@
+commit 10b55207992c
+Author: Kai Engert <kaie at 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: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile Tue Jan 30 00:53:51 2018 (r460356)
+++ head/www/seamonkey/Makefile Tue Jan 30 00:54:15 2018 (r460357)
@@ -3,8 +3,8 @@
PORTNAME= seamonkey
DISTVERSION= 2.49.1
-PORTREVISION= 8
MOZILLA_VER= 52 # above + 3
+PORTREVISION= 9
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source
Added: head/www/seamonkey/files/patch-bug1380706
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1380706 Tue Jan 30 00:54:15 2018 (r460357)
@@ -0,0 +1,36 @@
+commit 10b55207992c
+Author: Kai Engert <kaie at 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();
More information about the svn-ports-head
mailing list