tor-browser: update to 9.5.

This release includes important security updates to Firefox.

This new Tor Browser release is focused on helping users understand
onion services.

Tor's onion routing remains the best way to achieve end-to-end
anonymous communication on the Internet. With onion services (.onion
addresses), website administrators can provide their users with
anonymous connections that are metadata-free or that hide metadata
from any third party. Onion services are also one of the few
censorship circumvention technologies that allow users to route
around censorship while simultaneously protecting their privacy
and identity.

For the first time, Tor Browser users on desktop will be able to
opt-in for using onion sites automatically whenever the website
makes them available. For years, some websites have invisibly used
onion services with alternative services (alt-svc), and this
continues to be an excellent choice. Now, there is also an opt-in
mechanism available for websites that want their users to know
about their onion service that invites them to upgrade their
connection via the .onion address.

5 files changed, 85 insertions, 33 deletions

diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile
index 637424de5b7..d4447bdc55b 100644
--- a/security/tor-browser/Makefile
+++ b/security/tor-browser/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.65 2020/06/02 08:24:43 adam Exp $
+# $NetBSD: Makefile,v 1.66 2020/06/07 13:06:00 wiz Exp $
 
-DISTNAME=	src-firefox-tor-browser-68.8.0esr-9.0-2-build1
-PKGNAME=	tor-browser-9.0.10
-PKGREVISION=	1
+DISTNAME=	src-firefox-tor-browser-68.9.0esr-9.5-1-build2
+PKGNAME=	tor-browser-9.5
 CATEGORIES=	security www
 MASTER_SITES=	https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX}
-#DISTFILES+=	src-tor-launcher-0.2.20.5${EXTRACT_SUFX}
+#DISTFILES+=	src-tor-launcher-0.2.21.8${EXTRACT_SUFX}
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	https://www.torproject.org/projects/torbrowser.html.en
diff --git a/security/tor-browser/PLIST b/security/tor-browser/PLIST
index b7b7db0f0e9..7cf0b8a10a2 100644
--- a/security/tor-browser/PLIST
+++ b/security/tor-browser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/05/01 07:01:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/06/07 13:06:00 wiz Exp $
 bin/tor-browser
 lib/tor-browser/actors/AudioPlaybackChild.jsm
 lib/tor-browser/actors/AutoplayChild.jsm
@@ -25,7 +25,6 @@ lib/tor-browser/actors/ZoomChild.jsm
 lib/tor-browser/application.ini
 lib/tor-browser/browser/actors/AboutLoginsChild.jsm
 lib/tor-browser/browser/actors/AboutReaderChild.jsm
-lib/tor-browser/browser/actors/AboutTBUpdateChild.jsm
 lib/tor-browser/browser/actors/BlockedSiteChild.jsm
 lib/tor-browser/browser/actors/BrowserTabChild.jsm
 lib/tor-browser/browser/actors/ClickHandlerChild.jsm
@@ -107,9 +106,6 @@ lib/tor-browser/browser/chrome/browser/content/browser/aboutlogins/icons/delete.
 lib/tor-browser/browser/chrome/browser/content/browser/aboutlogins/icons/edit.svg
 lib/tor-browser/browser/chrome/browser/content/browser/aboutlogins/icons/hide-password.svg
 lib/tor-browser/browser/chrome/browser/content/browser/aboutlogins/icons/show-password.svg
-lib/tor-browser/browser/chrome/browser/content/browser/abouttbupdate/aboutTBUpdate.css
-lib/tor-browser/browser/chrome/browser/content/browser/abouttbupdate/aboutTBUpdate.js
-lib/tor-browser/browser/chrome/browser/content/browser/abouttbupdate/aboutTBUpdate.xhtml
 lib/tor-browser/browser/chrome/browser/content/browser/blockedSite.js
 lib/tor-browser/browser/chrome/browser/content/browser/blockedSite.xhtml
 lib/tor-browser/browser/chrome/browser/content/browser/browser-addons.js
