gnu: dovecot: Update to 2.3.0.

* gnu/packages/mail.scm (dovecot): Update to 2.3.0.
* gnu/services/mail.scm (dovecot-configuration)[director-doveadm-port]
[ssl-parameters-regenerate]: Delete fields.
[ssl-protocols]: Rename to...
[ssl-min-protocol]: ...this.
[mail-log-prefix, mdbox-rotate-size, ssl-cipher-list, imap-logout-format]:
Update default values.
* doc/guix.texi (Mail Services): Reflect the above changes to the service.
This commit is contained in:
Tobias Geerinckx-Rice 2017-12-23 06:58:57 +01:00
parent 2f3800e53e
commit 28c03b4555
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
3 changed files with 20 additions and 43 deletions

View file

@ -13072,13 +13072,6 @@ has any connections.
Defaults to @samp{"15 min"}. Defaults to @samp{"15 min"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer director-doveadm-port
TCP/IP port that accepts doveadm connections (instead of director
connections) If you enable this, you'll also need to add
@samp{inet-listener} for the port.
Defaults to @samp{0}.
@end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string director-username-hash @deftypevr {@code{dovecot-configuration} parameter} string director-username-hash
How the username is translated before being hashed. Useful values How the username is translated before being hashed. Useful values
include %Ln if user can log in with or without @@domain, %Ld if mailboxes include %Ln if user can log in with or without @@domain, %Ld if mailboxes
@ -13171,7 +13164,7 @@ Defaults to @samp{"%$: %s"}.
@deftypevr {@code{dovecot-configuration} parameter} string mail-log-prefix @deftypevr {@code{dovecot-configuration} parameter} string mail-log-prefix
Log prefix for mail processes. See doc/wiki/Variables.txt for list Log prefix for mail processes. See doc/wiki/Variables.txt for list
of possible variables you can use. of possible variables you can use.
Defaults to @samp{"\"%s(%u): \""}. Defaults to @samp{"\"%s(%u)<%{pid}><%{session}>: \""}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string deliver-log-format @deftypevr {@code{dovecot-configuration} parameter} string deliver-log-format
@ -13516,7 +13509,7 @@ Defaults to @samp{0}.
@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size @deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size
Maximum dbox file size until it's rotated. Maximum dbox file size until it's rotated.
Defaults to @samp{2000000}. Defaults to @samp{10000000}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string mdbox-rotate-interval @deftypevr {@code{dovecot-configuration} parameter} string mdbox-rotate-interval
@ -13654,21 +13647,14 @@ x500UniqueIdentifier are the usual choices. You'll also need to set
Defaults to @samp{"commonName"}. Defaults to @samp{"commonName"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} hours ssl-parameters-regenerate @deftypevr {@code{dovecot-configuration} parameter} string ssl-min-protocol
How often to regenerate the SSL parameters file. Generation is Minimum SSL protocol version to accept.
quite CPU intensive operation. The value is in hours, 0 disables Defaults to @samp{"TLSv1"}.
regeneration entirely.
Defaults to @samp{168}.
@end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string ssl-protocols
SSL protocols to use.
Defaults to @samp{"!SSLv2"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string ssl-cipher-list @deftypevr {@code{dovecot-configuration} parameter} string ssl-cipher-list
SSL ciphers to use. SSL ciphers to use.
Defaults to @samp{"ALL:!LOW:!SSLv2:!EXP:!aNULL"}. Defaults to @samp{"ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@@STRENGTH"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string ssl-crypto-device @deftypevr {@code{dovecot-configuration} parameter} string ssl-crypto-device
@ -13770,7 +13756,8 @@ total number of bytes read from client
@item %o @item %o
total number of bytes sent to client. total number of bytes sent to client.
@end table @end table
Defaults to @samp{"in=%i out=%o"}. See @file{doc/wiki/Variables.txt} for a list of all the variables you can use.
Defaults to @samp{"in=%i out=%o deleted=%{deleted} expunged=%{expunged} trashed=%{trashed} hdr_count=%{fetch_hdr_count} hdr_bytes=%{fetch_hdr_bytes} body_count=%{fetch_body_count} body_bytes=%{fetch_body_bytes}"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} string imap-capability @deftypevr {@code{dovecot-configuration} parameter} string imap-capability

View file

@ -1137,7 +1137,7 @@ (define-public exim
(define-public dovecot (define-public dovecot
(package (package
(name "dovecot") (name "dovecot")
(version "2.2.33.2") (version "2.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1145,7 +1145,7 @@ (define-public dovecot
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (base32 (sha256 (base32
"117f9i62liz2pm96zi2lpldzlj2knzj7g410zhifwmlsc1w3n7py")))) "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View file

@ -2,6 +2,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -745,12 +746,6 @@ (define-configuration dovecot-configuration
"How long to redirect users to a specific server after it no longer "How long to redirect users to a specific server after it no longer
has any connections.") has any connections.")
(director-doveadm-port
(non-negative-integer 0)
"TCP/IP port that accepts doveadm connections (instead of director
connections) If you enable this, you'll also need to add
@samp{inet-listener} for the port.")
(director-username-hash (director-username-hash
(string "%Lu") (string "%Lu")
"How the username is translated before being hashed. Useful values "How the username is translated before being hashed. Useful values
@ -831,7 +826,7 @@ (define-configuration dovecot-configuration
string, %$ contains the data we want to log.") string, %$ contains the data we want to log.")
(mail-log-prefix (mail-log-prefix
(string "\"%s(%u): \"") (string "\"%s(%u)<%{pid}><%{session}>: \"")
"Log prefix for mail processes. See doc/wiki/Variables.txt for list "Log prefix for mail processes. See doc/wiki/Variables.txt for list
of possible variables you can use.") of possible variables you can use.")
@ -1145,7 +1140,7 @@ (define-configuration dovecot-configuration
updated.") updated.")
(mdbox-rotate-size (mdbox-rotate-size
(non-negative-integer #e2e6) (non-negative-integer #e10e6)
"Maximum dbox file size until it's rotated.") "Maximum dbox file size until it's rotated.")
(mdbox-rotate-interval (mdbox-rotate-interval
@ -1262,18 +1257,12 @@ (define-configuration dovecot-configuration
x500UniqueIdentifier are the usual choices. You'll also need to set x500UniqueIdentifier are the usual choices. You'll also need to set
@samp{auth-ssl-username-from-cert? #t}.") @samp{auth-ssl-username-from-cert? #t}.")
(ssl-parameters-regenerate (ssl-min-protocol
(hours 168) (string "TLSv1")
"How often to regenerate the SSL parameters file. Generation is "Minimum SSL protocol version to accept.")
quite CPU intensive operation. The value is in hours, 0 disables
regeneration entirely.")
(ssl-protocols
(string "!SSLv2")
"SSL protocols to use.")
(ssl-cipher-list (ssl-cipher-list
(string "ALL:!LOW:!SSLv2:!EXP:!aNULL") (string "ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH")
"SSL ciphers to use.") "SSL ciphers to use.")
(ssl-crypto-device (ssl-crypto-device
@ -1356,14 +1345,15 @@ (define-configuration dovecot-configuration
often.") often.")
(imap-logout-format (imap-logout-format
(string "in=%i out=%o") (string "in=%i out=%o deleted=%{deleted} expunged=%{expunged} trashed=%{trashed} hdr_count=%{fetch_hdr_count} hdr_bytes=%{fetch_hdr_bytes} body_count=%{fetch_body_count} body_bytes=%{fetch_body_bytes}")
"IMAP logout format string: "IMAP logout format string:
@table @code @table @code
@item %i @item %i
total number of bytes read from client total number of bytes read from client
@item %o @item %o
total number of bytes sent to client. total number of bytes sent to client.
@end table") @end table
See @file{doc/wiki/Variables.txt} for a list of all the variables you can use.")
(imap-capability (imap-capability
(string "") (string "")