CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jan 26 15:02:55 UTC 2021

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST distinfo
        pkgsrc/www/firefox/patches: patch-config_makefiles_rust.mk
Added Files:
        pkgsrc/www/firefox/patches: patch-js_public_ErrorReport.h
Removed Files:
        pkgsrc/www/firefox/patches:
            patch-third__party_libwebrtc_webrtc_modules_desktop__capture_desktop__capture__generic__gn_moz.build

Log Message:
firefox: Update to 85.0

Changelog:
New

  * Firefox now protects you from supercookies, a type of tracker that can stay
    hidden in your browser and track you online, even after you clear cookies.
    By isolating supercookies, Firefox prevents them from tracking your web
    browsing from one site to the next.

  * It??s easier than ever to save and access your bookmarks. Firefox now
    remembers your preferred location for saved bookmarks, displays the
    bookmarks toolbar by default on new tabs, and gives you easy access to all
    of your bookmarks via a toolbar folder.

  * The password manager now allows you to remove all of your saved logins with
    one click, as opposed to having to delete each login individually.

Fixed

  * Various security fixes.

Changed

  * Firefox no longer supports Adobe Flash. There is no setting available to
    re-enable Flash support.

Enterprise

  * Various bug fixes and new policies have been implemented in the latest
    version of Firefox. You can see more details in the Firefox for Enterprise
    85 Release Notes.

Developer

  * Developer Information
  * CSS: We have added support for the :focus-visible pseudo class.

  * It's possible to prettify JS expressions in Console source code Editor
    (available in multiline mode) using a new toolbar button.
    Console Editor Pretty Print Expression Screenshot

Security fixes:
#CVE-2021-23953: Cross-origin information leakage via redirected PDF requests
#CVE-2021-23954: Type confusion when using logical assignment operators in
 JavaScript switch statements
#CVE-2021-23955: Clickjacking across tabs through misusing requestPointerLock
#CVE-2021-23956: File picker dialog could have been used to disclose a complete
 directory
#CVE-2021-23957: Iframe sandbox could have been bypassed on Android via the
 intent URL scheme
#CVE-2021-23958: Screen sharing permission leaked across tabs
#CVE-2021-23959: Cross-Site Scripting in error pages on Firefox for Android
#CVE-2021-23960: Use-after-poison for incorrectly redeclared JavaScript
 variables during GC
#CVE-2021-23961: More internal network hosts could have been probed by a
malicious webpage
#CVE-2021-23962: Use-after-poison in <code>nsTreeBodyFrame::RowCountChanged</
 code>
#CVE-2021-23963: Permission prompt inaccessible after asking for additional
 permissions
#CVE-2021-23964: Memory safety bugs fixed in Firefox 85 and Firefox ESR 78.7
#CVE-2021-23965: Memory safety bugs fixed in Firefox 85


To generate a diff of this commit:
cvs rdiff -u -r1.465 -r1.466 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.168 -r1.169 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.425 -r1.426 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-js_public_ErrorReport.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_webrtc_modules_desktop__capture_desktop__capture__generic__gn_moz.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.465 pkgsrc/www/firefox/Makefile:1.466
--- pkgsrc/www/firefox/Makefile:1.465   Fri Jan  8 09:56:55 2021
+++ pkgsrc/www/firefox/Makefile Tue Jan 26 15:02:55 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.465 2021/01/08 09:56:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.466 2021/01/26 15:02:55 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            84.0
-MOZ_BRANCH_MINOR=      .2
+MOZ_BRANCH=            85.0
+MOZ_BRANCH_MINOR=      
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.168 pkgsrc/www/firefox/PLIST:1.169
--- pkgsrc/www/firefox/PLIST:1.168      Fri Jan  1 12:52:16 2021
+++ pkgsrc/www/firefox/PLIST    Tue Jan 26 15:02:55 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.168 2021/01/01 12:52:16 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.169 2021/01/26 15:02:55 ryoon Exp $
 bin/firefox
 lib/firefox/actors/AboutHttpsOnlyErrorChild.jsm
 lib/firefox/actors/AboutHttpsOnlyErrorParent.jsm