@@ -196,6 +192,20 @@ lib/tor-browser/browser/chrome/browser/content/browser/newInstall.xul
 lib/tor-browser/browser/chrome/browser/content/browser/newInstallPage.html
 lib/tor-browser/browser/chrome/browser/content/browser/newInstallPage.js
 lib/tor-browser/browser/chrome/browser/content/browser/nsContextMenu.js
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/authPreferences.css
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/authPreferences.js
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/authPrompt.js
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/authUtil.jsm
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/netError/browser.svg
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/netError/network.svg
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/netError/onionNetError.css
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/netError/onionNetError.jsm
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/netError/onionsite.svg
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/onionlocation.svg
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/onionlocationPreferences.js
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/onionservices.css
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/savedKeysDialog.js
+lib/tor-browser/browser/chrome/browser/content/browser/onionservices/savedKeysDialog.xul
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.css
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.js
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.xul
@@ -1109,8 +1119,6 @@ lib/tor-browser/browser/chrome/browser/search-extensions/ddg/favicon.png
 lib/tor-browser/browser/chrome/browser/search-extensions/ddg/manifest.json
 lib/tor-browser/browser/chrome/browser/search-extensions/diec2/favicon.png
 lib/tor-browser/browser/chrome/browser/search-extensions/diec2/manifest.json
-lib/tor-browser/browser/chrome/browser/search-extensions/disconnect/favicon.ico
-lib/tor-browser/browser/chrome/browser/search-extensions/disconnect/manifest.json
 lib/tor-browser/browser/chrome/browser/search-extensions/drae/favicon.ico
 lib/tor-browser/browser/chrome/browser/search-extensions/drae/manifest.json
 lib/tor-browser/browser/chrome/browser/search-extensions/ebay/_locales/at/messages.json
@@ -1404,8 +1412,8 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/s
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/screen.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/update.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion-disabled.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion-lock.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion-slash.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion-warning.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/open.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/pageInfo.css
@@ -3496,7 +3504,6 @@ lib/tor-browser/browser/chrome/devtools/skin/widgets.css
 lib/tor-browser/browser/chrome/en-US/locale/branding/brand.dtd
 lib/tor-browser/browser/chrome/en-US/locale/branding/brand.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser-region/region.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/aboutTBUpdate.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/accounts.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/app-extension-fields.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/appstrings.properties
@@ -4059,7 +4066,6 @@ lib/tor-browser/browser/modules/AboutDevToolsToolboxRegistration.jsm
 lib/tor-browser/browser/modules/AboutLoginsParent.jsm
 lib/tor-browser/browser/modules/AboutNewTab.jsm
 lib/tor-browser/browser/modules/AboutNewTabService.jsm
-lib/tor-browser/browser/modules/AboutTBUpdate.jsm
 lib/tor-browser/browser/modules/AsyncTabSwitcher.jsm
 lib/tor-browser/browser/modules/AttributionCode.jsm
 lib/tor-browser/browser/modules/BridgeDB.jsm
@@ -4086,6 +4092,7 @@ lib/tor-browser/browser/modules/DownloadsViewUI.jsm
 lib/tor-browser/browser/modules/DragPositionManager.jsm
 lib/tor-browser/browser/modules/EveryWindow.jsm
 lib/tor-browser/browser/modules/ExtensionControlledPopup.jsm
+lib/tor-browser/browser/modules/ExtensionMessaging.jsm
 lib/tor-browser/browser/modules/ExtensionPopups.jsm
 lib/tor-browser/browser/modules/ExtensionsUI.jsm
 lib/tor-browser/browser/modules/FaviconLoader.jsm
@@ -4093,10 +4100,14 @@ lib/tor-browser/browser/modules/FirefoxProfileMigrator.jsm
 lib/tor-browser/browser/modules/FormValidationHandler.jsm
 lib/tor-browser/browser/modules/HeadlessShell.jsm
 lib/tor-browser/browser/modules/HomePage.jsm
+lib/tor-browser/browser/modules/HttpsEverywhereControl.jsm
 lib/tor-browser/browser/modules/LaterRun.jsm
 lib/tor-browser/browser/modules/LiveBookmarkMigrator.jsm
 lib/tor-browser/browser/modules/MigrationUtils.jsm
 lib/tor-browser/browser/modules/NewTabPagePreloading.jsm
