From 8b3ff5c6530dc4961a99150c59c84e618130add7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 05:41:36 +0200 Subject: Merging debian version 115.12.0esr-1. Signed-off-by: Daniel Baumann --- debian/changelog | 9 +++++++++ .../Relax-minimum-supporter-rust-version-to-1.63.patch | 2 +- .../Use-the-Mozilla-Location-Service-key-when-the-Google.patch | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 57ad41dfdc..4011eb0c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +firefox-esr (115.12.0esr-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2024-26, also known as: + CVE-2024-5702, CVE-2024-5688, CVE-2024-5690, CVE-2024-5691, + CVE-2024-5693, CVE-2024-5696, CVE-2024-5700. + + -- Mike Hommey Wed, 12 Jun 2024 05:41:00 +0900 + firefox-esr (115.11.0esr-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch b/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch index e97ac3174a..486bc417b0 100644 --- a/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch +++ b/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch @@ -22,7 +22,7 @@ This reverts: 13 files changed, 36 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index aba3978..cdc047a 100644 +index 8f0a879..5a907c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1040,9 +1040,9 @@ dependencies = [ diff --git a/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch b/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch index f0cf6976c0..c12759c95d 100644 --- a/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch +++ b/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch @@ -7,10 +7,10 @@ Subject: Use the Mozilla Location Service key when the Google Key is not there 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 7ad409c..d143a0c 100644 +index 3f860aa..e461e56 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3246,7 +3246,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3247,7 +3247,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // -- cgit v1.2.3