@@ -103,8 +103,8 @@ lib/firefox/browser/actors/RFPHelperChil
 lib/firefox/browser/actors/RFPHelperParent.jsm
 lib/firefox/browser/actors/RefreshBlockerChild.jsm
 lib/firefox/browser/actors/RefreshBlockerParent.jsm
-lib/firefox/browser/actors/SearchTelemetryChild.jsm
-lib/firefox/browser/actors/SearchTelemetryParent.jsm
+lib/firefox/browser/actors/SearchSERPTelemetryChild.jsm
+lib/firefox/browser/actors/SearchSERPTelemetryParent.jsm
 lib/firefox/browser/actors/SiteSpecificBrowserChild.jsm
 lib/firefox/browser/actors/SiteSpecificBrowserParent.jsm
 lib/firefox/browser/actors/SwitchDocumentDirectionChild.jsm
@@ -166,8 +166,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/illustration-screenshots%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/illustration-sync%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/long-zap.svg
-lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/privacy-onboarding-dark.webm
-lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/privacy-onboarding.webm
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/protection-report-icon.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/remote/pip-message-icon.svg
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/short-zap.svg
@@ -186,33 +184,43 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/trailhead/card-illo-sendtab.svg
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/trailhead/card-illo-tracking.svg
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/whatsnew-send-icon.png
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/adidas.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/aliexpress-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/allegro-pl.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/amazon.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/avito-ru.ico
-lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/baidu-com.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/baidu-com.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/bbc-uk.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/bing-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/ctrip-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/duckduckgo-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/ebay.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/etsy.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/facebook-com.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/geico.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/google-com.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/hrblock.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/ifeng-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/iqiyi-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/leboncoin-fr.png
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/nike.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/ok-ru.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/olx-pl.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/reddit-com.png
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/samsung.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/turbotax.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/twitter-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/vk-com.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/vodafone.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/weibo-com.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/wikipedia-org.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/wix.ico
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/wykop-pl.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/yandex-com.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/yandex-ru.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/youtube-com.png
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/zhihu-com.ico
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/adidas%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/aliexpress-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/allegro-pl%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/amazon%2x.png@localhost
@@ -223,18 +231,26 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/ctrip-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/duckduckgo-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/ebay%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/etsy%2x.jpg@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/facebook-com%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/geico%2x.jpg@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/google-com%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/hrblock%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/ifeng-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/iqiyi-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/leboncoin-fr%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/nike%2x.jpg@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/ok-ru%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/olx-pl%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/reddit-com%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/samsung%2x.jpg@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/turbotax%2x.jpg@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/twitter-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/vk-com%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/vodafone%2x.jpg@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/weibo-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/wikipedia-org%2x.png@localhost
+lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/wix%2x.jpg@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/wykop-pl%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/yandex-com%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/tippytop/images/yandex-ru%2x.png@localhost
@@ -304,6 +320,8 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/login-list.js
 lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/menu-button.css
 lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/menu-button.js
+lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/remove-logins-dialog.css
+lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/remove-logins-dialog.js
 lib/firefox/browser/chrome/browser/content/browser/aboutlogins/icons/breached-website.svg
 lib/firefox/browser/chrome/browser/content/browser/aboutlogins/icons/favicon.svg
 lib/firefox/browser/chrome/browser/content/browser/aboutlogins/icons/hide-password.svg
@@ -418,7 +436,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/parent/ext-bookmarks.js
 lib/firefox/browser/chrome/browser/content/browser/parent/ext-browser.js
 lib/firefox/browser/chrome/browser/content/browser/parent/ext-browserAction.js
-lib/firefox/browser/chrome/browser/content/browser/parent/ext-browsingData.js
 lib/firefox/browser/chrome/browser/content/browser/parent/ext-chrome-settings-overrides.js
 lib/firefox/browser/chrome/browser/content/browser/parent/ext-commands.js
 lib/firefox/browser/chrome/browser/content/browser/parent/ext-devtools-inspectedWindow.js