+lib/tor-browser/browser/modules/OnionAliasStore.jsm
+lib/tor-browser/browser/modules/OnionLocationChild.jsm
+lib/tor-browser/browser/modules/OnionLocationParent.jsm
 lib/tor-browser/browser/modules/OpenInTabsUtils.jsm
 lib/tor-browser/browser/modules/PageActions.jsm
 lib/tor-browser/browser/modules/PanelMultiView.jsm
@@ -4923,7 +4934,6 @@ lib/tor-browser/chrome/toolkit/skin/classic/mozapps/profile/profileDowngrade.css
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/profile/profileSelection.css
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/update/updates.css
-lib/tor-browser/chrome/torbutton/components/cookie-jar-selector.js
 lib/tor-browser/chrome/torbutton/components/domain-isolator.js
 lib/tor-browser/chrome/torbutton/components/dragDropFilter.js
 lib/tor-browser/chrome/torbutton/components/external-app-blocker.js
@@ -4932,13 +4942,11 @@ lib/tor-browser/chrome/torbutton/components/torCheckService.js
 lib/tor-browser/chrome/torbutton/components/torbutton-logger.js
 lib/tor-browser/chrome/torbutton/content/aboutTor/aboutTor-content.js
 lib/tor-browser/chrome/torbutton/content/aboutTor/aboutTor.xhtml
-lib/tor-browser/chrome/torbutton/content/locale/non-localized.properties
+lib/tor-browser/chrome/torbutton/content/aboutTor/resources/aboutTor.js
 lib/tor-browser/chrome/torbutton/content/preferences-mobile.js
 lib/tor-browser/chrome/torbutton/content/preferences.xhtml
 lib/tor-browser/chrome/torbutton/content/tor-circuit-display.js
 lib/tor-browser/chrome/torbutton/content/torbutton.js
-lib/tor-browser/chrome/torbutton/content/torbutton_util.js
-lib/tor-browser/chrome/torbutton/defaults/preferences/preferences.js
 lib/tor-browser/chrome/torbutton/locale/ar/aboutDialog.dtd
 lib/tor-browser/chrome/torbutton/locale/ar/aboutTBUpdate.dtd
 lib/tor-browser/chrome/torbutton/locale/ar/aboutTor.dtd
@@ -5139,6 +5147,16 @@ lib/tor-browser/chrome/torbutton/locale/ko/browserOnboarding.properties
 lib/tor-browser/chrome/torbutton/locale/ko/onboarding.properties
 lib/tor-browser/chrome/torbutton/locale/ko/torbutton.dtd
 lib/tor-browser/chrome/torbutton/locale/ko/torbutton.properties
+lib/tor-browser/chrome/torbutton/locale/lt/aboutDialog.dtd
+lib/tor-browser/chrome/torbutton/locale/lt/aboutTBUpdate.dtd
+lib/tor-browser/chrome/torbutton/locale/lt/aboutTor.dtd
+lib/tor-browser/chrome/torbutton/locale/lt/brand.dtd
+lib/tor-browser/chrome/torbutton/locale/lt/brand.properties
+lib/tor-browser/chrome/torbutton/locale/lt/branding/tor-browser-brand.ftl
+lib/tor-browser/chrome/torbutton/locale/lt/browserOnboarding.properties
+lib/tor-browser/chrome/torbutton/locale/lt/onboarding.properties
+lib/tor-browser/chrome/torbutton/locale/lt/torbutton.dtd
+lib/tor-browser/chrome/torbutton/locale/lt/torbutton.properties
 lib/tor-browser/chrome/torbutton/locale/mk/aboutDialog.dtd
 lib/tor-browser/chrome/torbutton/locale/mk/aboutTBUpdate.dtd
 lib/tor-browser/chrome/torbutton/locale/mk/aboutTor.dtd
@@ -5149,6 +5167,16 @@ lib/tor-browser/chrome/torbutton/locale/mk/browserOnboarding.properties
 lib/tor-browser/chrome/torbutton/locale/mk/onboarding.properties
 lib/tor-browser/chrome/torbutton/locale/mk/torbutton.dtd
 lib/tor-browser/chrome/torbutton/locale/mk/torbutton.properties
