<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/bca8c50cebc3cfe80583a263a473a71642e789c4">https://github.com/macports/macports-ports/commit/bca8c50cebc3cfe80583a263a473a71642e789c4</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 bca8c50cebc mail-server: Bugfixes * Fix sha1 case regex in certificate filename * Fix openssl-genpkey command * Fix logrotate file deletion
</span>bca8c50cebc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bca8c50cebc3cfe80583a263a473a71642e789c4
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Dec 3 05:21:08 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> mail-server: Bugfixes
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix sha1 case regex in certificate filename
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix openssl-genpkey command
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix logrotate file deletion
</span>---
mail/mail-server/Portfile | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 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 27ca92475a4..0795030296b 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;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span>
name mail-server
version 1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories mail net
platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,8 @@ variant logrotate \
</span> depends_lib-append port:logrotate
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +logrotate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
require_active_variants postfix ${postfix_required_variants}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,7 +309,9 @@ pre-activate {
</span> # into /Library/LaunchDaemons
# https://trac.macports.org/ticket/60273
# This cleanup hack can be removed after December 2023.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete /Library/LaunchDaemons/org.macports.logrotate.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_isset "logrotate"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete /Library/LaunchDaemons/org.macports.logrotate.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
proc plutil_startup {plcmds label} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,7 +591,7 @@ SOLR_DELETE_DOVECOT
</span> # CA encrypted key
openssl genpkey -out private/ca.key.pem \\
-algorithm EC -pkeyopt ec_paramgen_curve:P-384 -aes256 \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -passout file:private/passphrase.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -pass file:private/passphrase.txt
</span> chmod go-r private/ca.key.pem
# CA certificate
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -608,7 +612,7 @@ SOLR_DELETE_DOVECOT
</span> openssl genpkey \\
-out intermediate/private/intermediate.key.pem \\
-algorithm EC -pkeyopt ec_paramgen_curve:P-384 -aes256 \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -passout file:intermediate/private/passphrase_intermediate.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -pass file:intermediate/private/passphrase_intermediate.txt
</span> chmod go-r intermediate/private/intermediate.key.pem
# Intermediate CA CSR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -644,7 +648,7 @@ SOLR_DELETE_DOVECOT
</span> openssl genpkey \\
-out intermediate/private/${fullhost}.key.pem \\
-algorithm EC -pkeyopt ec_paramgen_curve:P-384 -aes256 \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -passout file:intermediate/private/passphrase_client.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -pass file:intermediate/private/passphrase_client.txt
</span> chmod go-r intermediate/private/${fullhost}.key.pem
# Client certificate decrypted key
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -688,8 +692,8 @@ TLS_CERTIFICATE_SURROGATE
</span> set certificate_sha1 [exec \
openssl x509 -noout -fingerprint -sha1 -inform pem \
-in ${tls_ca_dir}/intermediate/${fullhost}.cert.pem]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set certificate_sha1 [strsed ${certificate_sha1} "s|^SHA1 Fingerprint=||"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set certificate_sha1 [strsed ${certificate_sha1} "g|:||"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regsub -nocase "^sha1 Fingerprint=" ${certificate_sha1} "" certificate_sha1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set certificate_sha1 [string tolower [strsed ${certificate_sha1} "g|:||"]]
</span> xinstall -m 0600 \
${tls_ca_dir}/intermediate/private/${fullhost}.key.pem.decrypted \
${certificates_dir}/private/${fullhost}.${certificate_sha1}.key.pem.decrypted
</pre><pre style='margin:0'>
</pre>