Unverified Commit 778695e1 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #269174: cacert: 3.92 -> 3.95 

...into staging-23.11
parents 8cf78ec7 abaae41b

pkgs/data/misc/cacert/default.nix

+9 −17
Original line number Diff line number Diff line 
{ lib

, stdenv

, writeText

, fetchurl

, fetchFromGitHub

, buildcatrust

, blacklist ? []

, extraCertificateFiles ? []
@@ -17,20 +17,10 @@ 
}:



let

  blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" (blacklist ++ [

    # Mozilla does not trust new certificates issued by these CAs after 2022/11/30¹

    # in their products, but unfortunately we don't have such a fine-grained

    # solution for most system packages², so we decided to eject these.

    #

    # [1] https://groups.google.com/a/mozilla.org/g/dev-security-policy/c/oxX69KFvsm4/m/yLohoVqtCgAJ

    # [2] https://utcc.utoronto.ca/~cks/space/blog/linux/CARootStoreTrustProblem

    "TrustCor ECA-1"

    "TrustCor RootCert CA-1"

    "TrustCor RootCert CA-2"

  ]));

  blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist);

  extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings);



  srcVersion = "3.92";

  srcVersion = "3.95";

  version = if nssOverride != null then nssOverride.version else srcVersion;

  meta = with lib; {

    homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -43,9 +33,11 @@ let 
    pname = "nss-cacert-certdata";

    inherit version;



    src = if nssOverride != null then nssOverride.src else fetchurl {

      url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz";

      hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ=";

    src = if nssOverride != null then nssOverride.src else fetchFromGitHub {

      owner = "nss-dev";

      repo = "nss";

      rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM";

      hash = "sha256-qgSbzlRbU+gElC2ae3FEGRUFSM1JHd/lNGNXC0x4xt4=";

    };



    dontBuild = true;
@@ -54,7 +46,7 @@ let 
      runHook preInstall



      mkdir $out

      cp nss/lib/ckfw/builtins/certdata.txt $out

      cp lib/ckfw/builtins/certdata.txt $out



      runHook postInstall

    '';