+lib/tor-browser/chrome/torbutton/locale/ms/aboutDialog.dtd
+lib/tor-browser/chrome/torbutton/locale/ms/aboutTBUpdate.dtd
+lib/tor-browser/chrome/torbutton/locale/ms/aboutTor.dtd
+lib/tor-browser/chrome/torbutton/locale/ms/brand.dtd
+lib/tor-browser/chrome/torbutton/locale/ms/brand.properties
+lib/tor-browser/chrome/torbutton/locale/ms/branding/tor-browser-brand.ftl
+lib/tor-browser/chrome/torbutton/locale/ms/browserOnboarding.properties
+lib/tor-browser/chrome/torbutton/locale/ms/onboarding.properties
+lib/tor-browser/chrome/torbutton/locale/ms/torbutton.dtd
+lib/tor-browser/chrome/torbutton/locale/ms/torbutton.properties
 lib/tor-browser/chrome/torbutton/locale/nb-NO/aboutDialog.dtd
 lib/tor-browser/chrome/torbutton/locale/nb-NO/aboutTBUpdate.dtd
 lib/tor-browser/chrome/torbutton/locale/nb-NO/aboutTor.dtd
@@ -5219,6 +5247,16 @@ lib/tor-browser/chrome/torbutton/locale/sv-SE/browserOnboarding.properties
 lib/tor-browser/chrome/torbutton/locale/sv-SE/onboarding.properties
 lib/tor-browser/chrome/torbutton/locale/sv-SE/torbutton.dtd
 lib/tor-browser/chrome/torbutton/locale/sv-SE/torbutton.properties
+lib/tor-browser/chrome/torbutton/locale/th/aboutDialog.dtd
+lib/tor-browser/chrome/torbutton/locale/th/aboutTBUpdate.dtd
+lib/tor-browser/chrome/torbutton/locale/th/aboutTor.dtd
+lib/tor-browser/chrome/torbutton/locale/th/brand.dtd
+lib/tor-browser/chrome/torbutton/locale/th/brand.properties
+lib/tor-browser/chrome/torbutton/locale/th/branding/tor-browser-brand.ftl
+lib/tor-browser/chrome/torbutton/locale/th/browserOnboarding.properties
+lib/tor-browser/chrome/torbutton/locale/th/onboarding.properties
+lib/tor-browser/chrome/torbutton/locale/th/torbutton.dtd
+lib/tor-browser/chrome/torbutton/locale/th/torbutton.properties
 lib/tor-browser/chrome/torbutton/locale/tr/aboutDialog.dtd
 lib/tor-browser/chrome/torbutton/locale/tr/aboutTBUpdate.dtd
 lib/tor-browser/chrome/torbutton/locale/tr/aboutTor.dtd
@@ -5259,7 +5297,6 @@ lib/tor-browser/chrome/torbutton/locale/zh-TW/browserOnboarding.properties
 lib/tor-browser/chrome/torbutton/locale/zh-TW/onboarding.properties
 lib/tor-browser/chrome/torbutton/locale/zh-TW/torbutton.dtd
 lib/tor-browser/chrome/torbutton/locale/zh-TW/torbutton.properties
-lib/tor-browser/chrome/torbutton/modules/default-prefs.js
 lib/tor-browser/chrome/torbutton/modules/noscript-control.js
 lib/tor-browser/chrome/torbutton/modules/security-prefs.js
 lib/tor-browser/chrome/torbutton/modules/tor-control-port.js
diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo
index 7786157b3cb..ef94ce70a54 100644
--- a/security/tor-browser/distinfo
+++ b/security/tor-browser/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.20 2020/05/06 07:13:39 wiz Exp $
+$NetBSD: distinfo,v 1.21 2020/06/07 13:06:00 wiz Exp $
 
