diff options
author | Marius Bakke <marius@gnu.org> | 2020-12-13 01:10:06 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-12-13 01:10:06 +0100 |
commit | a7737f0ead2293536b9d0ba253de4673378a0ffa (patch) | |
tree | cf80318b0a9903aa56a69c316659a52f94abbe27 /gnu/packages/mail.scm | |
parent | ba47c83570b6d1824738ef5ff8580e7581990699 (diff) | |
parent | 1adeb744560af94687eb7c3780c7145c52674070 (diff) | |
download | guix-a7737f0ead2293536b9d0ba253de4673378a0ffa.tar.gz |
Merge branch 'master' into ungrafting
Diffstat (limited to 'gnu/packages/mail.scm')
-rw-r--r-- | gnu/packages/mail.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a2d6b71377..f85713433e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> +;;; Copyright © 2020 divoplade <d@divoplade.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1700,7 +1701,13 @@ delivery.") (("(ZCAT_COMMAND=).*" all var) (string-append var gzip "/bin/zcat\n")) (("# (USE_GNUTLS(|_PC)=.*)" all line) - (string-append line "\n"))) + (string-append line "\n")) + (("# (AUTH_CRAM_MD5=yes)" all line) line) + (("# (AUTH_DOVECOT=yes)" all line) line) + (("# (AUTH_EXTERNAL=yes)" all line) line) + (("# (AUTH_PLAINTEXT=yes)" all line) line) + (("# (AUTH_SPA=yes)" all line) line) + (("# (AUTH_TLS=yes)" all line) line)) ;; This file has hard-coded relative file names for tools despite ;; the zcat configuration above. (substitute* '("src/exigrep.src") @@ -1993,7 +2000,7 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (inputs `(("bdb" ,bdb) ("cyrus-sasl" ,cyrus-sasl) - ("openssl" ,openssl-1.0) + ("openssl" ,openssl) ("zlib" ,zlib))) (home-page "https://isync.sourceforge.io/") (synopsis "Mailbox synchronization program") |