me/guix
Archived
1
0
Fork 0
Code Activity

gnu: GnuTLS: Update replacement to 3.6.15 [fixes CVE-2020-24659].

Browse source 
* gnu/packages/tls.scm (gnutls-3.6.14): Rename to ...
(gnutls/fixed): ... this.  Update to 3.6.15.
(gnutls): Adjust for renamed replacement.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Likewise.
* gnu/packages/vpn.scm (openconnect)[propagated-inputs]: Likewise.
This commit is contained in:
Marius Bakke 2020-12-03 16:59:10 +01:00
parent 7776fc4c0f
commit c5df560fd3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/package-management.scm
View file

@ -405,7 +405,7 @@ $(prefix)/etc/init.d\n")))
("glibc-utf8-locales" ,glibc-utf8-locales))) ("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs (propagated-inputs
`(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 gnutls)) `(("gnutls" ,(if (%current-target-system) gnutls/fixed gnutls))
;; Avahi requires "glib" which doesn't cross-compile yet. ;; Avahi requires "glib" which doesn't cross-compile yet.
,@(if (%current-target-system) ,@(if (%current-target-system)
'() '()

9
gnu/packages/tls.scm
View file

@ -165,7 +165,7 @@ living in the same process.")
(package (package
(name "gnutls") (name "gnutls")
;; XXX Unversion openconnect's "gnutls" input when ungrafting. ;; XXX Unversion openconnect's "gnutls" input when ungrafting.
(replacement gnutls-3.6.14) (replacement gnutls/fixed)
(version "3.6.12") (version "3.6.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -254,10 +254,11 @@ required structures.")
(properties '((ftp-server . "ftp.gnutls.org") (properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls"))))) (ftp-directory . "/gcrypt/gnutls")))))
(define-public gnutls-3.6.14 ;; Replacement package to fix multiple security vulnerabilities.
(define-public gnutls/fixed
(package (package
(inherit gnutls) (inherit gnutls)
(version "3.6.14") (version "3.6.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnutls/v" (uri (string-append "mirror://gnupg/gnutls/v"
@ -267,7 +268,7 @@ required structures.")
"gnutls-cross.patch")) "gnutls-cross.patch"))
(sha256 (sha256
(base32 (base32
"0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n")))) "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"))))
(native-inputs (native-inputs
`(,@(if (%current-target-system) ;for cross-build `(,@(if (%current-target-system) ;for cross-build
`(("guile" ,guile-3.0)) ;to create .go files `(("guile" ,guile-3.0)) ;to create .go files

2
gnu/packages/vpn.scm
View file

@ -265,7 +265,7 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
`(("libxml2" ,libxml2) `(("libxml2" ,libxml2)
;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’ ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’
;; See <https://gitlab.com/gnutls/gnutls/-/issues/960>. ;; See <https://gitlab.com/gnutls/gnutls/-/issues/960>.
("gnutls" ,gnutls-3.6.14) ("gnutls" ,gnutls/fixed)
("zlib" ,zlib))) ("zlib" ,zlib)))
(inputs (inputs
`(("lz4" ,lz4) `(("lz4" ,lz4)