Date: Wed, 23 May 2018 19:56:14 +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: r470716 - in branches/2018Q2: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/seamonkey www/seamonkey/files www/waterfox ... Message-ID: <201805231956.w4NJuEIl039109@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed May 23 19:56:13 2018 New Revision: 470716 URL: https://svnweb.freebsd.org/changeset/ports/470716 Log: MFH: r470668 r470672 r470675 gecko: mask as Linux on AMO for compatibility Many extensions on addons.mozilla.org aren't listed or updated due to platform whitelist abuse. On DragonFly the search is broken because such a platform isn't recognized. PR: 226919 Reported by: Graham Perrin, Corpo (Lightning) Approved by: ports-secteam blanket Added: branches/2018Q2/mail/thunderbird/files/patch-addon-search - copied, changed from r470668, head/mail/thunderbird/files/patch-addon-search branches/2018Q2/www/firefox-esr/files/patch-addon-search - copied, changed from r470668, head/www/firefox-esr/files/patch-addon-search branches/2018Q2/www/firefox/files/patch-addon-search - copied, changed from r470668, head/www/firefox/files/patch-addon-search branches/2018Q2/www/seamonkey/files/patch-addon-search - copied, changed from r470668, head/www/seamonkey/files/patch-addon-search branches/2018Q2/www/waterfox/files/patch-addon-search - copied, changed from r470668, head/www/waterfox/files/patch-addon-search Modified: branches/2018Q2/mail/thunderbird/Makefile branches/2018Q2/www/firefox-esr/Makefile branches/2018Q2/www/firefox/Makefile branches/2018Q2/www/seamonkey/Makefile branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q2/mail/thunderbird/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/mail/thunderbird/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 52.8.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied and modified: branches/2018Q2/mail/thunderbird/files/patch-addon-search (from r470668, head/mail/thunderbird/files/patch-addon-search) ============================================================================== --- head/mail/thunderbird/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/mail/thunderbird/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -45,7 +45,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -54,7 +54,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2018Q2/www/firefox-esr/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/firefox-esr/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 52.8.0 DISTVERSIONSUFFIX=esr +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Copied and modified: branches/2018Q2/www/firefox-esr/files/patch-addon-search (from r470668, head/www/firefox-esr/files/patch-addon-search) ============================================================================== --- head/www/firefox-esr/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/firefox-esr/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -44,7 +44,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -53,7 +53,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/firefox/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied and modified: branches/2018Q2/www/firefox/files/patch-addon-search (from r470668, head/www/firefox/files/patch-addon-search) ============================================================================== --- head/www/firefox/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/firefox/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -36,7 +36,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { - if (file.platform == "all" || file.platform == Services.appinfo.OS.toLowerCase()) { -+ if (file.platform == "all" || file.platform == "linux") { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == Services.appinfo.OS.toLowerCase()) { if (file.url) { addon.sourceURI = NetUtil.newURI(file.url); } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -4974,7 +4974,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/seamonkey/Makefile ============================================================================== --- branches/2018Q2/www/seamonkey/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/seamonkey/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.3 -PORTREVISION= 1 +PORTREVISION= 2 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied and modified: branches/2018Q2/www/seamonkey/files/patch-addon-search (from r470668, head/www/seamonkey/files/patch-addon-search) ============================================================================== --- head/www/seamonkey/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/seamonkey/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -42,7 +42,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -51,7 +51,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/waterfox/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,6 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-13 DISTVERSIONSUFFIX= -gd2cdd42f4115b +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied and modified: branches/2018Q2/www/waterfox/files/patch-addon-search (from r470668, head/www/waterfox/files/patch-addon-search) ============================================================================== --- head/www/waterfox/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/waterfox/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -42,7 +42,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -51,7 +51,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805231956.w4NJuEIl039109>