Received: by mail.netbsd.org (Postfix, from userid 605) id 572D984D37; Tue, 23 Feb 2021 17:02:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9050D84D2F for ; Tue, 23 Feb 2021 17:02:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id bc_VV5OBnsqD for ; Tue, 23 Feb 2021 17:02:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2CF5C84CE8 for ; Tue, 23 Feb 2021 17:02:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 26479FA95; Tue, 23 Feb 2021 17:02:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1614099725152410" MIME-Version: 1.0 Date: Tue, 23 Feb 2021 17:02:05 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20210223170205.26479FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1614099725152410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Tue Feb 23 17:02:05 UTC 2021 Modified Files: pkgsrc/www/firefox: Makefile PLIST distinfo pkgsrc/www/firefox/patches: patch-js_src_jit_ProcessExecutableMemory.cpp Added Files: pkgsrc/www/firefox/patches: patch-mozglue_misc_Uptime.cpp Log Message: firefox: Update to 86.0 Changelog: New * Firefox now supports simultaneously watching multiple videos in Picture-in-Picture. * Today, Firefox introduces Total Cookie Protection to Strict Mode. In Total Cookie Protection, every website gets its own "cookie jar," preventing cookies from being used to track you from site to site. * We've improved our Print functionality with a cleaner design and better integration with your computer's printer settings. * For Firefox users in Canada, credit card management and auto-fill are now enabled. * Notable performance and stability improvements are achieved by moving canvas drawing and WebGL drawing to the GPU process. Fixed * Reader mode now works with local HTML pages. * Using screen reader quick navigation to move to editable text controls no longer incorrectly reaches non-editable cells in some grids such as on messenger.com. * The Orca screen reader's mouse review feature now works correctly after switching tabs in Firefox. * Screen readers no longer report column headers incorrectly in tables containing cells spanning multiple columns. * Links in Reader View now have more color contrast. * Various security fixes. Changed * On Linux and Android, the protection to mitigate the stack clash attack has been activated. * From Firefox 86 onward, DTLS 1.0 is no longer supported for establishing WebRTC's PeerConnections. All WebRTC services need to support DTLS 1.2 from now on as the minimum version. * Consolidated all video decoding in the new RDD process which results in a more secure Firefox. 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 86 Release Notes. Developer * Developer Information * CSS image-set() function in CSS is now enabled, allowing for responsive images in CSS. * Inactive CSS tool is now showing a warning when margin or padding is set on internal table elements. Inactive CSS screenshot * Developer Tools Toolbox is now showing a number of errors on the current page. This is a quick way to surface information to a developer that something is wrong with their page. Clicking on the red exclamation icon navigates the user to the Console panel. Develeoper tools: screenshot of number of errors Security fixes: #CVE-2021-23969: Content Security Policy violation report could have contained the destination of a redirect #CVE-2021-23970: Multithreaded WASM triggered assertions validating separation of script domains #CVE-2021-23968: Content Security Policy violation report could have contained the destination of a redirect #CVE-2021-23974: noscript elements could have led to an HTML Sanitizer bypass #CVE-2021-23971: A website's Referrer-Policy could have been be overridden, potentially resulting in the full URL being sent as a Referrer #CVE-2021-23976: Local spoofing of web manifests for arbitrary pages in Firefox for Android #CVE-2021-23977: Malicious application could read sensitive data from Firefox for Android's application directories #CVE-2021-23972: HTTP Auth phishing warning was omitted when a redirect is cached #CVE-2021-23975: about:memory Measure function caused an incorrect pointer operation #CVE-2021-23973: MediaError message property could have leaked information about cross-origin resources #CVE-2021-23978: Memory safety bugs fixed in Firefox 86 and Firefox ESR 78.8 #CVE-2021-23979: Memory safety bugs fixed in Firefox 86 To generate a diff of this commit: cvs rdiff -u -r1.469 -r1.470 pkgsrc/www/firefox/Makefile cvs rdiff -u -r1.169 -r1.170 pkgsrc/www/firefox/PLIST cvs rdiff -u -r1.428 -r1.429 pkgsrc/www/firefox/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/www/firefox/patches/patch-js_src_jit_ProcessExecutableMemory.cpp cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox/patches/patch-mozglue_misc_Uptime.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1614099725152410 Content-Disposition: inline Content-Length: 35826 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/Makefile diff -u pkgsrc/www/firefox/Makefile:1.469 pkgsrc/www/firefox/Makefile:1.470 --- pkgsrc/www/firefox/Makefile:1.469 Wed Feb 10 12:25:05 2021 +++ pkgsrc/www/firefox/Makefile Tue Feb 23 17:02:04 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.469 2021/02/10 12:25:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.470 2021/02/23 17:02:04 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 85.0 -MOZ_BRANCH_MINOR= .2 +MOZ_BRANCH= 86.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.169 pkgsrc/www/firefox/PLIST:1.170 --- pkgsrc/www/firefox/PLIST:1.169 Tue Jan 26 15:02:55 2021 +++ pkgsrc/www/firefox/PLIST Tue Feb 23 17:02:04 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.169 2021/01/26 15:02:55 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.170 2021/02/23 17:02:04 ryoon Exp $ bin/firefox lib/firefox/actors/AboutHttpsOnlyErrorChild.jsm lib/firefox/actors/AboutHttpsOnlyErrorParent.jsm @@ -31,6 +31,7 @@ lib/firefox/actors/PopupBlockingChild.js lib/firefox/actors/PopupBlockingParent.jsm lib/firefox/actors/PrintingChild.jsm lib/firefox/actors/PrintingParent.jsm +lib/firefox/actors/PrintingSelectionChild.jsm lib/firefox/actors/PurgeSessionHistoryChild.jsm lib/firefox/actors/RemotePageChild.jsm lib/firefox/actors/SelectChild.jsm @@ -105,8 +106,6 @@ lib/firefox/browser/actors/RefreshBlocke lib/firefox/browser/actors/RefreshBlockerParent.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 lib/firefox/browser/actors/WebRTCChild.jsm lib/firefox/browser/actors/WebRTCParent.jsm @@ -167,6 +166,8 @@ lib/firefox/browser/chrome/browser/conte lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/illustration-sync@2x.png 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/protection-report-icon.png +lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/remote/pin-to-taskbar-v1.svg +lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/remote/pin-to-taskbar-v2.svg 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 lib/firefox/browser/chrome/browser/content/activity-stream/data/content/assets/spinner.svg @@ -309,6 +310,12 @@ lib/firefox/browser/chrome/browser/conte lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/confirmation-dialog.js lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/fxaccounts-button.css lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/fxaccounts-button.js +lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/generic-dialog.css +lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/generic-dialog.js +lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/import-error-dialog.css +lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/import-error-dialog.js +lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/import-summary-dialog.css +lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/import-summary-dialog.js lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/login-filter.css lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/login-filter.js lib/firefox/browser/chrome/browser/content/browser/aboutlogins/components/login-intro.css @@ -569,9 +576,6 @@ lib/firefox/browser/chrome/browser/conte lib/firefox/browser/chrome/browser/content/browser/search/searchbar.js lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.js lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.xhtml -lib/firefox/browser/chrome/browser/content/browser/ssb/ssb.css -lib/firefox/browser/chrome/browser/content/browser/ssb/ssb.html -lib/firefox/browser/chrome/browser/content/browser/ssb/ssb.js lib/firefox/browser/chrome/browser/content/browser/static-robot.png lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.js lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml @@ -695,7 +699,6 @@ lib/firefox/browser/chrome/browser/res/a lib/firefox/browser/chrome/browser/res/activity-stream/lib/ASRouterParentProcessMessageHandler.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/ASRouterPreferences.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/ASRouterTargeting.jsm -lib/firefox/browser/chrome/browser/res/activity-stream/lib/ASRouterTelemetry.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/ASRouterTriggerListeners.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/AboutPreferences.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/ActivityStream.jsm @@ -711,6 +714,7 @@ lib/firefox/browser/chrome/browser/res/a lib/firefox/browser/chrome/browser/res/activity-stream/lib/FaviconFeed.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/FilterAdult.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/HighlightsFeed.jsm +lib/firefox/browser/chrome/browser/res/activity-stream/lib/InfoBar.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/LinksCache.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/MomentsPageHub.jsm lib/firefox/browser/chrome/browser/res/activity-stream/lib/NewTabInit.jsm @@ -1174,7 +1178,6 @@ lib/firefox/browser/chrome/browser/skin/ lib/firefox/browser/chrome/browser/skin/classic/browser/illustrations/error-session-restore.svg lib/firefox/browser/chrome/browser/skin/classic/browser/import.svg lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/install-ssb.svg lib/firefox/browser/chrome/browser/skin/classic/browser/ion.svg lib/firefox/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg lib/firefox/browser/chrome/browser/skin/classic/browser/library-pocket-animation.svg @@ -1230,7 +1233,6 @@ lib/firefox/browser/chrome/browser/skin/ lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/xr-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/xr.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/open-in-new.svg lib/firefox/browser/chrome/browser/skin/classic/browser/open.svg lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.png @@ -1285,7 +1287,6 @@ lib/firefox/browser/chrome/browser/skin/ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/siteDataSettings.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/sync.svg lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/tab.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/print.svg lib/firefox/browser/chrome/browser/skin/classic/browser/private-browsing.svg lib/firefox/browser/chrome/browser/skin/classic/browser/privateBrowsing.svg lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css @@ -1329,6 +1330,8 @@ lib/firefox/browser/chrome/browser/skin/ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading-burst.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/pendingpaint.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/proton-tab-audio-muted.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/proton-tab-audio-playing.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-blocked-small.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-muted-small.svg @@ -2132,6 +2135,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/addon/webextension-inspected-window.js lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/animation.js lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/array-buffer.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/breakpoint-list.js lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/changes.js lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/compatibility.js lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/content-viewer.js @@ -2288,6 +2292,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/extension-sidebar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/reducers/sidebar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/types.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/flexbox-highlighter.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/flexbox.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/components/FlexContainer.js @@ -2329,6 +2334,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/types.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/utils/font-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/utils/l10n.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/grid-highlighter.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/grids.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/highlighter-settings.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/index.js @@ -2913,6 +2919,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/remote-debugging/constants.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/remote-debugging/remote-client-manager.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/remote-debugging/version-checker.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/save-screenshot.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/scroll.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/assets/dwarf_to_json.wasm lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/assets/source-map-mappings.wasm @@ -2936,9 +2943,9 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/fluent-react.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/immutable.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jszip.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/lodash.js ${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dev.js ${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-dev.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/lodash.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-factories.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js ${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server-dev.js @@ -3045,7 +3052,6 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/enhancers/batching.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/enhancers/css-error-reporting.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/enhancers/message-cache-clearing.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/enhancers/net-provider.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/middleware/event-telemetry.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/middleware/history-persistence.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/middleware/performance-marker.js @@ -3095,6 +3101,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/animation-type-longhand.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/animation.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/array-buffer.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/breakpoint-list.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/breakpoint.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/changes.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/common.js @@ -3215,6 +3222,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/accessibility.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/actor-registry.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/breakpoint-actor-map.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/capture-screenshot.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/css-grid-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/dbg-source.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/event-breakpoints.js @@ -3253,6 +3261,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/document-events.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/message-manager-mock.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/webidl-deprecated-list.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/webidl-pure-allowlist.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/worker-listeners.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/worker/push-subscription.js @@ -3388,8 +3397,6 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/transformers/network-events.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 -lib/firefox/browser/chrome/devtools/modules/devtools/shared/screenshot/save.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/auth.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/cert.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/prompt.js @@ -3399,6 +3406,7 @@ lib/firefox/browser/chrome/devtools/modu lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/addon/webextension-inspected-window.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/animation.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/array-buffer.js +lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/breakpoint-list.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/changes.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/compatibility.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/content-viewer.js @@ -3669,7 +3677,6 @@ lib/firefox/browser/chrome/en-US/locale/ lib/firefox/browser/chrome/en-US/locale/browser/accounts.properties lib/firefox/browser/chrome/en-US/locale/browser/app-extension-fields.properties lib/firefox/browser/chrome/en-US/locale/browser/appstrings.properties -lib/firefox/browser/chrome/en-US/locale/browser/baseMenuOverlay.dtd lib/firefox/browser/chrome/en-US/locale/browser/bookmarks.html lib/firefox/browser/chrome/en-US/locale/browser/brandings.dtd lib/firefox/browser/chrome/en-US/locale/browser/browser.dtd @@ -4049,6 +4056,7 @@ lib/firefox/browser/localization/en-US/d lib/firefox/browser/localization/en-US/devtools/client/accessibility.ftl lib/firefox/browser/localization/en-US/devtools/client/application.ftl lib/firefox/browser/localization/en-US/devtools/client/compatibility.ftl +lib/firefox/browser/localization/en-US/devtools/client/perftools.ftl lib/firefox/browser/localization/en-US/devtools/client/storage.ftl lib/firefox/browser/localization/en-US/devtools/client/styleeditor.ftl lib/firefox/browser/localization/en-US/devtools/client/toolbox-options.ftl @@ -4121,7 +4129,6 @@ lib/firefox/browser/modules/SelectionCha lib/firefox/browser/modules/ShellService.jsm lib/firefox/browser/modules/SiteDataManager.jsm lib/firefox/browser/modules/SitePermissions.jsm -lib/firefox/browser/modules/SiteSpecificBrowserService.jsm lib/firefox/browser/modules/TRRPerformance.jsm lib/firefox/browser/modules/TabUnloader.jsm lib/firefox/browser/modules/TabsList.jsm @@ -4182,7 +4189,6 @@ lib/firefox/browser/modules/sessionstore lib/firefox/browser/modules/sessionstore/TabState.jsm lib/firefox/browser/modules/sessionstore/TabStateCache.jsm lib/firefox/browser/modules/sessionstore/TabStateFlusher.jsm -lib/firefox/browser/modules/ssb/ImageTools.jsm lib/firefox/browser/modules/syncedtabs/EventEmitter.jsm lib/firefox/browser/modules/syncedtabs/SyncedTabsDeckComponent.js lib/firefox/browser/modules/syncedtabs/SyncedTabsDeckStore.js @@ -4341,6 +4347,8 @@ lib/firefox/chrome/pdfjs/content/PdfStre lib/firefox/chrome/pdfjs/content/PdfjsChild.jsm lib/firefox/chrome/pdfjs/content/PdfjsParent.jsm lib/firefox/chrome/pdfjs/content/build/pdf.js +lib/firefox/chrome/pdfjs/content/build/pdf.sandbox.external.js +lib/firefox/chrome/pdfjs/content/build/pdf.scripting.js lib/firefox/chrome/pdfjs/content/build/pdf.worker.js lib/firefox/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap lib/firefox/chrome/pdfjs/content/web/cmaps/78-EUC-V.bcmap @@ -4521,77 +4529,44 @@ lib/firefox/chrome/pdfjs/content/web/ima lib/firefox/chrome/pdfjs/content/web/images/annotation-noicon.svg lib/firefox/chrome/pdfjs/content/web/images/annotation-note.svg lib/firefox/chrome/pdfjs/content/web/images/annotation-paragraph.svg -lib/firefox/chrome/pdfjs/content/web/images/findbarButton-next-dark.svg lib/firefox/chrome/pdfjs/content/web/images/findbarButton-next.svg -lib/firefox/chrome/pdfjs/content/web/images/findbarButton-previous-dark.svg lib/firefox/chrome/pdfjs/content/web/images/findbarButton-previous.svg lib/firefox/chrome/pdfjs/content/web/images/loading-dark.svg lib/firefox/chrome/pdfjs/content/web/images/loading-icon.gif lib/firefox/chrome/pdfjs/content/web/images/loading.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-documentProperties-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-firstPage-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-firstPage.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-handTool-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-handTool.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-lastPage-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-lastPage.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-selectTool-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-selectTool.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-spreadEven-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-spreadEven.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-spreadNone-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-spreadNone.svg -lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd-dark.svg lib/firefox/chrome/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd.svg lib/firefox/chrome/pdfjs/content/web/images/shadow.png -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-bookmark-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-bookmark.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-download-dark.svg +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-currentOutlineItem.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-download.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-menuArrow-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-menuArrow.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-openFile-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-openFile.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageDown-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageDown.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageUp-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageUp.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-presentationMode-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-presentationMode.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-print-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-print.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-search-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-search.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewAttachments-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewAttachments.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewLayers-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewLayers.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewOutline-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewOutline.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewThumbnail-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewThumbnail.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-zoomIn-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-zoomIn.svg -lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-zoomOut-dark.svg lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-zoomOut.svg -lib/firefox/chrome/pdfjs/content/web/images/treeitem-collapsed-dark.svg lib/firefox/chrome/pdfjs/content/web/images/treeitem-collapsed.svg -lib/firefox/chrome/pdfjs/content/web/images/treeitem-expanded-dark.svg lib/firefox/chrome/pdfjs/content/web/images/treeitem-expanded.svg lib/firefox/chrome/pdfjs/content/web/viewer.css lib/firefox/chrome/pdfjs/content/web/viewer.html @@ -4624,6 +4599,59 @@ lib/firefox/chrome/pippki/content/pippki lib/firefox/chrome/pippki/content/pippki/setp12password.xhtml lib/firefox/chrome/recording/content/recording.js lib/firefox/chrome/recording/content/recording.xhtml +lib/firefox/chrome/remote/content/Connection.jsm +lib/firefox/chrome/remote/content/Error.jsm +lib/firefox/chrome/remote/content/Format.jsm +lib/firefox/chrome/remote/content/JSONHandler.jsm +lib/firefox/chrome/remote/content/Log.jsm +lib/firefox/chrome/remote/content/Protocol.jsm +lib/firefox/chrome/remote/content/RecommendedPreferences.jsm +lib/firefox/chrome/remote/content/RemoteAgent.jsm +lib/firefox/chrome/remote/content/StreamRegistry.jsm +lib/firefox/chrome/remote/content/Sync.jsm +lib/firefox/chrome/remote/content/TabManager.jsm +lib/firefox/chrome/remote/content/WindowManager.jsm +lib/firefox/chrome/remote/content/domains/ContentProcessDomain.jsm +lib/firefox/chrome/remote/content/domains/ContentProcessDomains.jsm +lib/firefox/chrome/remote/content/domains/Domain.jsm +lib/firefox/chrome/remote/content/domains/DomainCache.jsm +lib/firefox/chrome/remote/content/domains/ParentProcessDomains.jsm +lib/firefox/chrome/remote/content/domains/content/DOM.jsm +lib/firefox/chrome/remote/content/domains/content/Emulation.jsm +lib/firefox/chrome/remote/content/domains/content/Input.jsm +lib/firefox/chrome/remote/content/domains/content/Log.jsm +lib/firefox/chrome/remote/content/domains/content/Network.jsm +lib/firefox/chrome/remote/content/domains/content/Page.jsm +lib/firefox/chrome/remote/content/domains/content/Performance.jsm +lib/firefox/chrome/remote/content/domains/content/Runtime.jsm +lib/firefox/chrome/remote/content/domains/content/Security.jsm +lib/firefox/chrome/remote/content/domains/content/runtime/ExecutionContext.jsm +lib/firefox/chrome/remote/content/domains/parent/Browser.jsm +lib/firefox/chrome/remote/content/domains/parent/Emulation.jsm +lib/firefox/chrome/remote/content/domains/parent/IO.jsm +lib/firefox/chrome/remote/content/domains/parent/Input.jsm +lib/firefox/chrome/remote/content/domains/parent/Network.jsm +lib/firefox/chrome/remote/content/domains/parent/Page.jsm +lib/firefox/chrome/remote/content/domains/parent/Security.jsm +lib/firefox/chrome/remote/content/domains/parent/Target.jsm +lib/firefox/chrome/remote/content/domains/parent/page/DialogHandler.jsm +lib/firefox/chrome/remote/content/external/EventUtils.js +lib/firefox/chrome/remote/content/observers/ChannelEventSink.jsm +lib/firefox/chrome/remote/content/observers/ContextObserver.jsm +lib/firefox/chrome/remote/content/observers/NetworkObserver.jsm +lib/firefox/chrome/remote/content/observers/TargetObserver.jsm +lib/firefox/chrome/remote/content/server/HTTPD.jsm +lib/firefox/chrome/remote/content/server/WebSocketHandshake.jsm +lib/firefox/chrome/remote/content/server/WebSocketTransport.jsm +lib/firefox/chrome/remote/content/sessions/ContentProcessSession.jsm +lib/firefox/chrome/remote/content/sessions/MainProcessSession.jsm +lib/firefox/chrome/remote/content/sessions/Session.jsm +lib/firefox/chrome/remote/content/sessions/TabSession.jsm +lib/firefox/chrome/remote/content/sessions/frame-script.js +lib/firefox/chrome/remote/content/targets/MainProcessTarget.jsm +lib/firefox/chrome/remote/content/targets/TabTarget.jsm +lib/firefox/chrome/remote/content/targets/Target.jsm +lib/firefox/chrome/remote/content/targets/TargetList.jsm lib/firefox/chrome/toolkit/content/extensions/child/ext-backgroundPage.js lib/firefox/chrome/toolkit/content/extensions/child/ext-contentScripts.js lib/firefox/chrome/toolkit/content/extensions/child/ext-extension.js @@ -5080,12 +5108,15 @@ lib/firefox/chrome/toolkit/skin/classic/ 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/icon-refresh.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/identity-icon.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/info.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png lib/firefox/chrome/toolkit/skin/classic/global/icons/loading@2x.png lib/firefox/chrome/toolkit/skin/classic/global/icons/more.svg +lib/firefox/chrome/toolkit/skin/classic/global/icons/open-in-new.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/performance.svg +lib/firefox/chrome/toolkit/skin/classic/global/icons/print.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/question-64.png lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/search-textbox.svg @@ -5576,7 +5607,6 @@ lib/firefox/modules/SearchSuggestionCont lib/firefox/modules/SearchSuggestions.jsm lib/firefox/modules/SearchUtils.jsm lib/firefox/modules/SecurityInfo.jsm -lib/firefox/modules/SecurityReporter.jsm lib/firefox/modules/ServiceRequest.jsm lib/firefox/modules/ServiceWorkerCleanUp.jsm lib/firefox/modules/Services.jsm Index: pkgsrc/www/firefox/distinfo diff -u pkgsrc/www/firefox/distinfo:1.428 pkgsrc/www/firefox/distinfo:1.429 --- pkgsrc/www/firefox/distinfo:1.428 Wed Feb 10 12:25:05 2021 +++ pkgsrc/www/firefox/distinfo Tue Feb 23 17:02:04 2021 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.428 2021/02/10 12:25:05 ryoon Exp $ +$NetBSD: distinfo,v 1.429 2021/02/23 17:02:04 ryoon Exp $ -SHA1 (firefox-85.0.2.source.tar.xz) = 534da33d1271a00a4cc19a3507d0bd9dc092f958 -RMD160 (firefox-85.0.2.source.tar.xz) = 23a5efaaccb893f466e4aa626eacd3b54868b28e -SHA512 (firefox-85.0.2.source.tar.xz) = ae1dd0fd5729458ccb2f2526f9a6822db90a67ad9dd726aece724e758012dd381f02143007cdf7abfd57187912c2e32a368450d89c121464775243b4255243aa -Size (firefox-85.0.2.source.tar.xz) = 372234168 bytes +SHA1 (firefox-86.0.source.tar.xz) = 156e6bb90946fb2290f36aa0b08abc9c436e78c7 +RMD160 (firefox-86.0.source.tar.xz) = 8847103a535eec5b103f78a66c6d1cc38186a7a2 +SHA512 (firefox-86.0.source.tar.xz) = f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f +Size (firefox-86.0.source.tar.xz) = 371929688 bytes SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7 SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678 @@ -19,7 +19,7 @@ SHA1 (patch-ipc_chromium_src_base_messag 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_ProcessExecutableMemory.cpp) = fad103cc698f9828ad58f742231984ec2bc27605 SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183 SHA1 (patch-js_src_jsfriendapi.h) = b5cb687dbbda314fe0f16521c1c042c105c4bbe4 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba @@ -30,6 +30,7 @@ SHA1 (patch-media_libcubeb_src_moz.build SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 6bcb03e9d67fe38992ca6126f98a0beb1f0520cf +SHA1 (patch-mozglue_misc_Uptime.cpp) = c33c5373d2afc262d1536b648e471589a31b1133 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = fb285a1d716a251aa133ab50609f72cbd1032536 Index: pkgsrc/www/firefox/patches/patch-js_src_jit_ProcessExecutableMemory.cpp diff -u pkgsrc/www/firefox/patches/patch-js_src_jit_ProcessExecutableMemory.cpp:1.1 pkgsrc/www/firefox/patches/patch-js_src_jit_ProcessExecutableMemory.cpp:1.2 --- pkgsrc/www/firefox/patches/patch-js_src_jit_ProcessExecutableMemory.cpp:1.1 Fri Nov 6 08:56:37 2020 +++ pkgsrc/www/firefox/patches/patch-js_src_jit_ProcessExecutableMemory.cpp Tue Feb 23 17:02:04 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_jit_ProcessExecutableMemory.cpp,v 1.1 2020/11/06 08:56:37 maya Exp $ +$NetBSD: patch-js_src_jit_ProcessExecutableMemory.cpp,v 1.2 2021/02/23 17:02:04 ryoon Exp $ PaX MPROTECT safety for NetBSD. ---- js/src/jit/ProcessExecutableMemory.cpp.orig 2020-10-27 23:47:06.000000000 +0000 +--- js/src/jit/ProcessExecutableMemory.cpp.orig 2021-02-11 21:17:13.000000000 +0000 +++ js/src/jit/ProcessExecutableMemory.cpp @@ -362,9 +362,16 @@ static void* ReserveProcessExecutableMem // Note that randomAddr is just a hint: if the address is not available @@ -23,8 +23,8 @@ PaX MPROTECT safety for NetBSD. } @@ -409,8 +416,12 @@ static unsigned ProtectionSettingToFlags - static MOZ_MUST_USE bool CommitPages(void* addr, size_t bytes, - ProtectionSetting protection) { + [[nodiscard]] static bool CommitPages(void* addr, size_t bytes, + ProtectionSetting protection) { - void* p = MozTaggedAnonymousMmap( - addr, bytes, ProtectionSettingToFlags(protection), + void* p = MozTaggedAnonymousMmap(addr, bytes, Added files: Index: pkgsrc/www/firefox/patches/patch-mozglue_misc_Uptime.cpp diff -u /dev/null pkgsrc/www/firefox/patches/patch-mozglue_misc_Uptime.cpp:1.1 --- /dev/null Tue Feb 23 17:02:05 2021 +++ pkgsrc/www/firefox/patches/patch-mozglue_misc_Uptime.cpp Tue Feb 23 17:02:04 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-mozglue_misc_Uptime.cpp,v 1.1 2021/02/23 17:02:04 ryoon Exp $ + +* Define uptime-related functions for NetBSD too. + +--- mozglue/misc/Uptime.cpp.orig 2021-02-11 21:17:44.000000000 +0000 ++++ mozglue/misc/Uptime.cpp +@@ -79,7 +79,7 @@ Maybe NowIncludingSuspendMs() + } + #endif // XP_WIN + +-#if defined(XP_LINUX) // including Android ++#if defined(XP_UNIX) && !(defined(__APPLE__) && defined(__MACH__)) // including Android + # include + + // Number of nanoseconds in a millisecond. --_----------=_1614099725152410--