@@ -527,7 +544,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.css
 lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.js
 lib/firefox/browser/chrome/browser/content/browser/schemas/bookmarks.json
-lib/firefox/browser/chrome/browser/content/browser/schemas/browsing_data.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/chrome_settings_overrides.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/commands.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/devtools.json
@@ -1078,10 +1094,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/characterEncoding.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/check-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/chevron-animation.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/chevron.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/connection-secure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/3rdpartycookies-disabled.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/3rdpartycookies.svg
@@ -1222,7 +1235,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-cancel.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-folder.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-retry.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header%2x.png@localhost
@@ -2139,7 +2151,8 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/manifest.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/media-rule.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/memory.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/network.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/network-content.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/network-parent.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/object.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/page-style.js
@@ -2153,7 +2166,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/root.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/screenshot.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/source.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/stacktraces.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/string.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/style-rule.js
@@ -3139,14 +3151,14 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/memory.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/channel-event-sink.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/eventsource-actor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-content.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-event-actor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-event.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-monitor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-observer.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-parent.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-response-listener.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/stack-trace-collector.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/stack-traces-actor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/utils/channel-map.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/utils/error-codes.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/utils/wildcard-to-regexp.js
@@ -3175,6 +3187,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/network-events-stacktraces.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/network-events.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/platform-messages.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/sources.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/storage-local-storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/storage-session-storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/stylesheets.js
@@ -3219,6 +3232,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/watchpoint-map.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/watcher.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/watcher/WatchedDataHelpers.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/watcher/WatcherRegistry.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/watcher/target-helpers/frame-helper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/watcher/target-helpers/process-helper.js
@@ -3312,12 +3326,9 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/inspector/css-logic.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/inspector/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/beautify.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/sanitytest.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/urlencode_unpacker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-css.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-html.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-js.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-tests.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/l10n.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/layout/dom-matrix-2d.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/layout/utils.js
@@ -3375,7 +3386,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/console-messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/error-messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/network-events.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/root-node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/storage-local-storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/storage-session-storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/screenshot/capture.js
@@ -3410,9 +3420,10 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/manifest.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/media-rule.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/memory.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/network-content.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/network-event.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/network-monitor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/network.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/network-parent.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/object.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/page-style.js
@@ -3426,7 +3437,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/root.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/screenshot.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/source.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/stacktraces.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/string.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/style-rule.js
@@ -3922,7 +3932,6 @@ lib/firefox/browser/features/webcompat@m
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1605611-maps.google.com-directions-time.css
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1610016-gaana.com-input-position-fix.css
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1610344-directv.com.co-hide-unsupported-message.css
-lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1632019-everyman.co-gallery-width-fix.css
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1644830-missingmail.usps.com-checkboxes-not-visible.css
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1645064-s-kanava.fi-invisible-charts.css
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1651917-teletrader.com.body-transform-origin.css
@@ -3940,6 +3949,9 @@ lib/firefox/browser/features/webcompat@m
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1605611-maps.google.com-directions-time.js
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1610358-pcloud.com-appVersion-change.js
+lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1631811-datastudio.google.com-indexedDB.js
+lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1665035-dckids.com-cookieEnabled.js
+lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1677442-store.hp.com-disable-indexeddb.js
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1682238-gamearter.com-ua-change.js
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/lib/about_compat_broker.js
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/lib/custom_functions.js
@@ -4055,6 +4067,7 @@ lib/firefox/browser/modules/AsyncTabSwit
 lib/firefox/browser/modules/AttributionCode.jsm
 lib/firefox/browser/modules/BrowserContentHandler.jsm
 lib/firefox/browser/modules/BrowserGlue.jsm
+lib/firefox/browser/modules/BrowserSearchTelemetry.jsm
 lib/firefox/browser/modules/BrowserUsageTelemetry.jsm
 lib/firefox/browser/modules/BrowserWindowTracker.jsm
 lib/firefox/browser/modules/ChromeMigrationUtils.jsm
