GnuTLS 2.12.2.

svn path=/nixpkgs/trunk/; revision=26793

2 files changed, 127 insertions, 4 deletions

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 0da25f3dd69..44d1fcd582f 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,17 +1,19 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, libgcrypt
+{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
 , guileBindings, guile }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.10.5";
+  name = "gnutls-2.12.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "1jfrxd1h4f5kkfzrwx8yx6a2dwrgqr6imbxnil1jfi7hdr1db1n0";
+    sha256 = "0hvymf1q3d63hbi3hia876alaq7asprgwzhy49192i2h2gjlx5nc";
   };
 
+  patches = [ ./no-libgcrypt.patch ];
+
   configurePhase = ''
     ./configure --prefix="$out"                                 \
       --disable-dependency-tracking --enable-fast-install       \
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib lzo libtasn1 ]
     ++ stdenv.lib.optional guileBindings guile;
 
-  propagatedBuildInputs = [ libgcrypt ];
+  propagatedBuildInputs = [ nettle ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/gnutls/no-libgcrypt.patch b/pkgs/development/libraries/gnutls/no-libgcrypt.patch
new file mode 100644
index 00000000000..708467ab30f
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/no-libgcrypt.patch
@@ -0,0 +1,121 @@
+Libgcrypt is no longer required.
+
+diff --git a/src/certtool-common.c b/src/certtool-common.c
+index f3c6658..7e7083d 100644
+--- a/src/certtool-common.c
++++ b/src/certtool-common.c
+@@ -1,5 +1,6 @@
+ /*
+- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++ *   2011 Free Software Foundation, Inc.
+  *
+  * This file is part of GnuTLS.
+  *
+@@ -28,8 +29,6 @@
+ #include <gnutls/pkcs11.h>
+ #include <gnutls/abstract.h>
+ 
+-#include <gcrypt.h>
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/certtool.c b/src/certtool.c
+index 9da4318..e5de9a3 100644
+--- a/src/certtool.c
++++ b/src/certtool.c
+@@ -1,5 +1,6 @@
+ /*
+- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++ *   2011 Free Software Foundation, Inc.
+  *
+  * This file is part of GnuTLS.
+  *
+@@ -28,8 +29,6 @@
+ #include <gnutls/pkcs11.h>
+ #include <gnutls/abstract.h>
+ 
+-#include <gcrypt.h>
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/p11tool.c b/src/p11tool.c
+index 0125531..4c10f59 100644
+--- a/src/p11tool.c
++++ b/src/p11tool.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2010 Free Software Foundation, Inc.
++ * Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+  *
+  * Author: Nikos Mavrogiannopoulos
+  *
+@@ -30,8 +30,6 @@
+ #include <gnutls/pkcs11.h>
+ #include <gnutls/abstract.h>
+ 
+-#include <gcrypt.h>
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c
+index 2d7a9c4..fff9f8f 100644
+--- a/tests/crq_key_id.c
++++ b/tests/crq_key_id.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
++ * Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+  *
+  * Author: David Marín Carreño
+  *
+@@ -27,7 +27,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <gcrypt.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ #include <gnutls/abstract.h>
+diff --git a/tests/cve-2009-1416.c b/tests/cve-2009-1416.c
+index 784521f..b9a66e5 100644
+--- a/tests/cve-2009-1416.c
++++ b/tests/cve-2009-1416.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
++ * Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+  *
+  * Author: Simon Josefsson
+  *
+@@ -41,7 +41,6 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ 
+-#include <gcrypt.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ 
+diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c
+index d20df0c..a09faae 100644
+--- a/tests/pkcs12_s2k_pem.c
++++ b/tests/pkcs12_s2k_pem.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
++ * Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+  *
+  * Author: Simon Josefsson
+  *
+@@ -34,7 +34,6 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ 
+-#include <gcrypt.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+