Date: Tue, 7 Mar 2017 18:43:13 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r435635 - in branches/2017Q1/www/firefox: . files Message-ID: <201703071843.v27IhDB4000822@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Mar 7 18:43:13 2017 New Revision: 435635 URL: https://svnweb.freebsd.org/changeset/ports/435635 Log: MFH: r435374 www/firefox: attempt to unbreak wifi geo and safebrowsing since 51.0 Approved by: ports-secteam (junovitch) Added: branches/2017Q1/www/firefox/files/patch-env-api-keys - copied unchanged from r435374, head/www/firefox/files/patch-env-api-keys Modified: branches/2017Q1/www/firefox/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/firefox/Makefile ============================================================================== --- branches/2017Q1/www/firefox/Makefile Tue Mar 7 18:38:54 2017 (r435634) +++ branches/2017Q1/www/firefox/Makefile Tue Mar 7 18:43:13 2017 (r435635) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 52.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 1 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied: branches/2017Q1/www/firefox/files/patch-env-api-keys (from r435374, head/www/firefox/files/patch-env-api-keys) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox/files/patch-env-api-keys Tue Mar 7 18:43:13 2017 (r435635, copy of r435374, head/www/firefox/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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703071843.v27IhDB4000822>