Index: branches/2021Q1/www/firefox/Makefile =================================================================== --- branches/2021Q1/www/firefox/Makefile (revision 567916) +++ branches/2021Q1/www/firefox/Makefile (revision 567917) @@ -1,62 +1,62 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 86.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ nss>=3.58:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.8:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr USE_MOZILLA= -sqlite CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2021Q1/www/firefox/files/patch-bug1694670 =================================================================== --- branches/2021Q1/www/firefox/files/patch-bug1694670 (nonexistent) +++ branches/2021Q1/www/firefox/files/patch-bug1694670 (revision 567917) @@ -0,0 +1,22 @@ +diff --git gfx/qcms/src/iccread.rs gfx/qcms/src/iccread.rs +--- gfx/qcms/src/iccread.rs ++++ gfx/qcms/src/iccread.rs +@@ -229,7 +229,7 @@ + read_u16(mem, offset) + } + pub fn write_u32(mem: &mut [u8], offset: usize, value: u32) { +- if offset <= mem.len() - std::mem::size_of_val(&value) { ++ if offset > mem.len() - std::mem::size_of_val(&value) { + panic!("OOB"); + } + let mem = mem.as_mut_ptr(); +@@ -238,7 +238,7 @@ + } + } + pub fn write_u16(mem: &mut [u8], offset: usize, value: u16) { +- if offset <= mem.len() - std::mem::size_of_val(&value) { ++ if offset > mem.len() - std::mem::size_of_val(&value) { + panic!("OOB"); + } + let mem = mem.as_mut_ptr(); + Property changes on: branches/2021Q1/www/firefox/files/patch-bug1694670 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2021Q1/www/firefox/files/patch-bug1694699 =================================================================== --- branches/2021Q1/www/firefox/files/patch-bug1694699 (nonexistent) +++ branches/2021Q1/www/firefox/files/patch-bug1694699 (revision 567917) @@ -0,0 +1,115 @@ +diff --git browser/components/extensions/parent/ext-tabs.js browser/components/extensions/parent/ext-tabs.js +--- browser/components/extensions/parent/ext-tabs.js ++++ browser/components/extensions/parent/ext-tabs.js +@@ -217,9 +217,13 @@ + function sanitize(tab, changeInfo) { + let result = {}; + let nonempty = false; +- const hasTabs = tab.hasTabPermission; + for (let prop in changeInfo) { +- if (hasTabs || !restricted.has(prop)) { ++ // In practice, changeInfo contains at most one property from ++ // restricted. Therefore it is not necessary to cache the value ++ // of tab.hasTabPermission outside the loop. ++ // Unnecessarily accessing tab.hasTabPermission can cause bugs, see ++ // https://bugzilla.mozilla.org/show_bug.cgi?id=1694699#c21 ++ if (!restricted.has(prop) || tab.hasTabPermission) { + nonempty = true; + result[prop] = changeInfo[prop]; + } +diff --git browser/components/extensions/test/browser/browser_ext_tabs_hide.js browser/components/extensions/test/browser/browser_ext_tabs_hide.js +--- browser/components/extensions/test/browser/browser_ext_tabs_hide.js ++++ browser/components/extensions/test/browser/browser_ext_tabs_hide.js +@@ -349,6 +349,7 @@ + if ("hidden" in changeInfo) { + browser.test.assertEq(tabId, testTab.id, "correct tab was hidden"); + browser.test.assertTrue(changeInfo.hidden, "tab is hidden"); ++ browser.test.assertEq(tab.url, testTab.url, "tab has correct URL"); + browser.test.sendMessage("changeInfo"); + } + }); +diff --git browser/components/extensions/test/browser/browser_ext_tabs_move_discarded.js browser/components/extensions/test/browser/browser_ext_tabs_move_discarded.js +--- browser/components/extensions/test/browser/browser_ext_tabs_move_discarded.js ++++ browser/components/extensions/test/browser/browser_ext_tabs_move_discarded.js +@@ -2,7 +2,7 @@ + /* vim: set sts=2 sw=2 et tw=80: */ + "use strict"; + +-add_task(async function() { ++add_task(async function move_discarded_to_window() { + let extension = ExtensionTestUtils.loadExtension({ + manifest: { permissions: ["tabs"] }, + background: async function() { +@@ -29,3 +29,54 @@ + await extension.awaitFinish("tabs.move"); + await extension.unload(); + }); ++ ++add_task(async function move_hidden_discarded_to_window() { ++ let extensionWithoutTabsPermission = ExtensionTestUtils.loadExtension({ ++ manifest: { ++ permissions: ["http://example.com/"], ++ }, ++ background() { ++ browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) => { ++ if (changeInfo.hidden) { ++ browser.test.assertEq( ++ tab.url, ++ "http://example.com/?hideme", ++ "tab.url is correctly observed without tabs permission" ++ ); ++ browser.test.sendMessage("onUpdated_checked"); ++ } ++ }); ++ }, ++ }); ++ await extensionWithoutTabsPermission.startup(); ++ ++ let extension = ExtensionTestUtils.loadExtension({ ++ manifest: { permissions: ["tabs", "tabHide"] }, ++ // ExtensionControlledPopup's populateDescription method requires an addon: ++ useAddonManager: "temporary", ++ async background() { ++ let url = "http://example.com/?hideme"; ++ let tab = await browser.tabs.create({ url, discarded: true }); ++ await browser.tabs.hide(tab.id); ++ ++ let { id: windowId } = await browser.windows.create(); ++ ++ // Move the tab into that window ++ [tab] = await browser.tabs.move(tab.id, { windowId, index: -1 }); ++ browser.test.assertTrue(tab.discarded, "Tab should still be discarded"); ++ browser.test.assertTrue(tab.hidden, "Tab should still be hidden"); ++ browser.test.assertEq(url, tab.url, "Tab URL should still be correct"); ++ ++ await browser.windows.remove(windowId); ++ browser.test.notifyPass("move_hidden_discarded_to_window"); ++ }, ++ }); ++ ++ await extension.startup(); ++ await extension.awaitFinish("move_hidden_discarded_to_window"); ++ await extension.unload(); ++ ++ await extensionWithoutTabsPermission.awaitMessage("onUpdated_checked"); ++ await extensionWithoutTabsPermission.awaitMessage("onUpdated_checked"); ++ await extensionWithoutTabsPermission.unload(); ++}); +diff --git mobile/android/components/extensions/ext-tabs.js mobile/android/components/extensions/ext-tabs.js +--- mobile/android/components/extensions/ext-tabs.js ++++ mobile/android/components/extensions/ext-tabs.js +@@ -233,9 +233,11 @@ + function sanitize(tab, changeInfo) { + const result = {}; + let nonempty = false; +- const hasTabs = tab.hasTabPermission; + for (const prop in changeInfo) { +- if (hasTabs || !restricted.includes(prop)) { ++ // In practice, changeInfo contains at most one property from ++ // restricted. Therefore it is not necessary to cache the value ++ // of tab.hasTabPermission outside the loop. ++ if (!restricted.includes(prop) || tab.hasTabPermission) { + nonempty = true; + result[prop] = changeInfo[prop]; + } + Property changes on: branches/2021Q1/www/firefox/files/patch-bug1694699 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 567916) +++ branches/2021Q1 (revision 567917) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r567916