Fix GnuTLS' `openssl' test.

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

pkgs/development/libraries/gnutls/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zg5ggf8raydr939glq5mwssly84c6czy1hi5gf00wwdhak0256r";
   };
 
-  patches = [ ./tmpdir.patch ];
+  patches = [ ./tmpdir.patch ./fix-openssl-test.patch ];
 
   configurePhase = ''
     ./configure --prefix="$out" --enable-guile --with-guile-site-dir="$out/share/guile/site"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [libgcrypt];
 
-  doCheck = false; # disabled due to a bug between libgcrypt and gnutls
+  doCheck = true;
   
   meta = {
     description = "The GNU Transport Layer Security Library";

pkgs/development/libraries/gnutls/fix-openssl-test.patch

@@ -0,0 +1,14 @@
+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");