diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-11-12 18:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 18:11:56 +0100 |
| commit | 14329eb0cb7ee701f533a179ce979d4fb4d7c7de (patch) | |
| tree | 8a03192125dadaa8bef98f652b29eeadaa2849f1 | |
| parent | nc4nix: unstable-2022-08-06 -> unstable-2022-11-12 (diff) | |
| parent | nss_latest: 3.84 -> 3.85 (diff) | |
| download | nixpkgs-14329eb0cb7ee701f533a179ce979d4fb4d7c7de.tar.gz | |
Merge pull request #200771 from helsinki-systems/upd/nss_lastest
| -rw-r--r-- | pkgs/development/libraries/nss/85_security_load_3.85+.patch (renamed from pkgs/development/libraries/nss/85_security_load.patch) | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/nss/generic.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/nss/latest.nix | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load_3.85+.patch index 2b2cce465ba7..bc3f48e66744 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load_3.85+.patch @@ -12,13 +12,13 @@ index ad8f3b84e..74676d039 100644 if (!lib) { PR_fprintf(PR_STDERR, "loading softokn3 failed"); diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c -index 9e7a0a546..a0a23a1a4 100644 +index 119c8c512..720d39ccc 100644 --- nss/lib/pk11wrap/pk11load.c +++ nss/lib/pk11wrap/pk11load.c -@@ -466,6 +466,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) - * unload the library if anything goes wrong from here on out... - */ +@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) + #else library = PR_LoadLibrary(mod->dllName); + #endif // defined(_WIN32) +#ifndef NSS_STATIC_SOFTOKEN + if ((library == NULL) && + !rindex(mod->dllName, PR_GetDirectorySeparator())) { @@ -32,7 +32,7 @@ index 9e7a0a546..a0a23a1a4 100644 if (library == NULL) { diff --git nss/lib/util/secload.c nss/lib/util/secload.c -index 12efd2f75..8b74478f6 100644 +index 1cebae4e2..9194bb761 100644 --- nss/lib/util/secload.c +++ nss/lib/util/secload.c @@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) @@ -66,8 +66,8 @@ index 12efd2f75..8b74478f6 100644 @@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) | PR_LD_ALT_SEARCH_PATH #endif - ); -+ if (! dlh) { + ); ++ if (!dlh) { + strcpy(fullName + referencePathSize, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); + } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index e6d2eae2449c..a2e44f40227f 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - (if (lib.versionOlder version "3.77") then - ./85_security_load.patch - else + (if (lib.versionOlder version "3.84") then ./85_security_load_3.77+.patch + else + ./85_security_load_3.85+.patch ) ./fix-cross-compilation.patch ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 09eaa64e600a..56d6c0e47103 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.84"; - hash = "sha256-mjh//jUP8U8AHZQ/lswMBkiRVR1x4al6Xdv/5/EgeiU="; + version = "3.85"; + hash = "sha256-r9nWRRCxFU3rvWyrNXHp/2SjNziY4DSD5Mhc2toT0pc="; } |