summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:40:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:40:10 +0000
commit77aac5c4ef8da1b01f8b6b126327dc315bc4dfa3 (patch)
treed0dba62e95ddaf30efcc39b05c447541e060920c
parentMerging upstream version 115.11.0esr. (diff)
downloadfirefox-esr-77aac5c4ef8da1b01f8b6b126327dc315bc4dfa3.tar.xz
firefox-esr-77aac5c4ef8da1b01f8b6b126327dc315bc4dfa3.zip
Merging debian version 115.11.0esr-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch6
-rw-r--r--debian/patches/debian-hacks/Set-DPI-to-system-settings.patch2
3 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 3f5fd0a653..9aace8ae64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+firefox-esr (115.11.0esr-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2024-22, also known as:
+ CVE-2024-4367, CVE-2024-4767, CVE-2024-4768, CVE-2024-4769,
+ CVE-2024-4770, CVE-2024-4777.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 15 May 2024 05:05:03 +0900
+
firefox-esr (115.10.0esr-1~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch b/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch
index d93faaca41..76c7c50f7f 100644
--- a/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch
+++ b/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch
@@ -12,10 +12,10 @@ Closes: #552426, #553453
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 2c50de6..ff340aa 100644
+index 6506b21..6dc53f7 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -5229,7 +5229,7 @@ var SessionStoreInternal = {
+@@ -4992,7 +4992,7 @@ var SessionStoreInternal = {
// _getWindowDimension.
let desktopToCssScale =
aWindow.desktopToDeviceScale / aWindow.devicePixelRatio;
@@ -24,7 +24,7 @@ index 2c50de6..ff340aa 100644
}
if (
aWidth &&
-@@ -5257,9 +5257,8 @@ var SessionStoreInternal = {
+@@ -5020,9 +5020,8 @@ var SessionStoreInternal = {
case "minimized":
if (aSizeModeBeforeMinimized == "maximized") {
aWindow.maximize();
diff --git a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch
index 387421ef6c..1625064613 100644
--- a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch
+++ b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch
@@ -7,7 +7,7 @@ Subject: Set DPI to system settings
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 12ed7cf..6f4cb05 100644
+index d2e9414..2a6b5e6 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -8256,7 +8256,7 @@