@@ -4075,6 +4088,7 @@ lib/firefox/browser/modules/DownloadsVie
 lib/firefox/browser/modules/DownloadsViewableInternally.jsm
 lib/firefox/browser/modules/DragPositionManager.jsm
 lib/firefox/browser/modules/EveryWindow.jsm
+lib/firefox/browser/modules/ExtensionBrowsingData.jsm
 lib/firefox/browser/modules/ExtensionControlledPopup.jsm
 lib/firefox/browser/modules/ExtensionPopups.jsm
 lib/firefox/browser/modules/ExtensionsUI.jsm
@@ -4100,7 +4114,7 @@ lib/firefox/browser/modules/PromptCollec
 lib/firefox/browser/modules/Sanitizer.jsm
 lib/firefox/browser/modules/ScreenshotChild.jsm
 lib/firefox/browser/modules/SearchOneOffs.jsm
-lib/firefox/browser/modules/SearchTelemetry.jsm
+lib/firefox/browser/modules/SearchSERPTelemetry.jsm
 lib/firefox/browser/modules/SearchUIUtils.jsm
 lib/firefox/browser/modules/SearchWidgetTracker.jsm
 lib/firefox/browser/modules/SelectionChangedMenulist.jsm
@@ -4261,7 +4275,6 @@ lib/firefox/chrome/en-US/locale/en-US/gl
 lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/downloads.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/unknownContentType.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/unknownContentType.properties
-lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/extensions.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/extensions.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/profile/profileSelection.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/update/updates.properties
@@ -4271,7 +4284,6 @@ lib/firefox/chrome/en-US/locale/en-US/pi
 lib/firefox/chrome/en-US/locale/en-US/pipnss/pipnss.properties
 lib/firefox/chrome/en-US/locale/en-US/pippki/pippki.properties
 lib/firefox/chrome/en-US/locale/en-US/places/places.properties
-lib/firefox/chrome/en-US/locale/en-US/pluginproblem/pluginproblem.dtd
 lib/firefox/chrome/en-US/locale/en-US/services/sync.properties
 lib/firefox/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/chrome/en-US/locale/pdfviewer/viewer.properties
@@ -4630,6 +4642,7 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/parent/ext-alarms.js
 lib/firefox/chrome/toolkit/content/extensions/parent/ext-backgroundPage.js
 lib/firefox/chrome/toolkit/content/extensions/parent/ext-browserSettings.js
+lib/firefox/chrome/toolkit/content/extensions/parent/ext-browsingData.js
 lib/firefox/chrome/toolkit/content/extensions/parent/ext-captivePortal.js
 lib/firefox/chrome/toolkit/content/extensions/parent/ext-clipboard.js
 lib/firefox/chrome/toolkit/content/extensions/parent/ext-contentScripts.js
@@ -4662,6 +4675,7 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/schemas/alarms.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/browser_action.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/browser_settings.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/browsing_data.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/captive_portal.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/clipboard.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/content_scripts.json
@@ -4844,6 +4858,8 @@ lib/firefox/chrome/toolkit/content/globa
 lib/firefox/chrome/toolkit/content/global/print.css
 lib/firefox/chrome/toolkit/content/global/print.html
 lib/firefox/chrome/toolkit/content/global/print.js
+lib/firefox/chrome/toolkit/content/global/printPagination.css
+lib/firefox/chrome/toolkit/content/global/printPreviewPagination.js
 lib/firefox/chrome/toolkit/content/global/printPreviewProgress.js
 lib/firefox/chrome/toolkit/content/global/printPreviewProgress.xhtml
 lib/firefox/chrome/toolkit/content/global/printPreviewToolbar.js
@@ -4901,8 +4917,6 @@ lib/firefox/chrome/toolkit/content/mozap
 lib/firefox/chrome/toolkit/content/mozapps/extensions/named-deck.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/panel-item.css
 lib/firefox/chrome/toolkit/content/mozapps/extensions/panel-list.css
-lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.js
-lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xhtml
 lib/firefox/chrome/toolkit/content/mozapps/extensions/rating-star.css
 lib/firefox/chrome/toolkit/content/mozapps/extensions/shortcuts.css
 lib/firefox/chrome/toolkit/content/mozapps/extensions/shortcuts.js
