diff options
| author | Leo Famulari <leo@famulari.name> | 2021-04-16 16:56:11 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-04-16 16:57:28 -0400 |
| commit | 0f7e1eed16dbe56e5873a7fdfbda514f488867ff (patch) | |
| tree | b63a7479962435165b073c8f81500818feb20f55 /gnu | |
| parent | 92434734c515c5b9fdd55d93eba74a56ad3e01d0 (diff) | |
| download | guix-0f7e1eed16dbe56e5873a7fdfbda514f488867ff.tar.gz | |
gnu: cyrus-sasl: Absorb grafted replacement.
* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[source]: Use cyrus-sasl-CVE-2019-19906.patch. [replacement]: Remove field. (cyrus-sasl/fixed): Remove variable.
Diffstat (limited to 'gnu')
| -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")))))) |