From cb605c92d2294eb873c637d399169a74bdcb593a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:45:14 +0100
Subject: [PATCH] gnutls32: update 3.2.4 -> .10, including CVE fixes

Also make gnutls32 the default gnutls.
CVE-2013-{4466,4487}
---
 pkgs/development/libraries/gnutls/3.2.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index 5a5b6aa94e2b..03a0c0019790 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation (rec {
 
-  name = "gnutls-3.2.4";
+  name = "gnutls-3.2.10";
 
   src = fetchurl {
     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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c793a200eb2f..1b1916f2c635 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4323,7 +4323,8 @@ let
 
   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;
   };