summaryrefslogtreecommitdiff
path: root/mail/thunderbird-esr/files/patch-env-api-keys
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2025-03-27 20:06:37 +0100
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2025-03-27 20:06:37 +0100
commita9097e0cd9ee6794deea0015289aae24f8176916 (patch)
treee1eb5b5307c223641a50a03a2da38143f86d48d7 /mail/thunderbird-esr/files/patch-env-api-keys
parentwww/firefox-esr: update to 128.9.0 (rc2) (diff)
mail/thunderbird-esr: copy thunderbird 128.9.0
in preparation for importing Thunderbird 137.0 Release Notes (soon): https://www.thunderbird.net/en-US/thunderbird/128.9.0esr/releasenotes/
Diffstat (limited to 'mail/thunderbird-esr/files/patch-env-api-keys')
-rw-r--r--mail/thunderbird-esr/files/patch-env-api-keys21
1 files changed, 21 insertions, 0 deletions
diff --git a/mail/thunderbird-esr/files/patch-env-api-keys b/mail/thunderbird-esr/files/patch-env-api-keys
new file mode 100644
index 000000000000..a97a99d6b54a
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-env-api-keys
@@ -0,0 +1,21 @@
+# Accept API keys from environment like before bug 1294585
+
+--- build/moz.configure/keyfiles.configure
++++ build/moz.configure/keyfiles.configure
+@@ -19,6 +19,7 @@ def keyfile(desc, default=None, help=None, callback=lambda x: x):
+ @checking("for the %s key" % desc, lambda x: x and x is not no_key)
+ @imports(_from="__builtin__", _import="open")
+ @imports(_from="__builtin__", _import="IOError")
++ @imports(_from="os", _import="environ")
+ def keyfile(value):
+ if value:
+ try:
+@@ -29,7 +30,7 @@ def keyfile(desc, default=None, help=None, callback=lambda x: x):
+ raise FatalCheckError("'%s' is empty." % value[0])
+ except IOError as e:
+ raise FatalCheckError("'%s': %s." % (value[0], e.strerror))
+- return no_key
++ return environ.get("MOZ_%s_KEY" % desc.upper().replace(" ", "_")) or no_key
+
+ return keyfile
+