From 7286181cbff5c4b98ed9246366a85ae1fbc8f54d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 17 Jun 2025 12:23:06 -0400 Subject: Update to 128.12.0-1. * data/patches/CVE-2024-11692.patch, data/patches/CVE-2024-11693.patch, data/patches/CVE-2024-11697.patch: Remove vestigial patches. * data/patches/hide-firefox-view-button.patch: New file. * data/patches/about-addons.patch, data/patches/hide-protections-dashboard.patch, data/patches/hide-submit-feedback-menu-item.patch, data/patches/icecat-about-dialog.patch, data/patches/icecat-preferences.patch, data/patches/moz-configure-changes.patch: Adapt to version 128. * data/settings.js: Add more IceCat-specific customizations. * tools/process-json-files.py: Process more JSON files for search engine configuration v2 and overrides, as needed for version 128. * makeicecat: Update FFMAJOR, FFMINOR, SOURCEBALL_CHECKSUM, L10N_URL, L10_CMP_URL, and L10N_CMP_REV. Add L10N_REV. (sort_inner_list): Ignore case when sorting inner lists. (validate_env): Add check for Git. Remove check for Mercurial. (fetch_l10n): Update to reflect upstream changes. Use Git instead of Mercurial. Fetch all locales in a single clone operation. (configure, apply_batch_branding): Adapt to version 128. --- data/patches/CVE-2024-11692.patch | 61 -------------- data/patches/CVE-2024-11693.patch | 98 ----------------------- data/patches/CVE-2024-11697.patch | 40 --------- data/patches/about-addons.patch | 4 +- data/patches/hide-firefox-view-button.patch | 10 +++ data/patches/hide-protections-dashboard.patch | 2 +- data/patches/hide-submit-feedback-menu-item.patch | 10 +-- data/patches/icecat-about-dialog.patch | 8 +- data/patches/icecat-preferences.patch | 39 +++++---- data/patches/moz-configure-changes.patch | 6 +- data/settings.js | 6 ++ 11 files changed, 49 insertions(+), 235 deletions(-) delete mode 100644 data/patches/CVE-2024-11692.patch delete mode 100644 data/patches/CVE-2024-11693.patch delete mode 100644 data/patches/CVE-2024-11697.patch create mode 100644 data/patches/hide-firefox-view-button.patch (limited to 'data') diff --git a/data/patches/CVE-2024-11692.patch b/data/patches/CVE-2024-11692.patch deleted file mode 100644 index 393fe5e..0000000 --- a/data/patches/CVE-2024-11692.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fixes CVE-2024-11692 (Select list elements could be shown over another site) -Based on -Adapted to ESR 115 by Mark H Weaver - -# HG changeset patch -# User Edgar Chen -# Date 1730556179 0 -# Node ID a6cf1a7cd289db4f46cb34f4dd16cce133b25e8d -# Parent e983e8a66e515a2e32497cec1b3ccf439396dadc -Bug 1909535 - Don't show select dropdown in background tabs; a=dmeehan - -Original Revision: https://phabricator.services.mozilla.com/D225706 - -Differential Revision: https://phabricator.services.mozilla.com/D227607 - -diff --git a/toolkit/actors/SelectParent.sys.mjs b/toolkit/actors/SelectParent.sys.mjs ---- a/toolkit/actors/SelectParent.sys.mjs -+++ b/toolkit/actors/SelectParent.sys.mjs -@@ -273,16 +273,41 @@ export var SelectParentHelper = { - } - - this._currentZoom = zoom; - this._currentMenulist = menulist; - this.populateChildren(menulist, items, uniqueItemStyles, selectedIndex); - }, - - open(browser, menulist, rect, isOpenedViaTouch, selectParentActor) { -+ const canOpen = (() => { -+ if (!menulist.ownerDocument.hasFocus()) { -+ // Don't open in inactive browser windows. -+ return false; -+ } -+ if (browser) { -+ if (!browser.browsingContext.isActive) { -+ // Don't open in inactive tabs. -+ return false; -+ } -+ let tabbrowser = browser.getTabBrowser(); -+ if (tabbrowser && tabbrowser.selectedBrowser != browser) { -+ // AsyncTabSwitcher might delay activating our browser, check -+ // explicitly for tabbrowser. -+ return false; -+ } -+ } -+ return true; -+ })(); -+ -+ if (!canOpen) { -+ selectParentActor.sendAsyncMessage("Forms:DismissedDropDown", {}); -+ return; -+ } -+ - this._actor = selectParentActor; - menulist.hidden = false; - this._currentBrowser = browser; - this._closedWithEnter = false; - this._selectRect = rect; - this._registerListeners(menulist.menupopup); - - // Set the maximum height to show exactly MAX_ROWS items. - diff --git a/data/patches/CVE-2024-11693.patch b/data/patches/CVE-2024-11693.patch deleted file mode 100644 index 6bb997a..0000000 --- a/data/patches/CVE-2024-11693.patch +++ /dev/null @@ -1,98 +0,0 @@ -Fixes CVE-2024-11693 (Download Protections were bypassed by .library-ms files on Windows) -Copied from - -# HG changeset patch -# User Marco Bonardo -# Date 1730555916 0 -# Node ID e983e8a66e515a2e32497cec1b3ccf439396dadc -# Parent 893b0489efa4b18355ea91113c28bf7c731a2749 -Bug 1921458. a=dmeehan - -Original Revision: https://phabricator.services.mozilla.com/D226775 - -Differential Revision: https://phabricator.services.mozilla.com/D227221 - -diff --git a/toolkit/components/reputationservice/ApplicationReputation.cpp b/toolkit/components/reputationservice/ApplicationReputation.cpp ---- a/toolkit/components/reputationservice/ApplicationReputation.cpp -+++ b/toolkit/components/reputationservice/ApplicationReputation.cpp -@@ -286,16 +286,17 @@ const char* const ApplicationReputationS - #endif - //".job", // Windows - //".jpg", - //".jpeg", - //".js", exec // JavaScript script - //".jse", exec // JScript - ".ksh", // Linux shell - //".lha", -+ //".library-ms", exec // Windows - //".lnk", exec // Windows - ".local", // Windows - //".lpaq1", - //".lpaq5", - //".lpaq8", - //".lzh", - //".lzma", - //".mad", exec // MS Access -diff --git a/toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp b/toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp ---- a/toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp -+++ b/toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp -@@ -116,16 +116,17 @@ static const char* const kTestFileExtens - ".isp", // IIS config - ".jar", // Java - #ifndef MOZ_ESR - ".jnlp", // Java - #endif - ".js", // JavaScript script - ".jse", // JScript - ".ksh", // Linux shell -+ ".library-ms", // Windows Library Files - ".lnk", // Windows - ".local", // Windows - ".mad", // MS Access - ".maf", // MS Access - ".mag", // MS Access - ".mam", // MS Access - ".manifest", // Windows - ".maq", // MS Access -diff --git a/xpcom/io/nsLocalFileCommon.cpp b/xpcom/io/nsLocalFileCommon.cpp ---- a/xpcom/io/nsLocalFileCommon.cpp -+++ b/xpcom/io/nsLocalFileCommon.cpp -@@ -67,16 +67,17 @@ const char* const sExecutableExts[] = { - ".ins", - ".isp", - ".jar", // java application bundle - #ifndef MOZ_ESR - ".jnlp", - #endif - ".js", - ".jse", -+ ".library-ms", // Windows Library Files - ".lnk", - ".mad", // Access Module Shortcut - ".maf", // Access - ".mag", // Access Diagram Shortcut - ".mam", // Access Macro Shortcut - ".maq", // Access Query Shortcut - ".mar", // Access Report Shortcut - ".mas", // Access Stored Procedure -diff --git a/xpcom/io/nsLocalFileCommon.h b/xpcom/io/nsLocalFileCommon.h ---- a/xpcom/io/nsLocalFileCommon.h -+++ b/xpcom/io/nsLocalFileCommon.h -@@ -3,14 +3,14 @@ - /* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #ifndef _NS_LOCAL_FILE_COMMON_H_ - #define _NS_LOCAL_FILE_COMMON_H_ - - #ifdef MOZ_ESR --extern const char* const sExecutableExts[108]; -+extern const char* const sExecutableExts[109]; - #else --extern const char* const sExecutableExts[109]; -+extern const char* const sExecutableExts[110]; - #endif - - #endif - diff --git a/data/patches/CVE-2024-11697.patch b/data/patches/CVE-2024-11697.patch deleted file mode 100644 index a22dd3e..0000000 --- a/data/patches/CVE-2024-11697.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fixes CVE-2024-11697 (Improper Keypress Handling in Executable File Confirmation Dialog) -Copied from - -# HG changeset patch -# User Gijs Kruitbosch -# Date 1731505009 0 -# Node ID 936e95e3b008cb9bcccd1512332b45757a4bb7f6 -# Parent fbed98e3e9cdc2f99af7a2a14f7184f51fe07d8e -Bug 1842187 a=dmeehan - -Original Revision: https://phabricator.services.mozilla.com/D223948 - -Differential Revision: https://phabricator.services.mozilla.com/D228631 - -diff --git a/toolkit/components/downloads/DownloadUIHelper.sys.mjs b/toolkit/components/downloads/DownloadUIHelper.sys.mjs ---- a/toolkit/components/downloads/DownloadUIHelper.sys.mjs -+++ b/toolkit/components/downloads/DownloadUIHelper.sys.mjs -@@ -166,17 +166,20 @@ DownloadPrompter.prototype = { - - const title = lazy.l10n.formatValueSync( - "download-ui-file-executable-security-warning-title" - ); - const message = lazy.l10n.formatValueSync( - "download-ui-file-executable-security-warning", - { executable: PathUtils.filename(path) } - ); -- return this._prompter.confirm(title, message); -+ let flags = -+ Ci.nsIPrompt.BUTTON_DELAY_ENABLE | Ci.nsIPrompt.STD_OK_CANCEL_BUTTONS; -+ let nulls = Array(4).fill(null); -+ return 0 == this._prompter.confirmEx(title, message, flags, ...nulls, {}); - }, - - /** - * Displays a warning message box that informs that there are active - * downloads, and asks whether the user wants to cancel them or not. - * - * @param aDownloadsCount - * The current downloads count. - diff --git a/data/patches/about-addons.patch b/data/patches/about-addons.patch index 4427c46..179e336 100644 --- a/data/patches/about-addons.patch +++ b/data/patches/about-addons.patch @@ -1,6 +1,6 @@ --- a/toolkit/mozapps/extensions/content/aboutaddons.html +++ b/toolkit/mozapps/extensions/content/aboutaddons.html -@@ -174,12 +174,12 @@ +@@ -171,12 +171,12 @@