gnutls32: update 3.2.4 -> .10, including CVE fixes

Also make gnutls32 the default gnutls.
CVE-2013-{4466,4487}
This commit is contained in:
Vladimír Čunát 2014-02-06 20:45:14 +01:00
parent 97e7ce2344
commit cb605c92d2
2 changed files with 4 additions and 3 deletions

View File

@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "gnutls-3.2.4"; name = "gnutls-3.2.10";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
sha256 = "0zl4h37g51xyaalv3qp2hvn1m6z7xzfw4yvpvi6mby4x5sqrrp8i"; sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h";
}; };
# Note: GMP is a dependency of Nettle, whose public headers include # Note: GMP is a dependency of Nettle, whose public headers include

View File

@ -4323,7 +4323,8 @@ let
gnu-efi = callPackage ../development/libraries/gnu-efi { }; gnu-efi = callPackage ../development/libraries/gnu-efi { };
gnutls = callPackage ../development/libraries/gnutls { gnutls = gnutls32;
gnutls31 = callPackage ../development/libraries/gnutls {
guileBindings = config.gnutls.guile or true; guileBindings = config.gnutls.guile or true;
}; };