From 7c9b4112c6405a27222aa9d026260faa5e422144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 16 Sep 2008 09:14:20 +0000
Subject: [PATCH] GnuTLS 2.4.2.

svn path=/nixpkgs/trunk/; revision=12868
---
 pkgs/development/libraries/gnutls/default.nix      |  6 +++---
 .../libraries/gnutls/fix-openssl-test.patch        | 14 --------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/fix-openssl-test.patch

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index f8b18f240a3..3af9fe0395b 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,14 +5,14 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.4.1";
+  name = "gnutls-2.4.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "1zg5ggf8raydr939glq5mwssly84c6czy1hi5gf00wwdhak0256r";
+    sha256 = "03mvpx35psvw51rv60jffpddziz6vbpapwn8lcgc7iwiqqbfjw0w";
   };
 
-  patches = [ ./tmpdir.patch ./fix-openssl-test.patch ];
+  patches = [ ./tmpdir.patch ];
 
   configurePhase = ''
     ./configure --prefix="$out" --enable-guile --with-guile-site-dir="$out/share/guile/site"
diff --git a/pkgs/development/libraries/gnutls/fix-openssl-test.patch b/pkgs/development/libraries/gnutls/fix-openssl-test.patch
deleted file mode 100644
index d70fa67600d..00000000000
--- a/pkgs/development/libraries/gnutls/fix-openssl-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch fixes the `openssl' test.
-See http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3050 .
-
---- a/tests/openssl.c
-+++ b/tests/openssl.c
-@@ -36,5 +36,8 @@ doit (void)
-   MD5_CTX c;
-   unsigned char md[MD5_DIGEST_LENGTH];
- 
-+  if (gnutls_global_init() != 0)
-+    fail ("gnutls_global_init\n");
-+
-   if (!gnutls_check_version (LIBGNUTLS_VERSION))
-     success ("gnutls_check_version ERROR\n");