firefox-unwrapped: 110.0.1 -> 111.0

https://www.mozilla.org/en-US/firefox/111.0/releasenotes/

Fixes: CVE-2023-28159, CVE-2023-25748, CVE-2023-25749, CVE-2023-25750,
CVE-2023-25751, CVE-2023-28160, CVE-2023-28164, CVE-2023-28161,
CVE-2023-28162, CVE-2023-25752, CVE-2023-28176, CVE-2023-28177

+26 -3
+2 -1
pkgs/applications/networking/browsers/firefox/common.nix
··· 228 hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; 229 }) 230 ] 231 - ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch 232 ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch 233 ++ extraPatches; 234
··· 228 hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; 229 }) 230 ] 231 + ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch 232 + ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch 233 ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch 234 ++ extraPatches; 235
+22
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch
···
··· 1 + diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp 2 + index 6db876975187..5882c5d7f1d6 100644 3 + --- a/toolkit/xre/nsXREDirProvider.cpp 4 + +++ b/toolkit/xre/nsXREDirProvider.cpp 5 + @@ -11,6 +11,7 @@ 6 + 7 + #include "jsapi.h" 8 + #include "xpcpublic.h" 9 + +#include "prenv.h" 10 + #include "prprf.h" 11 + 12 + #include "nsIAppStartup.h" 13 + @@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { 14 + "/usr/lib/mozilla"_ns 15 + # endif 16 + ; 17 + - rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); 18 + + const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); 19 + + rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir)); 20 + # endif 21 + 22 + if (NS_SUCCEEDED(rv)) {
+2 -2
pkgs/applications/networking/browsers/firefox/packages.nix
··· 3 rec { 4 firefox = buildMozillaMach rec { 5 pname = "firefox"; 6 - version = "110.0.1"; 7 src = fetchurl { 8 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; 9 - sha512 = "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21"; 10 }; 11 12 meta = {
··· 3 rec { 4 firefox = buildMozillaMach rec { 5 pname = "firefox"; 6 + version = "111.0"; 7 src = fetchurl { 8 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; 9 + sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82"; 10 }; 11 12 meta = {