-SHA1 (src-firefox-tor-browser-68.8.0esr-9.0-2-build1.tar.xz) = def093ae726b40e573a95dafa73057e068780873
-RMD160 (src-firefox-tor-browser-68.8.0esr-9.0-2-build1.tar.xz) = bf89bcfbccf69d05ed021e98656204ac0a2fdaa9
-SHA512 (src-firefox-tor-browser-68.8.0esr-9.0-2-build1.tar.xz) = 827a13a2dd81ec1ca84cc93ea49de82640add7fdc1f872395a7be961525e2d7f20740877408832e7c65c6a1a44a5552ab8169c96662bdb240e8aedc88c79d122
-Size (src-firefox-tor-browser-68.8.0esr-9.0-2-build1.tar.xz) = 348566404 bytes
-SHA1 (tor-browser-linux64-9.0.10_en-US.tar.xz) = f50f4cdca7b96f0d50daf4b82de3d0f492634ce8
-RMD160 (tor-browser-linux64-9.0.10_en-US.tar.xz) = e4286dd13ffebbd6300f676d69aff65d1ed666f8
-SHA512 (tor-browser-linux64-9.0.10_en-US.tar.xz) = 60b54a7890e84d52a97066638ef8fbb4a24184c5f53f6d937879082fab224c346acb46e3cb90f9fb5b4030ecd980e7610f81f563f76b6f1829285937f19e5484
-Size (tor-browser-linux64-9.0.10_en-US.tar.xz) = 80175308 bytes
+SHA1 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 27b3e18e92341557b9c8b18afd114d458dd2e403
+RMD160 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = db61ef7788f1b6c4111e7a4c6df56c7bd51e6777
+SHA512 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 5a8db89e2bd60980bd00d779c23433014b2d4e29bd55cc81ec83115fb62d79246e73b36cee765b285cadd9306b57f737264549936431898e78717be01200a435
+Size (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 348699028 bytes
+SHA1 (tor-browser-linux64-9.5_en-US.tar.xz) = 3f84ce557b01fe22157f52d7387f979ee2824da6
+RMD160 (tor-browser-linux64-9.5_en-US.tar.xz) = df45b10a19916d79f65d99f87505d0ecce55a8fe
+SHA512 (tor-browser-linux64-9.5_en-US.tar.xz) = 7534711c12192e937c3a71ea5d3f1d3786d0cb5da6c3f9f8db5c5950c9c342a60fbcc9c4bded2fcea1e5342de3c09b41641154c4fa757734afa21c81f223b5b2
+Size (tor-browser-linux64-9.5_en-US.tar.xz) = 79022648 bytes
 SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8
 SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
 SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
 SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
+SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
diff --git a/security/tor-browser/options.mk b/security/tor-browser/options.mk
index 466b29c933f..a216e3b3a3f 100644
--- a/security/tor-browser/options.mk
+++ b/security/tor-browser/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2019/11/04 21:13:03 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2020/06/07 13:06:00 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tor-browser
 PKG_SUPPORTED_OPTIONS+=	alsa debug debug-info mozilla-jemalloc pulseaudio
-PLIST_VARS+=		debug
 
 PKG_SUGGESTED_OPTIONS.Linux+=	alsa mozilla-jemalloc
 
@@ -40,7 +39,6 @@ O0TRACKING=-fvar-tracking-assignments -fvar-tracking
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug="-g -O0 ${O0TRACKING}" --enable-debug-symbols --disable-optimize
 CONFIGURE_ARGS+=	--disable-install-strip
-PLIST.debug=		yes
 .else
 .  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=	--enable-debug-symbols
diff --git a/security/tor-browser/patches/patch-build_moz.configure_rust.configure b/security/tor-browser/patches/patch-build_moz.configure_rust.configure
new file mode 100644
index 00000000000..bed6d0108a6
--- /dev/null
+++ b/security/tor-browser/patches/patch-build_moz.configure_rust.configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.3 2020/06/07 13:06:00 wiz Exp $
+
+* Do not match rumprun toolchain for NetBSD,
+  narrowed should be one not two.
+
+--- build/moz.configure/rust.configure.orig	2020-05-28 00:01:39.000000000 +0000
++++ build/moz.configure/rust.configure
+@@ -330,7 +330,8 @@ def rust_triple_alias(host_or_target):
+             narrowed = [
+                 c for c in candidates
+                 if c.target.raw_os == host_or_target.raw_os and
+-                   c.target.raw_cpu == host_or_target.raw_cpu
++                   c.target.raw_cpu == host_or_target.raw_cpu and
++                   not c.rust_target.endswith("-rumprun-netbsd")
+             ]
+             if len(narrowed) == 1:
+                 return narrowed[0].rust_target