gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox-unwrapped: 110.0.1 -> 111.0

Browse Source 
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
This commit is contained in:
Martin Weinelt
2023-03-14 16:00:36 +01:00
parent db8d5902ad
commit ec8a9cddc8
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/firefox/common.nix
+2 -1
View File
@@ -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;
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch
+22
View File
@@ -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)) {
pkgs/applications/networking/browsers/firefox/packages.nix
+2 -2
View File
@@ -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 = {