From owner-svn-ports-branches@freebsd.org Mon Feb 22 17:10:24 2021 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 17BEE545B85; Mon, 22 Feb 2021 17:10:24 +0000 (UTC) (envelope-from cmt@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DkpbN0Fyyz3w8q; Mon, 22 Feb 2021 17:10:24 +0000 (UTC) (envelope-from cmt@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 EBE3A14AA; Mon, 22 Feb 2021 17:10:23 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11MHAN9B082382; Mon, 22 Feb 2021 17:10:23 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11MHANbA082378; Mon, 22 Feb 2021 17:10:23 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202102221710.11MHANbA082378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Mon, 22 Feb 2021 17:10:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r566313 - in branches/2021Q1/www/firefox-esr: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in branches/2021Q1/www/firefox-esr: . files X-SVN-Commit-Revision: 566313 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.34 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: Mon, 22 Feb 2021 17:10:24 -0000 Author: cmt Date: Mon Feb 22 17:10:22 2021 New Revision: 566313 URL: https://svnweb.freebsd.org/changeset/ports/566313 Log: MFH: r565791 update firefox-esr to 78.8.0 Release Notes (soon): https://www.mozilla.org/en-US/firefox/78.8.0/releasenotes/ Removed patches applied upstream, massaged patches where surrounding code changed. Modified: branches/2021Q1/www/firefox-esr/Makefile branches/2021Q1/www/firefox-esr/distinfo branches/2021Q1/www/firefox-esr/files/patch-addon-search branches/2021Q1/www/firefox-esr/files/patch-bug1288587 Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/www/firefox-esr/Makefile ============================================================================== --- branches/2021Q1/www/firefox-esr/Makefile Mon Feb 22 17:06:26 2021 (r566312) +++ branches/2021Q1/www/firefox-esr/Makefile Mon Feb 22 17:10:22 2021 (r566313) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 78.7.1 +DISTVERSION= 78.8.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Modified: branches/2021Q1/www/firefox-esr/distinfo ============================================================================== --- branches/2021Q1/www/firefox-esr/distinfo Mon Feb 22 17:06:26 2021 (r566312) +++ branches/2021Q1/www/firefox-esr/distinfo Mon Feb 22 17:10:22 2021 (r566313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1612510531 -SHA256 (firefox-78.7.1esr.source.tar.xz) = 5042783e2cf94d21dd990d2083800f05bc32f8ba65532a715c7be3cb7716b837 -SIZE (firefox-78.7.1esr.source.tar.xz) = 334417504 +TIMESTAMP = 1613560530 +SHA256 (firefox-78.8.0esr.source.tar.xz) = 1cf2dfdee2e31fd0a5ecced6275a33fa11bee1d2a7c65e23350b26992584a110 +SIZE (firefox-78.8.0esr.source.tar.xz) = 330937116 Modified: branches/2021Q1/www/firefox-esr/files/patch-addon-search ============================================================================== --- branches/2021Q1/www/firefox-esr/files/patch-addon-search Mon Feb 22 17:06:26 2021 (r566312) +++ branches/2021Q1/www/firefox-esr/files/patch-addon-search Mon Feb 22 17:10:22 2021 (r566313) @@ -8,11 +8,11 @@ index 75c2c5e435e35..4d8c09c02759b 100644 @@ -37,7 +37,7 @@ pref("extensions.webextOptionalPermissionPrompts", true); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); + pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v4/addons/search/?guid=%IDS%&lang=%LOCALE%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%"); pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); - pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); + pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); @@ -168,8 +168,8 @@ pref("app.update.staging.enabled", true); // .. etc .. Modified: branches/2021Q1/www/firefox-esr/files/patch-bug1288587 ============================================================================== --- branches/2021Q1/www/firefox-esr/files/patch-bug1288587 Mon Feb 22 17:06:26 2021 (r566312) +++ branches/2021Q1/www/firefox-esr/files/patch-bug1288587 Mon Feb 22 17:10:22 2021 (r566313) @@ -7,7 +7,7 @@ index 855214a..1e91d51 100644 @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