@@ -5053,13 +5067,17 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/blocklist_favicon.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/check-partial.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/check.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/chevron.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/columnpicker.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/connection-mixed-active-loaded.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/connection-mixed-passive-loaded.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/delete.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/document.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/error.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/find-next-arrow.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/find-previous-arrow.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/findFile.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/heart.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/help.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/identity-icon.svg
@@ -5131,13 +5149,8 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/pictureinpicture/play.svg
 lib/firefox/chrome/toolkit/skin/classic/global/pictureinpicture/player.css
 lib/firefox/chrome/toolkit/skin/classic/global/pictureinpicture/unpip.svg
-lib/firefox/chrome/toolkit/skin/classic/global/plugins/contentPluginBlocked.png
-lib/firefox/chrome/toolkit/skin/classic/global/plugins/contentPluginCrashed.png
-lib/firefox/chrome/toolkit/skin/classic/global/plugins/contentPluginStripe.png
 lib/firefox/chrome/toolkit/skin/classic/global/plugins/plugin-blocked.svg
 lib/firefox/chrome/toolkit/skin/classic/global/plugins/plugin.svg
-lib/firefox/chrome/toolkit/skin/classic/global/plugins/pluginHelp-16.png
-lib/firefox/chrome/toolkit/skin/classic/global/plugins/pluginProblem.css
 lib/firefox/chrome/toolkit/skin/classic/global/popup.css
 lib/firefox/chrome/toolkit/skin/classic/global/popupnotification.css
 lib/firefox/chrome/toolkit/skin/classic/global/radio.css
@@ -5508,7 +5521,6 @@ lib/firefox/modules/PermissionsUtils.jsm
 lib/firefox/modules/PictureInPicture.jsm
 lib/firefox/modules/PictureInPictureControls.jsm
 lib/firefox/modules/PlacesBackups.jsm
-lib/firefox/modules/PlacesCategoriesStarter.jsm
 lib/firefox/modules/PlacesDBUtils.jsm
 lib/firefox/modules/PlacesExpiration.jsm
 lib/firefox/modules/PlacesRemoteTabsAutocompleteProvider.jsm
@@ -5520,6 +5532,7 @@ lib/firefox/modules/PopupNotifications.j
 lib/firefox/modules/Preferences.jsm
 lib/firefox/modules/PresentationControlService.jsm
 lib/firefox/modules/PresentationDataChannelSessionTransport.jsm
+lib/firefox/modules/PrincipalsCollector.jsm
 lib/firefox/modules/PrioPing.jsm
 lib/firefox/modules/PrivateBrowsingUtils.jsm
 lib/firefox/modules/ProcessSelector.jsm

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.425 pkgsrc/www/firefox/distinfo:1.426
--- pkgsrc/www/firefox/distinfo:1.425   Fri Jan  8 09:56:55 2021
+++ pkgsrc/www/firefox/distinfo Tue Jan 26 15:02:55 2021
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.425 2021/01/08 09:56:55 ryoon Exp $
+$NetBSD: distinfo,v 1.426 2021/01/26 15:02:55 ryoon Exp $
 
-SHA1 (firefox-84.0.2.source.tar.xz) = 254f0ff4dc6b18034072d5f7f75d64539578a736
-RMD160 (firefox-84.0.2.source.tar.xz) = bdd9c7c2a9b52a0bfcb7eb1de03a46a164e4ca3a
-SHA512 (firefox-84.0.2.source.tar.xz) = 3fd4c9a5ec2409f23507b38c809e71a35aa674779dc5a7a2e3ff82841e0b65ead29d38ac4d5b17f7108479ed7338b3d2b40cbcfa9c51e01696634166d92edf99
-Size (firefox-84.0.2.source.tar.xz) = 363415420 bytes
+SHA1 (firefox-85.0.source.tar.xz) = e6825bbe53e9d117607e67b84785d7ef4efb138a
+RMD160 (firefox-85.0.source.tar.xz) = 2e9eb89725051aa5622671263f8a9ba35428222f
+SHA512 (firefox-85.0.source.tar.xz) = a88472e66baab32d98cb9d13d7dd3c41b47a697ce2a42209612d2342bd6c1c26cd80cdd8905a4cecc72895f155df09762735e8af24bc6156663b7a14e890be4e
+Size (firefox-85.0.source.tar.xz) = 378300292 bytes
 SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
