From bf0a29b2e9e32618d70f68e0fa2251d7ec80a7c4 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 4 Aug 2022 18:18:26 +0200 Subject: [PATCH] drop glibc 2.34 workaround (bring back orig sandbox level) glibc is patched since 2.35-7 and 2.36 includes upstream fix --- firefox.spec | 3 --- glibc-2.34.patch | 28 ---------------------------- 2 files changed, 31 deletions(-) delete mode 100644 glibc-2.34.patch diff --git a/firefox.spec b/firefox.spec index 868c376..ff75537 100644 --- a/firefox.spec +++ b/firefox.spec @@ -264,8 +264,6 @@ Patch8: %{name}-system-virtualenv.patch Patch9: %{name}-Disable-Firefox-Health-Report.patch Patch10: system-cairo.patch Patch11: glibc-double.patch -# Test if it can be removed when updating package -Patch12: glibc-2.34.patch URL: https://www.mozilla.org/firefox/ BuildRequires: OpenGL-devel BuildRequires: alsa-lib-devel @@ -2128,7 +2126,6 @@ unpack() { %patch9 -p1 %{?with_system_cairo:%patch10 -p1} %patch11 -p1 -%patch12 -p1 %if %{with pgo} %{__sed} -i -e 's@__BROWSER_PATH__@"../../dist/bin/firefox-bin"@' build/automation.py.in diff --git a/glibc-2.34.patch b/glibc-2.34.patch deleted file mode 100644 index 916a879..0000000 --- a/glibc-2.34.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- firefox-93.0/modules/libpref/init/all.js~ 2021-10-06 00:00:30.000000000 +0200 -+++ firefox-93.0/modules/libpref/init/all.js 2021-10-06 09:47:55.616984455 +0200 -@@ -216,6 +216,11 @@ - pref("security.crash_tracking.js_load_1.prevCrashes", 0); - pref("security.crash_tracking.js_load_1.maxCrashes", 0); - -+// Lower from 4 to 2 due to extension problems on glibc 2.34 -+// https://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2021-October/026375.html -+// https://wiki.mozilla.org/Security/Sandbox#Content_Levels -+pref("security.sandbox.content.level", 2); -+ - pref("general.useragent.compatMode.firefox", false); - - pref("general.config.obscure_value", 13); // for MCD .cfg files ---- firefox-93.0/browser/app/profile/firefox.js~ 2021-10-06 09:50:42.000000000 +0200 -+++ firefox-93.0/browser/app/profile/firefox.js 2021-10-06 19:19:15.409293732 +0200 -@@ -1233,7 +1233,10 @@ - // the sandbox while we fix their problems, or to allow running Firefox with - // exotic configurations we can't reasonably support out of the box. - // -- pref("security.sandbox.content.level", 4); -+// Lower from 4 to 2 due to extension problems on glibc 2.34 -+// https://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2021-October/026375.html -+// https://wiki.mozilla.org/Security/Sandbox#Content_Levels -+ pref("security.sandbox.content.level", 2); - // Introduced as part of bug 1608558. Linux is currently the only platform - // that uses a sandbox level for the socket process. There are currently - // only 2 levels: -- 2.44.0