02/03: gnu: gnutls: Update to 3.6.15.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 0e54d63dfa60bb729a844a182001631967e8a8c3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Sep 25 14:46:03 2020 +0200

    gnu: gnutls: Update to 3.6.15.
    
    * gnu/packages/tls.scm (gnutls): Update to 3.6.15.
    [replacement]: Remove.
    (gnutls-3.6.14): Remove.
    * gnu/packages/vpn.scm (openconnect)[inputs]: Adjust accordingly.
    * gnu/packages/package-management.scm (guix)[propagated-inputs]:
    Likewise.
---
 gnu/packages/package-management.scm |  2 +-
 gnu/packages/tls.scm                | 26 ++------------------------
 gnu/packages/vpn.scm                |  2 +-
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index bcd7c69..30092e0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -384,7 +384,7 @@ $(prefix)/etc/init.d\n")))
 
          ("glibc-utf8-locales" ,glibc-utf8-locales)))
       (propagated-inputs
-       `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 
guile3.0-gnutls))
+       `(("gnutls" ,gnutls)
          ("guile-gcrypt" ,guile-gcrypt)
          ("guile-json" ,guile-json-4)
          ("guile-sqlite3" ,guile-sqlite3)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c5f25aa..8e2fc13 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -167,9 +167,7 @@ living in the same process.")
 (define-public gnutls
   (package
     (name "gnutls")
-    ;; XXX Unversion openconnect's "gnutls" input when ungrafting.
-    (replacement gnutls-3.6.14)
-    (version "3.6.12")
+    (version "3.6.15")
     (source (origin
              (method url-fetch)
              (uri
@@ -181,7 +179,7 @@ living in the same process.")
              (patches (search-patches "gnutls-skip-trust-store-test.patch"))
              (sha256
               (base32
-               "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z"))))
+               "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? ,(not (hurd-target?))
@@ -269,26 +267,6 @@ required structures.")
     (properties '((ftp-server . "ftp.gnutls.org")
                   (ftp-directory . "/gcrypt/gnutls")))))
 
-(define-public gnutls-3.6.14
-  (package
-    (inherit gnutls)
-    (version "3.6.14")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnupg/gnutls/v"
-                                  (version-major+minor version)
-                                  "/gnutls-" version ".tar.xz"))
-              (patches (search-patches "gnutls-skip-trust-store-test.patch"
-                                       "gnutls-cross.patch"))
-              (sha256
-               (base32
-                "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n"))))
-    (native-inputs
-     `(,@(if (%current-target-system)             ;for cross-build
-             `(("guile" ,guile-3.0))              ;to create .go files
-             '())
-       ,@(package-native-inputs gnutls)))))
-
 (define-public gnutls/guile-2.0
   ;; GnuTLS for Guile 2.0.
   (package/inherit gnutls
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index c704106..12ead4b 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -265,7 +265,7 @@ the user specifically asks to proxy, so the @dfn{VPN} 
interface no longer
     `(("libxml2" ,libxml2)
       ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’
       ;; See <https://gitlab.com/gnutls/gnutls/-/issues/960>.
-      ("gnutls" ,gnutls-3.6.14)
+      ("gnutls" ,gnutls)
       ("zlib" ,zlib)))
    (inputs
     `(("lz4" ,lz4)