GnuTLS 3.0.2.

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

2 files changed, 2 insertions, 84 deletions

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 2a0fe3715b91..39532c075d1a 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,15 +5,13 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.1";
+  name = "gnutls-3.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "1z3dqjv8zvma2adbwbcw704zf91hazz8ilmxy91gkrdpi5z2kpz2";
+    sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
   };
 
-  patches = [ ./fix-guile-priorities-test.patch ];
-
   configurePhase = ''
     ./configure --prefix="$out"                                 \
       --disable-dependency-tracking --enable-fast-install       \
diff --git a/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch b/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch
deleted file mode 100644
index 538cb6f8e419..000000000000
--- a/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit 10115e3fb9c36abcce95bd8f74d212d068cbddce (HEAD, refs/heads/gnutls_3_0_x)
-Author: Ludovic Courtès <ludo@gnu.org>
-Date:   Mon Aug 22 18:17:10 2011 +0200
-
-    guile: Fix `priorities' test to use `run-test'.
-    
-    This is a followup to commit cd7b8102316cd4151356c4b2b7909c7435593890
-    ("guile: Fix tests to match the `exit' behavior introduced in Guile
-    2.0.1.").
-
-	Modified guile/tests/priorities.scm
-diff --git a/guile/tests/priorities.scm b/guile/tests/priorities.scm
-index 1ee072b..2af837e 100644
---- a/guile/tests/priorities.scm
-+++ b/guile/tests/priorities.scm
-@@ -24,6 +24,8 @@
- ;;;
- 
- (use-modules (gnutls)
-+             (gnutls build tests)
-+             (srfi srfi-1)
-              (srfi srfi-26))
- 
- (define %valid-priority-strings
-@@ -41,10 +43,7 @@
-     ("NONE:+VERS-TLS-ALL:+AES-128-CBC:"
-      . "+FAIL-HERE:+SHA1:+COMP-NULL:+SIGN-RSA-SHA1")))
- 
--(dynamic-wind
--
--    (lambda ()
--      #t)
-+(run-test
- 
-     (lambda ()
-       (let ((s (make-session connection-end/client)))
-@@ -52,25 +51,20 @@
-         (for-each (cut set-session-priorities! s <>)
-                   %valid-priority-strings)
- 
--        (for-each (lambda (prefix+suffix)
--                    (let* ((prefix (car prefix+suffix))
--                           (suffix (cdr prefix+suffix))
--                           (pos    (string-length prefix))
--                           (string (string-append prefix suffix)))
--                      (catch 'gnutls-error
--                        (lambda ()
--                          (let ((s (make-session connection-end/client)))
--                            (set-session-priorities! s string)))
--                        (lambda (key err function error-location . unused)
--                          (or (and (eq? key 'gnutls-error)
--                                   (eq? err error/invalid-request)
--                                   (eq? function 'set-session-priorities!)
--                                   (= error-location pos))
--                              (exit 1))))))
--                  %invalid-priority-strings)
--
--        (exit 0)))
--
--    (lambda ()
--      ;; failure
--      (exit 1)))
-+        (every (lambda (prefix+suffix)
-+                 (let* ((prefix (car prefix+suffix))
-+                        (suffix (cdr prefix+suffix))
-+                        (pos    (string-length prefix))
-+                        (string (string-append prefix suffix)))
-+                   (catch 'gnutls-error
-+                     (lambda ()
-+                       (let ((s (make-session connection-end/client)))
-+                         ;; The following call should raise an exception.
-+                         (set-session-priorities! s string)
-+                         #f))
-+                     (lambda (key err function error-location . unused)
-+                       (and (eq? key 'gnutls-error)
-+                            (eq? err error/invalid-request)
-+                            (eq? function 'set-session-priorities!)
-+                            (= error-location pos))))))
-+               %invalid-priority-strings))))
-