-SHA1 (patch-config_makefiles_rust.mk) = d334199265948e10fccae19fc37fec897b66b2a8
+SHA1 (patch-config_makefiles_rust.mk) = 72d7e9ecee3ccf7ef5f741aac8e35509b41ab7b8
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
@@ -18,6 +18,7 @@ SHA1 (patch-gfx_thebes_gfxPlatform.cpp) 
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
+SHA1 (patch-js_public_ErrorReport.h) = 6b96a09acb9d7ee2a85539d827ba46e7a1a062e8
 SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = c75e9ea7124c18be1a051106fcc407ddd1e82e46
 SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183
 SHA1 (patch-js_src_jsfriendapi.h) = b5cb687dbbda314fe0f16521c1c042c105c4bbe4
@@ -31,7 +32,6 @@ SHA1 (patch-media_libtheora_lib_info.c) 
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 6bcb03e9d67fe38992ca6126f98a0beb1f0520cf
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
-SHA1 (patch-third__party_libwebrtc_webrtc_modules_desktop__capture_desktop__capture__generic__gn_moz.build) = 3b60871c3aa4ab32643f73962559740fb3989214
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = fb285a1d716a251aa133ab50609f72cbd1032536
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
 SHA1 (patch-toolkit_moz.configure) = bb6b7a358302e254e31016c3053088e6ed089f5a

Index: pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk
diff -u pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk:1.6 pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk:1.7
--- pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk:1.6       Thu Dec 17 09:53:15 2020
+++ pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk   Tue Jan 26 15:02:55 2021
@@ -1,10 +1,9 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.6 2020/12/17 09:53:15 ryoon Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.7 2021/01/26 15:02:55 ryoon Exp $
 
 NetBSD doesn't get along with parallel rust builds (it causes issues
 with ld.so) which are the default. Force -j1.
 
-+++ config/makefiles/rust.mk
---- config/makefiles/rust.mk.orig      2020-12-03 23:12:38.000000000 +0000
+--- config/makefiles/rust.mk.orig      2021-01-14 21:11:33.000000000 +0000
 +++ config/makefiles/rust.mk
 @@ -52,6 +52,9 @@ endif
  ifeq (1,$(MOZ_PARALLEL_BUILD))
@@ -14,5 +13,5 @@ with ld.so) which are the default. Force
 +cargo_build_flags += -j1
 +endif
  
- # This should also be paired with -Zbuild-std, but that doesn't work yet.
- ifdef MOZ_TSAN
+ # We also need to rebuild the rust stdlib so that it's instrumented. Because
+ # build-std is still pretty experimental, we need to explicitly request

Added files:

Index: pkgsrc/www/firefox/patches/patch-js_public_ErrorReport.h
diff -u /dev/null pkgsrc/www/firefox/patches/patch-js_public_ErrorReport.h:1.1
--- /dev/null   Tue Jan 26 15:02:55 2021
+++ pkgsrc/www/firefox/patches/patch-js_public_ErrorReport.h    Tue Jan 26 15:02:55 2021
@@ -0,0 +1,12 @@
+$NetBSD: patch-js_public_ErrorReport.h,v 1.1 2021/01/26 15:02:55 ryoon Exp $
+
+--- js/public/ErrorReport.h.orig       2021-01-14 19:12:25.000000000 +0000
++++ js/public/ErrorReport.h
+@@ -20,6 +20,7 @@
+ #include "mozilla/Assertions.h"  // MOZ_ASSERT
+ 
+ #include <iterator>  // std::input_iterator_tag, std::iterator
++#include <stdarg.h>  // va_list
+ #include <stddef.h>  // size_t
+ #include <stdint.h>  // int16_t, uint16_t
+ #include <string.h>  // strlen