From owner-svn-ports-branches@freebsd.org Sat Oct 17 01:08:52 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD09F444A86; Sat, 17 Oct 2020 01:08:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CClK04Zyqz4QTx; Sat, 17 Oct 2020 01:08:52 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80D0A19788; Sat, 17 Oct 2020 01:08:52 +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 09H18q92080361; Sat, 17 Oct 2020 01:08:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09H18p3B080357; Sat, 17 Oct 2020 01:08:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202010170108.09H18p3B080357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 17 Oct 2020 01:08:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r552537 - in branches/2020Q4/www/firefox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q4/www/firefox: . files X-SVN-Commit-Revision: 552537 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Oct 2020 01:08:52 -0000 Author: jbeich Date: Sat Oct 17 01:08:51 2020 New Revision: 552537 URL: https://svnweb.freebsd.org/changeset/ports/552537 Log: MFH: r552366 www/firefox: update to 82.0 Changes: https://www.mozilla.org/firefox/82.0/releasenotes/ Approved by: ports-secteam blanket Added: branches/2020Q4/www/firefox/files/patch-bug1670807 - copied unchanged from r552366, head/www/firefox/files/patch-bug1670807 Modified: branches/2020Q4/www/firefox/Makefile branches/2020Q4/www/firefox/distinfo branches/2020Q4/www/firefox/files/patch-bug1288587 Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/www/firefox/Makefile ============================================================================== --- branches/2020Q4/www/firefox/Makefile Sat Oct 17 00:55:17 2020 (r552536) +++ branches/2020Q4/www/firefox/Makefile Sat Oct 17 01:08:51 2020 (r552537) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 81.0.2 +DISTVERSION= 82.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2020Q4/www/firefox/distinfo ============================================================================== --- branches/2020Q4/www/firefox/distinfo Sat Oct 17 00:55:17 2020 (r552536) +++ branches/2020Q4/www/firefox/distinfo Sat Oct 17 01:08:51 2020 (r552537) @@ -1,3 +1,3 @@ -TIMESTAMP = 1602537269 -SHA256 (firefox-81.0.2.source.tar.xz) = 91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44 -SIZE (firefox-81.0.2.source.tar.xz) = 337759612 +TIMESTAMP = 1602696047 +SHA256 (firefox-82.0.source.tar.xz) = 90c58707f5bd34978e2d1bcadbe463556edc0878430f969893ae2f89c5d464c2 +SIZE (firefox-82.0.source.tar.xz) = 334793772 Modified: branches/2020Q4/www/firefox/files/patch-bug1288587 ============================================================================== --- branches/2020Q4/www/firefox/files/patch-bug1288587 Sat Oct 17 00:55:17 2020 (r552536) +++ branches/2020Q4/www/firefox/files/patch-bug1288587 Sat Oct 17 01:08:51 2020 (r552537) @@ -2,15 +2,15 @@ diff --git a/build/moz.configure/init.configure b/buil index 855214a..1e91d51 100644 --- build/moz.configure/init.configure +++ build/moz.configure/init.configure -@@ -251,6 +251,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre +@@ -240,6 +240,7 @@ option(env='VIRTUALENV_NAME', nargs=1, default='init_p @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') @imports(_from='mozbuild.pythonutil', _import='python_executable_version') @imports(_from='six', _import='ensure_text') +@imports(_from='__builtin__', _import='KeyError') - def virtualenv_python3(env_python, build_env, mozconfig, help): + def virtualenv_python3(env_python, virtualenv_name, build_env, mozconfig, help): # Avoid re-executing python when running configure --help. if help: -@@ -283,6 +284,12 @@ def virtualenv_python3(env_python, build_env, mozconfi +@@ -273,6 +274,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu python = mozconfig['vars']['added']['PYTHON3'] elif 'PYTHON3' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON3'][1] @@ -23,7 +23,7 @@ index 855214a..1e91d51 100644 log.debug("python3: executable from configuration: %r" % python) -@@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi +@@ -358,7 +365,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu sys.executable, manager.python_path)) log.info('Re-executing in the virtualenv') if env_python: Copied: branches/2020Q4/www/firefox/files/patch-bug1670807 (from r552366, head/www/firefox/files/patch-bug1670807) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q4/www/firefox/files/patch-bug1670807 Sat Oct 17 01:08:51 2020 (r552537, copy of r552366, head/www/firefox/files/patch-bug1670807) @@ -0,0 +1,15 @@ +Look for gm4 in addition to m4 + +diff --git build/moz.configure/old.configure build/moz.configure/old.configure +index 8c807c0794fab..5132228960f3d 100644 +--- build/moz.configure/old.configure ++++ build/moz.configure/old.configure +@@ -5,7 +5,7 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + +-m4 = check_prog('M4', ('m4',)) ++m4 = check_prog('M4', ('gm4', 'm4',)) + + + @depends(mozconfig)