From 0b70eb03cbcf5df7de9f468d9e2a3b53379779fe Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Fri, 28 May 2021 19:05:23 +0200 Subject: [PATCH] gnu: gnutls: Replace with 3.6.16 [fixes CVE-2021-20305]. * gnu/packages/tls.scm (gnutls)[replacement]: New field. (gnutls-3.6.16): New variable. Signed-off-by: Leo Famulari --- gnu/packages/tls.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 174438ad87..55410f3911 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Solene Rapenne ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,6 +166,7 @@ living in the same process.") (package (name "gnutls") (version "3.6.15") + (replacement gnutls-3.6.16) (source (origin (method url-fetch) ;; Note: Releases are no longer on ftp.gnu.org since the @@ -258,6 +260,22 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) +;; Replacement package to fix CVE-2021-20305. +(define gnutls-3.6.16 + (package + (inherit gnutls) + (version "3.6.16") + (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 + "1czk511pslz367shf32f2jvvkp7y1323bcv88c2qng98mj0v6y8v")))))) + (define-public gnutls/guile-2.0 ;; GnuTLS for Guile 2.0. (package/inherit gnutls