From 1b17c6dfc04faf545e4142a1d5efab6a93d31fcf Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Thu, 26 Jun 2025 23:01:22 +0200 Subject: nongnu: firefox-esr: Update to 140.0esr. * nongnu/packages/mozilla.scm (firefox-esr): Update to 140.0esr. [source]: Add firefox-restore-desktop-files.patch. Use >=138 version of path comparison patch. [inputs]: Use icu4c-76. [native-inputs]: Use rust-cbindgen-0.28. (firefox)[inputs]: Drop. [native-inputs]: Do not replace rust-cbindgen. * nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch: Update to new version. No functional changes. * nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch: Same. * nongnu/packages/patches/firefox-esr-compare-paths.patch: Delete file. Signed-off-by: Hilton Chain --- .../firefox-esr-add-store-to-rdd-allowlist.patch | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch') diff --git a/nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch b/nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch index 6ae18c3..4bdaa7d 100644 --- a/nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch +++ b/nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch @@ -1,16 +1,16 @@ diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp -index 0e5358e68e..efbde9616e 100644 +index 4eff5e6..42171eb 100644 --- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp +++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp -@@ -452,6 +452,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() { +@@ -476,6 +476,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() { // Various places where fonts reside - policy->AddDir(rdonly, "/usr/X11R6/lib/X11/fonts"); - policy->AddDir(rdonly, "/nix/store"); -+ policy->AddDir(rdonly, "/gnu/store"); + policy->AddTree(rdonly, "/usr/X11R6/lib/X11/fonts"); + policy->AddTree(rdonly, "/nix/store"); ++ policy->AddTree(rdonly, "/gnu/store"); // https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/e434e680d22260f277f4a30ec4660ed32b591d16/files/fontconfig-flatpak.conf - policy->AddDir(rdonly, "/run/host/fonts"); - policy->AddDir(rdonly, "/run/host/user-fonts"); -@@ -461,6 +462,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() { + policy->AddTree(rdonly, "/run/host/fonts"); + policy->AddTree(rdonly, "/run/host/user-fonts"); +@@ -485,6 +486,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() { // Bug 1848615 policy->AddPath(rdonly, "/usr"); policy->AddPath(rdonly, "/nix"); @@ -18,19 +18,19 @@ index 0e5358e68e..efbde9616e 100644 AddLdconfigPaths(policy); AddLdLibraryEnvPaths(policy); -@@ -920,6 +922,7 @@ SandboxBrokerPolicyFactory::GetRDDPolicy(int aPid) { - policy->AddDir(rdonly, "/usr/lib64"); - policy->AddDir(rdonly, "/run/opengl-driver/lib"); - policy->AddDir(rdonly, "/nix/store"); -+ policy->AddDir(rdonly, "/gnu/store"); +@@ -934,6 +936,7 @@ SandboxBrokerPolicyFactory::GetRDDPolicy(int aPid) { + policy->AddTree(rdonly, "/usr/lib64"); + policy->AddTree(rdonly, "/run/opengl-driver/lib"); + policy->AddTree(rdonly, "/nix/store"); ++ policy->AddTree(rdonly, "/gnu/store"); // Bug 1647957: memory reporting. AddMemoryReporting(policy.get(), aPid); -@@ -1043,6 +1046,7 @@ SandboxBrokerPolicyFactory::GetUtilityProcessPolicy(int aPid) { +@@ -1079,6 +1082,7 @@ SandboxBrokerPolicyFactory::GetUtilityProcessPolicy(int aPid) { // Required to make sure ffmpeg loads properly, this is already existing on // Content and RDD - policy->AddDir(rdonly, "/nix/store"); -+ policy->AddDir(rdonly, "/gnu/store"); + policy->AddTree(rdonly, "/nix/store"); ++ policy->AddTree(rdonly, "/gnu/store"); // glibc will try to stat64("/") while populating nsswitch database // https://sourceware.org/git/?p=glibc.git;a=blob;f=nss/nss_database.c;h=cf0306adc47f12d9bc761ab1b013629f4482b7e6;hb=9826b03b747b841f5fc6de2054bf1ef3f5c4bdf3#l396 -- cgit v1.2.3