From b294eb5ae9900d1130d082afa3d8eabca68153fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Tue, 15 Oct 2024 12:16:11 +0000 Subject: [PATCH] firefox: prepare security 131.0.2 release --- ...emove_moreFromMozilla_Focus_and_Klar.patch | 34 ++++++++++--------- helpers/make-firefox | 2 +- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch index 72ecd3b..c10138d 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch +++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch @@ -3,10 +3,11 @@ Based on https://git.parabola.nu/abslibre.git/diff/libre/iceweasel/9004-FSDG-mis - Remove 'More from Mozilla' section in Preferences - Remove promos of Firefox Focus and Klar from Private Browsing -diff -Nru a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js ---- a/browser/app/profile/firefox.js 2022-05-22 09:35:55.500675021 +0000 -+++ b/browser/app/profile/firefox.js 2022-05-22 21:54:34.961904349 +0000 -@@ -1233,11 +1233,11 @@ pref("accessibility.typeaheadfind.linksonly", false); +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index c5f7cf3a..f0124235 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1251,11 +1251,11 @@ pref("accessibility.typeaheadfind.linksonly", false); pref("accessibility.typeaheadfind.flashBar", 1); // Whether we can show the "Firefox Labs" section. @@ -20,15 +21,15 @@ diff -Nru a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js // Used by settings to track whether the user customized advanced // performance settings. Not used directly elsewhere. -@@ -1907,7 +1907,7 @@ +@@ -2281,7 +2281,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u pref("browser.promo.focus.disallowed_regions", "cn"); // Default to enabling focus promos to be shown where allowed. -pref("browser.promo.focus.enabled", true); +pref("browser.promo.focus.enabled", false); - // Comma separated string of mozilla vpn supported platforms. - pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux"); + // Default to enabling pin promos to be shown where allowed. + pref("browser.promo.pin.enabled", true); diff -Nru a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js --- a/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 09:35:55.336673325 +0000 +++ b/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 21:50:33.783348501 +0000 @@ -477,23 +478,24 @@ diff -Nru a/browser/components/preferences/jar.mn b/browser/components/preferenc - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg content/browser/preferences/web-appearance-dark.svg content/browser/preferences/web-appearance-light.svg -diff -Nru a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg ---- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 2022-05-22 09:35:55.400673986 +0000 -+++ b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 1970-01-01 00:00:00.000000000 +0000 +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg +index edcad0f3..e69de29b 100644 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg ++++ b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg @@ -1,4 +0,0 @@ - -- -diff -Nru a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg ---- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 2022-05-22 09:35:55.404674027 +0000 -+++ b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 1970-01-01 00:00:00.000000000 +0000 +- +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg +index bb847abd..e69de29b 100644 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg ++++ b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg @@ -1,4 +0,0 @@ - -- -\ No newline at end of file +- diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js index bf97580d..31017a6f 100644 --- a/browser/components/preferences/moreFromMozilla.js diff --git a/helpers/make-firefox b/helpers/make-firefox index fdf11b8..3038683 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=114 +VERSION=115 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21