<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9239651a95c3b23d238843c6ed2660a3bd6b771e">https://github.com/macports/macports-ports/commit/9239651a95c3b23d238843c6ed2660a3bd6b771e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9239651a95c3b23d238843c6ed2660a3bd6b771e
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Jan 20 08:30:10 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mail-server: Update to dovecot version 2 renaming
</span>---
mail/mail-server/Portfile | 48 +++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mail-server/Portfile b/mail/mail-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e7cc3b..289a042 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mail-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/mail-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name mail-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories mail net
platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,24 +14,24 @@ license GPL-3
</span> distfiles
description Mail server configuration
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Mail server working configuration that provides a basic, working,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- easily modifiable mail server. The configuration is built using\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postfix for the MTA, dovecot for the MDA, solr for fast search,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rspamd for a milter, and clamav for email virus scans. The\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configuration includes a surrogate TLS certificate, DKIM, and\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Apple Push Notification Service (APNS) capability for iOS devices.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Mail server working configuration that provides a basic, working,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ easily modifiable mail server. The configuration is built using\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postfix for the MTA, dovecot for the MDA, solr for fast search,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rspamd for a milter, and clamav for email virus scans. The\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configuration includes a surrogate TLS certificate, DKIM, and\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Apple Push Notification Service (APNS) capability for iOS devices.
</span>
homepage https://www.postfix.org/
set postfix_required_variants \
[lsort {dovecot_sasl pcre smtputf8 tls}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set dovecot2_required_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dovecot_required_variants \
</span> [lsort {gssapi solr}]
depends_lib-append port:dcc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dovecot2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dovecot2-sieve \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dovecot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dovecot-sieve \
</span> port:logrotate \
path:lib/libssl.dylib:openssl \
port:postfix \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,13 +83,13 @@ Postfix not installed with required variants. Please install:
</span> "
set required_variants_flag false
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {set result [registry_active dovecot2]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [catch {set result [registry_active dovecot]}]
</span> || [lindex [lindex ${result} 0] 3] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ne "+[join ${dovecot2_required_variants} +]" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ne "+[join ${dovecot_required_variants} +]" } {
</span> append required_variants_message "\
Dovecot not installed with required variants. Please install:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port -pN install dovecot2 +[join ${dovecot2_required_variants} +] \[+apns\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port -pN install dovecot +[join ${dovecot_required_variants} +] \[+apns\]
</span>
"
set required_variants_flag false
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@ Dovecot not installed with required variants. Please install:
</span> ui_error ${required_variants_message}
# one of these will exit with error if the ports are not installed at all
registry_active postfix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_active dovecot2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_active dovecot
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -726,7 +726,7 @@ TLS_CERTIFICATE_SURROGATE
</span>
# dovecot sieve functions
# dovecot must be built with `--with-lucene` for sievec to work here
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![catch {set result [registry_active dovecot2]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {set result [registry_active dovecot]}]
</span> && [string match "*solr*" [lindex [lindex ${result} 0] 3]] } {
foreach d {
sieve
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -740,7 +740,7 @@ TLS_CERTIFICATE_SURROGATE
</span> } else {
ui_msg "dovecot plugin 'fts_lucene' not installed. Please install:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port -pN install dovecot2 +[join ${dovecot2_required_variants} +]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port -pN install dovecot +[join ${dovecot_required_variants} +]
</span>
and rerun `sudo port install ${name}`. Ensure that the sieve scripts
in ${prefix}/etc/dovecot/sieve*/*.sieve are compiled with sievec.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -783,13 +783,13 @@ startupitem.start "port load clamav-server
</span> \tport load redis
\tport load dcc
\tport load postfix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\tport load dovecot2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tport load dovecot
</span> \tport load rspamd"
startupitem.stop "port unload apache-solr8
\tport unload dcc
\tport unload postfix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\tport unload dovecot2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tport unload dovecot
</span> \tport unload rspamd"
startupitem.restart "port reload apache-solr8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -798,9 +798,9 @@ startupitem.restart "port reload apache-solr8
</span> \tport unload postfix ; \\
\tsleep 1 ; \\
\tport load postfix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\tport unload dovecot2 ; \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tport unload dovecot ; \\
</span> \tsleep 1 ; \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\tport load dovecot2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tport load dovecot
</span> \tport reload rspamd"
proc plutil_startup {plcmds label} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -836,7 +836,7 @@ port forwarding, possibly a mail replay, and more.
</span>
Postfix and dovecot must be installed with these variants:
sudo port -pN install postfix +[join ${postfix_required_variants} +]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port -pN install dovecot2 +[join ${dovecot2_required_variants} +]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port -pN install dovecot +[join ${dovecot_required_variants} +]
</span>
These are the locations and network settings for the default configuration:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -893,7 +893,7 @@ services. These may be controlled independently, e.g.
</span> sudo port load redis
sudo port load dcc
sudo port load postfix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port load dovecot2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port load dovecot
</span> sudo port load rspamd
and if installed independently,
</pre><pre style='margin:0'>
</pre>