From owner-svn-ports-all@freebsd.org Tue Mar 7 18:43:15 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13E83D007F3; Tue, 7 Mar 2017 18:43:15 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD481102E; Tue, 7 Mar 2017 18:43:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v27IhD00000824; Tue, 7 Mar 2017 18:43:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v27IhDB4000822; Tue, 7 Mar 2017 18:43:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201703071843.v27IhDB4000822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 7 Mar 2017 18:43:13 +0000 (UTC) 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 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2017 18:43:15 -0000 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 +