diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/tls.scm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 25dcdd72287..fee6276674f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm | |||
| @@ -165,7 +165,6 @@ living in the same process.") | |||
| 165 | (package | 165 | (package |
| 166 | (name "gnutls") | 166 | (name "gnutls") |
| 167 | (version "3.6.15") | 167 | (version "3.6.15") |
| 168 | (replacement gnutls/fixed) | ||
| 169 | (source (origin | 168 | (source (origin |
| 170 | (method url-fetch) | 169 | (method url-fetch) |
| 171 | ;; Note: Releases are no longer on ftp.gnu.org since the | 170 | ;; Note: Releases are no longer on ftp.gnu.org since the |
| @@ -174,7 +173,9 @@ living in the same process.") | |||
| 174 | (version-major+minor version) | 173 | (version-major+minor version) |
| 175 | "/gnutls-" version ".tar.xz")) | 174 | "/gnutls-" version ".tar.xz")) |
| 176 | (patches (search-patches "gnutls-skip-trust-store-test.patch" | 175 | (patches (search-patches "gnutls-skip-trust-store-test.patch" |
| 177 | "gnutls-cross.patch")) | 176 | "gnutls-cross.patch" |
| 177 | "gnutls-CVE-2021-20231.patch" | ||
| 178 | "gnutls-CVE-2021-20232.patch")) | ||
| 178 | (sha256 | 179 | (sha256 |
| 179 | (base32 | 180 | (base32 |
| 180 | "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f")))) | 181 | "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f")))) |
| @@ -257,15 +258,6 @@ required structures.") | |||
| 257 | (properties '((ftp-server . "ftp.gnutls.org") | 258 | (properties '((ftp-server . "ftp.gnutls.org") |
| 258 | (ftp-directory . "/gcrypt/gnutls"))))) | 259 | (ftp-directory . "/gcrypt/gnutls"))))) |
| 259 | 260 | ||
| 260 | (define gnutls/fixed | ||
| 261 | (package | ||
| 262 | (inherit gnutls) | ||
| 263 | (source (origin | ||
| 264 | (inherit (package-source gnutls)) | ||
| 265 | (patches (append (search-patches "gnutls-CVE-2021-20231.patch" | ||
| 266 | "gnutls-CVE-2021-20232.patch") | ||
| 267 | (origin-patches (package-source gnutls)))))))) | ||
| 268 | |||
| 269 | (define-public gnutls/guile-2.0 | 261 | (define-public gnutls/guile-2.0 |
| 270 | ;; GnuTLS for Guile 2.0. | 262 | ;; GnuTLS for Guile 2.0. |
| 271 | (package/inherit gnutls | 263 | (package/inherit gnutls |
