summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug1380706
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
commit1ffba2ac4cb0152f6bea9c944279dd0c9b399151 (patch)
tree06db800746c0920701662665f78f38b492d43fbf /www/firefox-esr/files/patch-bug1380706
parentwww/firefox-esr: update to 52.9.0 (diff)
www/firefox-esr: remove in preparation for update
$ svn ci Sending Mk/Uses/gecko.mk Replacing www/firefox-esr Sending www/firefox-esr/Makefile Deleting www/firefox-esr/Makefile.options Sending www/firefox-esr/distinfo Deleting www/firefox-esr/files/patch-bug1435212 Sending www/firefox-esr/files/patch-z-bug1436911 Deleting www/firefox-esr/files/pkg-deinstall.in Deleting www/firefox-esr/files/pkg-install.in Replacing www/firefox-esr-i18n Sending www/firefox-esr-i18n/Makefile Sending www/firefox-esr-i18n/distinfo Transmitting file data ......done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" == Additional errors may compound and may not be accurate == Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" == Pre-commit problem count: 12 svn: E165001: Your commit message was left in a temporary file: svn: E165001: '/path/to/head/svn-commit.tmp'
Diffstat (limited to 'www/firefox-esr/files/patch-bug1380706')
-rw-r--r--www/firefox-esr/files/patch-bug138070636
1 files changed, 0 insertions, 36 deletions
diff --git a/www/firefox-esr/files/patch-bug1380706 b/www/firefox-esr/files/patch-bug1380706
deleted file mode 100644
index 5f7e57663145..000000000000
--- a/www/firefox-esr/files/patch-bug1380706
+++ /dev/null
@@ -1,36 +0,0 @@
-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();