ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: GnuTLS: Update replacement to 3.6.14 [fixes CVE-2020-13777].

Browse source 
* gnu/packages/tls.scm (gnutls-3.6.13): Rename to ...
(gnutls-3.6.14): ... this.  Update to 3.6.14.
(gnutls)[replacement]: Adjust accordingly.
* 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-06-06 15:00:42 +02:00
parent fa7bd13e5b
commit 8951b9496b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -371,7 +371,7 @@ (define code
("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
`(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls))
`(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 guile3.0-gnutls))
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3)

10
gnu/packages/tls.scm
View file

@ -166,7 +166,7 @@ (define-public gnutls
(package
(name "gnutls")
;; XXX Unversion openconnect's "gnutls" input when ungrafting.
(replacement gnutls-3.6.13)
(replacement gnutls-3.6.14)
(version "3.6.12")
(source (origin
(method url-fetch)
@ -254,20 +254,20 @@ (define-public gnutls
(properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls")))))
(define-public gnutls-3.6.13
(define-public gnutls-3.6.14
(package
(inherit gnutls)
(version "3.6.13")
(version "3.6.14")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnutls/v"
(version-major+minor version)
"/gnutls-3.6.13.tar.xz"))
"/gnutls-" version ".tar.xz"))
(patches (search-patches "gnutls-skip-trust-store-test.patch"
"gnutls-cross.patch"))
(sha256
(base32
"0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j"))))
"0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n"))))
(native-inputs
`(,@(if (%current-target-system) ;for cross-build
`(("guile" ,guile-3.0)) ;to create .go files

2
gnu/packages/vpn.scm
View file

@ -261,7 +261,7 @@ (define-public openconnect
`(("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.13)
("gnutls" ,gnutls-3.6.14)
("zlib" ,zlib)))
(inputs
`(("lz4" ,lz4)