diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
commit | e344179e4710fcd9e8b27f21ad966399c6676062 (patch) | |
tree | 25470098899348b52b879360dae665e7d4b833ee /mail/thunderbird/files/patch-bug1380706 | |
parent | - missed a '+" (diff) |
mail/thunderbird: drop patches in preparation for update
$ svn commit
Sending Mk/Uses/gecko.mk
Sending mail/thunderbird/Makefile
Sending mail/thunderbird/distinfo
Sending mail/thunderbird/files/patch-addon-search
Replacing mail/thunderbird/files/patch-bug1021761
Adding mail/thunderbird/files/patch-bug1144632
Deleting mail/thunderbird/files/patch-bug1186967
[...]
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/mail/thunderbird/files/patch-bug702179"
== Additional errors may compound and may not be accurate ==
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1021761"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1288587"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug847568"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-env-api-keys"
[...]
Pointy hat to: portmgr (multi-steps are error prone)
Diffstat (limited to 'mail/thunderbird/files/patch-bug1380706')
-rw-r--r-- | mail/thunderbird/files/patch-bug1380706 | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/mail/thunderbird/files/patch-bug1380706 b/mail/thunderbird/files/patch-bug1380706 deleted file mode 100644 index 0fe688458ae6..000000000000 --- a/mail/thunderbird/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 ---- 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(); |