diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-13 16:14:52 +0000 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 16:00:36 +0100 |
| commit | ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a (patch) | |
| tree | acfe81d31191741da9693362f08c1067ba1a4a9a /pkgs/applications/networking | |
| parent | db8d5902ad3666208236a685c82e50bc8bc47706 (diff) | |
| download | nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.tar nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.tar.gz nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.tar.bz2 nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.tar.lz nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.tar.xz nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.tar.zst nixpkgs-ec8a9cddc814ea3ee60ae3984ccd17d70bf26d0a.zip | |
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
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 948b3217248..b0c727f8c5a 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -228,7 +228,8 @@ buildStdenv.mkDerivation ({ hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; }) ] - ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch + ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch + ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ extraPatches; diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch new file mode 100644 index 00000000000..71f5272a18e --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch @@ -0,0 +1,22 @@ +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 6db876975187..5882c5d7f1d6 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -11,6 +11,7 @@ + + #include "jsapi.h" + #include "xpcpublic.h" ++#include "prenv.h" + #include "prprf.h" + + #include "nsIAppStartup.h" +@@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { + "/usr/lib/mozilla"_ns + # endif + ; +- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); ++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); ++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir)); + # endif + + if (NS_SUCCEEDED(rv)) { diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2d821a6d132..2eb61f2ff34 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "110.0.1"; + version = "111.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21"; + sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82"; }; meta = { |