diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-30 18:21:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-30 18:21:31 +0200 |
| commit | 5866fa558b68b3e0213b9eef93d115e6e38dcc2a (patch) | |
| tree | b39873aae544ad920caaefa8a98f7f5deb5f0a8e /gnu/packages/cyrus-sasl.scm | |
| parent | ed9d890e0e24b10df6f170fe7c9635151e0423c1 (diff) | |
| parent | 2c11e7be745a790320a42a357635997310d731d0 (diff) | |
Merge branch 'wip-ungrafting'
Diffstat (limited to 'gnu/packages/cyrus-sasl.scm')
| -rw-r--r-- | gnu/packages/cyrus-sasl.scm | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index c18703fde0..43c2099968 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -44,8 +44,8 @@ version ".tar.gz"))) (sha256 (base32 "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) - (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch")))) - (replacement cyrus-sasl/fixed) + (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch" + "cyrus-sasl-CVE-2019-19906.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -81,20 +81,3 @@ server writers.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) (home-page "https://cyrusimap.org/sasl/"))) - -(define cyrus-sasl/fixed - (package - (inherit cyrus-sasl) - (version "2.1.27") - (source (origin - (method url-fetch) - (uri (list (string-append - "https://cyrusimap.org/releases/cyrus-sasl-" - version ".tar.gz") - (string-append - "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" - version ".tar.gz"))) - (sha256 (base32 - "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) - (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch" - "cyrus-sasl-CVE-2019-19906.patch")))))) |