diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-07-19 00:00:51 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-07-19 00:00:51 +0000 |
| commit | 29145c76beecf4766959022ab9fc0fb1880561a1 (patch) | |
| tree | 4572e087e9d0e8ed179a8053877c780942a72cfa /mail/thunderbird/files/patch-env-api-keys | |
| parent | mail/thunderbird: drop patches in preparation for update (diff) | |
mail/thunderbird: update to 60.0
Changes: https://www.mozilla.org/thunderbird/60.0/releasenotes/
PR: 228477
Differential Revision: https://reviews.freebsd.org/D15565
Notes
Notes:
svn path=/head/; revision=474921
Diffstat (limited to 'mail/thunderbird/files/patch-env-api-keys')
| -rw-r--r-- | mail/thunderbird/files/patch-env-api-keys | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mail/thunderbird/files/patch-env-api-keys b/mail/thunderbird/files/patch-env-api-keys new file mode 100644 index 000000000000..e20b012f27cf --- /dev/null +++ b/mail/thunderbird/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 +@@ -18,6 +18,7 @@ def keyfile(desc, 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: +@@ -28,7 +29,7 @@ def keyfile(desc, 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 + |