Version in base suite: 115.7.0esr-1~deb11u1 Version in overlay suite: 115.9.0esr-1~deb11u1 Base version: firefox-esr_115.9.0esr-1~deb11u1 Target version: firefox-esr_115.9.1esr-1~deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/f/firefox-esr/firefox-esr_115.9.0esr-1~deb11u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/f/firefox-esr/firefox-esr_115.9.1esr-1~deb11u1.dsc browser/components/sessionstore/SessionStore.sys.mjs | 27 ++++++++++++------- browser/config/version.txt | 2 - browser/config/version_display.txt | 2 - config/milestone.txt | 2 - debian/changelog | 9 ++++++ debian/control.in | 12 ++------ debian/rules | 4 -- sourcestamp.txt | 4 +- 8 files changed, 35 insertions(+), 27 deletions(-) diff -Nru firefox-esr-115.9.0esr/browser/components/sessionstore/SessionStore.sys.mjs firefox-esr-115.9.1esr/browser/components/sessionstore/SessionStore.sys.mjs --- firefox-esr-115.9.0esr/browser/components/sessionstore/SessionStore.sys.mjs 2024-03-14 05:21:23.000000000 +0000 +++ firefox-esr-115.9.1esr/browser/components/sessionstore/SessionStore.sys.mjs 2024-03-22 02:47:00.000000000 +0000 @@ -1422,6 +1422,13 @@ * and thus enables communication with OOP tabs. */ receiveMessage(aMessage) { + if (Services.appinfo.sessionHistoryInParent) { + throw new Error( + `received unexpected message '${aMessage.name}' with ` + + `sessionHistoryInParent enabled` + ); + } + // If we got here, that means we're dealing with a frame message // manager message, so the target will be a . var browser = aMessage.target; @@ -1600,14 +1607,14 @@ // internal data about the window. aWindow.__SSi = this._generateWindowID(); - let mm = aWindow.getGroupMessageManager("browsers"); - MESSAGES.forEach(msg => { - let listenWhenClosed = CLOSED_MESSAGES.has(msg); - mm.addMessageListener(msg, this, listenWhenClosed); - }); - - // Load the frame script after registering listeners. if (!Services.appinfo.sessionHistoryInParent) { + let mm = aWindow.getGroupMessageManager("browsers"); + MESSAGES.forEach(msg => { + let listenWhenClosed = CLOSED_MESSAGES.has(msg); + mm.addMessageListener(msg, this, listenWhenClosed); + }); + + // Load the frame script after registering listeners. mm.loadFrameScript( "chrome://browser/content/content-sessionStore.js", true, @@ -2083,8 +2090,10 @@ // Cache the window state until it is completely gone. DyingWindowCache.set(aWindow, winData); - let mm = aWindow.getGroupMessageManager("browsers"); - MESSAGES.forEach(msg => mm.removeMessageListener(msg, this)); + if (!Services.appinfo.sessionHistoryInParent) { + let mm = aWindow.getGroupMessageManager("browsers"); + MESSAGES.forEach(msg => mm.removeMessageListener(msg, this)); + } this._saveableClosedWindowData.delete(winData); delete aWindow.__SSi; diff -Nru firefox-esr-115.9.0esr/browser/config/version.txt firefox-esr-115.9.1esr/browser/config/version.txt --- firefox-esr-115.9.0esr/browser/config/version.txt 2024-03-14 05:21:23.000000000 +0000 +++ firefox-esr-115.9.1esr/browser/config/version.txt 2024-03-22 02:47:00.000000000 +0000 @@ -1 +1 @@ -115.9.0 +115.9.1 diff -Nru firefox-esr-115.9.0esr/browser/config/version_display.txt firefox-esr-115.9.1esr/browser/config/version_display.txt --- firefox-esr-115.9.0esr/browser/config/version_display.txt 2024-03-14 05:21:23.000000000 +0000 +++ firefox-esr-115.9.1esr/browser/config/version_display.txt 2024-03-22 02:47:00.000000000 +0000 @@ -1 +1 @@ -115.9.0esr +115.9.1esr diff -Nru firefox-esr-115.9.0esr/config/milestone.txt firefox-esr-115.9.1esr/config/milestone.txt --- firefox-esr-115.9.0esr/config/milestone.txt 2024-03-14 05:21:23.000000000 +0000 +++ firefox-esr-115.9.1esr/config/milestone.txt 2024-03-22 02:46:59.000000000 +0000 @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -115.9.0 +115.9.1 diff -Nru firefox-esr-115.9.0esr/debian/changelog firefox-esr-115.9.1esr/debian/changelog --- firefox-esr-115.9.0esr/debian/changelog 2024-03-19 20:59:40.000000000 +0000 +++ firefox-esr-115.9.1esr/debian/changelog 2024-03-22 20:09:32.000000000 +0000 @@ -1,3 +1,12 @@ +firefox-esr (115.9.1esr-1~deb11u1) bullseye-security; urgency=medium + + * New upstream release. + * Fixes for mfsa2024-16, also known as CVE-2024-29944. + + * debian/control*, debian/rules: Undo workaround for bug 1052002. + + -- Mike Hommey Sat, 23 Mar 2024 05:09:32 +0900 + firefox-esr (115.9.0esr-1~deb11u1) bullseye-security; urgency=medium * New upstream release. diff -Nru firefox-esr-115.9.0esr/debian/control.in firefox-esr-115.9.1esr/debian/control.in --- firefox-esr-115.9.0esr/debian/control.in 2024-03-19 20:59:00.000000000 +0000 +++ firefox-esr-115.9.1esr/debian/control.in 2024-03-22 20:09:32.000000000 +0000 @@ -51,19 +51,13 @@ %else cargo (>= 0.66), %endif -%if DIST == bullseye || DIST == buster llvm-dev, libclang-dev, clang, -%else - llvm-14-dev, - libclang-14-dev, - clang-14, -%endif %if DIST != bullseye && DIST != buster - libc++-14-dev-wasm32, - libclang-rt-14-dev-wasm32, - lld-14, + libc++-dev-wasm32, + libclang-rt-dev-wasm32, + lld, %endif cbindgen (>= 0.24.3), nodejs (>= 12.22.1), diff -Nru firefox-esr-115.9.0esr/debian/rules firefox-esr-115.9.1esr/debian/rules --- firefox-esr-115.9.0esr/debian/rules 2024-03-19 20:59:00.000000000 +0000 +++ firefox-esr-115.9.1esr/debian/rules 2024-03-22 20:09:32.000000000 +0000 @@ -140,10 +140,6 @@ CXX := g++ endif -ifeq (,$(filter buster bullseye,$(DIST))) -PATH := /usr/lib/llvm-14/bin:$(PATH) -endif - ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH))) CONFIGURE_FLAGS += --disable-jit endif diff -Nru firefox-esr-115.9.0esr/sourcestamp.txt firefox-esr-115.9.1esr/sourcestamp.txt --- firefox-esr-115.9.0esr/sourcestamp.txt 2024-03-14 05:22:02.000000000 +0000 +++ firefox-esr-115.9.1esr/sourcestamp.txt 2024-03-22 02:47:41.000000000 +0000 @@ -1,2 +1,2 @@ -20240314014136 -https://hg.mozilla.org/releases/mozilla-esr115/rev/423e963b3d9b923e3c7fae8eae2f626f02c15cf2 +20240321223417 +https://hg.mozilla.org/releases/mozilla-esr115/rev/f65068dc82bf6051f520551ba5497a5985877d47