<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca649e82d8a5000d33811cdfb74131d7a136d015">https://github.com/macports/macports-ports/commit/ca649e82d8a5000d33811cdfb74131d7a136d015</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ca649e82d8a mail-server: Update to version 1.4
</span>ca649e82d8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ca649e82d8a5000d33811cdfb74131d7a136d015
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Dec 22 14:50:59 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mail-server: Update to version 1.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix variant checking issue
</span><span style='display:block; white-space:pre;color:#404040;'> * Use full TLS chain for MDA certificate
</span><span style='display:block; white-space:pre;color:#404040;'> * Workaround for issue with dovecot on macOS 12
</span><span style='display:block; white-space:pre;color:#404040;'> * See https://www.mail-archive.com/dovecot@dovecot.org/msg84784.html
</span>---
mail/mail-server/Portfile | 60 ++++++----------------
mail/mail-server/files/patch-10-master.conf.diff | 26 ++++++++++
.../files/prefix/etc/dovecot/conf.d/10-ssl.conf | 2 +-
3 files changed, 44 insertions(+), 44 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 787bf92ffad..4f2f66298d0 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.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4
</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;'>@@ -35,7 +35,7 @@ set dovecot_required_variants \
</span> depends_lib-append port:dcc \
port:dovecot \
port:dovecot-sieve \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/openssl:openssl \
</span> port:postfix \
port:rspamd \
port:sf-pwgen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,44 +70,8 @@ variant logrotate \
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # require these port dependency variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts doesn't support variant dependencies, so do this this by hand
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://trac.macports.org/ticket/126
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://lists.macports.org/pipermail/macports-users/2015-September/039201.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set required_variants_flag true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set required_variants_message ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {set result [registry_active postfix]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || [lindex [lindex ${result} 0] 3] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ne "+[join ${postfix_required_variants} +]" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append required_variants_message "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Postfix not installed with required variants. Please install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port -pN install postfix +[join ${postfix_required_variants} +]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set required_variants_flag false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {set result [registry_active dovecot]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || [lindex [lindex ${result} 0] 3] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ne "+[join ${dovecot_required_variants} +]" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append required_variants_message "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Dovecot not installed with required variants. Please install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port -pN install dovecot +[join ${dovecot_required_variants} +] \[+apns\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set required_variants_flag false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${required_variants_flag} ne true} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error ${required_variants_message}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # one of these will exit with error if the ports are not installed at all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_active postfix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_active dovecot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants postfix ${postfix_required_variants}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants dovecot ${dovecot_required_variants}
</span>
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,6 +293,15 @@ destroot {
</span>
destroot.keepdirs ${destroot}${prefix}/var/log/mail
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Workaround for issue with dovecot version 2.3.17 on macOS 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://www.mail-archive.com/dovecot@dovecot.org/msg84784.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/etc/dovecot/conf.d.macports \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${patch.cmd} ${patch.pre_args} < ${filespath}/patch-10-master.conf.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc plutil_startup {plcmds label} {
global prefix startupitem.location
foreach cmd ${plcmds} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -878,7 +851,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 dovecot +[join ${dovecot_required_variants} +]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port -pN install dovecot +[join ${dovecot_required_variants} +] \[+apns]
</span>
These are the locations and network settings for the default configuration:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -952,7 +925,8 @@ included as comments in:
</span>
sudo vi ${prefix}/etc/dovecot/conf.d/10-ssl.conf
sudo vi ${prefix}/etc/postfix/main.cf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo vi ${prefix}/var/calendarserver/Library/CalendarServer/etc/nginx.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo vi \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/var/calendarserver/Library/CalendarServer/etc/nginx.conf
</span>
References:
* http://www.postfix.org/documentation.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mail-server/files/patch-10-master.conf.diff b/mail/mail-server/files/patch-10-master.conf.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e98f0c4ad64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/mail-server/files/patch-10-master.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./10-master.conf 2021-12-23 07:27:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./10-master.conf 2021-12-23 07:29:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # everything.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #default_vsz_limit = 256M
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Workaround for issue with dovecot version 2.3.17 on macOS 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# https://www.mail-archive.com/dovecot@dovecot.org/msg84784.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++default_vsz_limit = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Login user is internally used by login processes. This is the most untrusted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # user in Dovecot system. It shouldn't have access to anything at all.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_login_user = _dovenull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +58,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_min_avail = 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If you set service_count=0, you probably need to grow this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #vsz_limit = $default_vsz_limit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vsz_limit = 2G
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # vsz_limit = 2G
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Workaround for issue with dovecot version 2.3.17 on macOS 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # https://www.mail-archive.com/dovecot@dovecot.org/msg84784.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vsz_limit = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mail-server/files/prefix/etc/dovecot/conf.d/10-ssl.conf b/mail/mail-server/files/prefix/etc/dovecot/conf.d/10-ssl.conf
</span><span style='display:block; white-space:pre;color:#808080;'>index 68ced75e0df..144fd1e0e89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mail-server/files/prefix/etc/dovecot/conf.d/10-ssl.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/mail-server/files/prefix/etc/dovecot/conf.d/10-ssl.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ ssl = required
</span> # root. Included doc/mkcert.sh can be used to easily generate self-signed
# certificate, just make sure to update the domains in dovecot-openssl.cnf
# Note: This key is managed by Server Admin. See above before making changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ssl_cert = <@PREFIX@/etc/certificates/@host@.@domain@.@tld@.@CERTIFICATE_SHA1@.cert.pem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ssl_cert = <@PREFIX@/etc/certificates/@host@.@domain@.@tld@.@CERTIFICATE_SHA1@.chain.pem
</span>
# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
# dropping root privileges, so keep the key file unreadable by anyone but
</pre><pre style='margin:0'>
</pre>