kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

gnu: GnuTLS: Absorb grafted replacement.

Browse Source 
* gnu/packages/tls.scm (gnutls)[source]: Add 'gnutls-CVE-2021-20231.patch' and
'gnutls-CVE-2021-20232.patch'.
[replacement]: Remove field.
(gnutls/fixed): Remove variable.
This commit is contained in:
Leo Famulari 2021-04-16 17:18:57 -04:00
parent 76b6c61609
commit e12210dc92
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/tls.scm
View File

@ -165,7 +165,6 @@ living in the same process.")
(package (package
(name "gnutls") (name "gnutls")
(version "3.6.15") (version "3.6.15")
(replacement gnutls/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Note: Releases are no longer on ftp.gnu.org since the ;; Note: Releases are no longer on ftp.gnu.org since the
@ -174,7 +173,9 @@ living in the same process.")
(version-major+minor version) (version-major+minor version)
"/gnutls-" version ".tar.xz")) "/gnutls-" version ".tar.xz"))
(patches (search-patches "gnutls-skip-trust-store-test.patch" (patches (search-patches "gnutls-skip-trust-store-test.patch"
"gnutls-cross.patch")) "gnutls-cross.patch"
"gnutls-CVE-2021-20231.patch"
"gnutls-CVE-2021-20232.patch"))
(sha256 (sha256
(base32 (base32
"0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f")))) "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"))))
@ -257,15 +258,6 @@ required structures.")
(properties '((ftp-server . "ftp.gnutls.org") (properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls"))))) (ftp-directory . "/gcrypt/gnutls")))))
(define gnutls/fixed
(package
(inherit gnutls)
(source (origin
(inherit (package-source gnutls))
(patches (append (search-patches "gnutls-CVE-2021-20231.patch"
"gnutls-CVE-2021-20232.patch")
(origin-patches (package-source gnutls))))))))
(define-public gnutls/guile-2.0 (define-public gnutls/guile-2.0
;; GnuTLS for Guile 2.0. ;; GnuTLS for Guile 2.0.
(package/inherit gnutls (package/inherit gnutls