<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a1011484bafedc3ae4af19fafe4c5ede2263d30c">https://github.com/macports/macports-ports/commit/a1011484bafedc3ae4af19fafe4c5ede2263d30c</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 a1011484baf dovecot: update to 2.3.20
</span>a1011484baf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a1011484bafedc3ae4af19fafe4c5ede2263d30c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Apr 5 00:25:13 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> dovecot: update to 2.3.20
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use startupitem.custom_file and refresh database variants.
</span>---
mail/dovecot/Portfile | 79 ++++++++++------------
.../patch-src-lib-ioloop-notify-kqueue-c.diff | 10 ---
2 files changed, 35 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/dovecot/Portfile b/mail/dovecot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1395d663ec7..0f86e083f58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/dovecot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/dovecot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
set core_branch 2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set core_version ${core_branch}.19.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set core_version ${core_branch}.20
</span> github.setup dovecot core ${core_version}
name dovecot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 20060722
categories mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,9 +66,9 @@ subport dovecot-sieve {
</span> distname dovecot-${core_branch}-pigeonhole-${version}
master_sites ${homepage}releases/${core_branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d453de41682ce7c809cabb3c5ebddbe5e31eb804 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 637709a83fb1338c918e5398049f96b7aeb5ae00696794ed1e5a4d4c0ca3f688 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1954347
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5440ea41a445304a815f85f94f97cb83041c338f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1945126
</span>
depends_lib-append \
port:dovecot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,9 +86,9 @@ set perl5.major 5.34
</span> if {${name} eq ${subport}} {
master_sites https://dovecot.org/releases/${core_branch}/
distname ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1332df6aaa11d9625f8ed29a9eeda09c083db7a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 db5abcd87d7309659ea6b45b2cb6ee9c5f97486b2b719a5dd05a759e1f6a5c51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7790851
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 30f17a472bd4a27ff965f38b96e655386aaa34ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7805735
</span>
depends_build-append \
port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,10 +111,9 @@ if {${name} eq ${subport}} {
</span>
patch.pre_args -p1
patchfiles patch-doc-example-config-conf.d-10-master.conf.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-lib-ioloop-notify-kqueue-c.diff \
</span> patch-src-master-master-settings.c.diff \
dynamic_lookup-11.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \
${worksrcpath}/doc/example-config/conf.d/10-master.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +196,7 @@ if {${name} eq ${subport}} {
</span> ${destroot}${prefix}/var/db/${name}-apns
xinstall -m 0755 -d \
${destroot}${prefix}/lib/pushnotify/Net/APNS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- close [open ${destroot}${prefix}/var/db/${name}-apns/devices a]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch ${destroot}${prefix}/var/db/${name}-apns/devices
</span> file attributes \
${destroot}${prefix}/var/db/${name}-apns/devices \
-permissions 0750 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,16 +274,8 @@ if {${name} eq ${subport}} {
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.6 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql96/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pgsql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant postgresql10 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql12 postgresql13 postgresql14 postgresql15 \
</span> description "Enable PostgreSQL 10 support" {
depends_lib-append port:postgresql10
configure.env-append PG_CONFIG=${prefix}/lib/postgresql10/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,7 +283,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql12 postgresql13 postgresql14 postgresql15 \
</span> description "Enable PostgreSQL 11 support" {
depends_lib-append port:postgresql11
configure.env-append PG_CONFIG=${prefix}/lib/postgresql11/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,7 +291,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql12 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 postgresql11 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql11 postgresql13 postgresql14 postgresql15 \
</span> description "Enable PostgreSQL 12 support" {
depends_lib-append port:postgresql12
configure.env-append PG_CONFIG=${prefix}/lib/postgresql12/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,7 +299,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql13 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 postgresql11 postgresql12 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql11 postgresql12 postgresql14 postgresql15 \
</span> description "Enable PostgreSQL 13 support" {
depends_lib-append port:postgresql13
configure.env-append PG_CONFIG=${prefix}/lib/postgresql13/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,13 +307,21 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql14 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 postgresql11 postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql11 postgresql12 postgresql13 postgresql15 \
</span> description "Enable PostgreSQL 14 support" {
depends_lib-append port:postgresql14
configure.env-append PG_CONFIG=${prefix}/lib/postgresql14/bin/pg_config
configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 15 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql15/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgsql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant percona \
conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 \
description "Enable Percona (MySQL) support" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,9 +402,13 @@ if {${name} eq ${subport}} {
</span> configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove after 2023-08-20
</span> variant mariadb10.1 requires mariadb10.7 description "Legacy compatibility variant" {}
variant mariadb requires mariadb10.7 description "Legacy compatibility variant" {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove after 2024-04-04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql96 requires postgresql14 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset "apns"]} {
set daemon_uniquename \
org.macports.${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -419,32 +422,20 @@ if {${name} eq ${subport}} {
</span> location LaunchDaemons \
uniquename ${daemon_uniquename} \
plist ${daemon_uniquename}.plist \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ custom_file ${workpath}/plists/${daemon_uniquename}.plist \
</span> name ${name}-apns \
location LaunchDaemons \
uniquename ${pushnotify_uniquename} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- plist ${pushnotify_uniquename}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plist ${pushnotify_uniquename}.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ custom_file ${workpath}/plists/${pushnotify_uniquename}.plist
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach uniquename "${daemon_uniquename} ${pushnotify_uniquename}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${workpath}/plists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach uniquename [list ${daemon_uniquename} ${pushnotify_uniquename}] {
</span> xinstall -m 644 -W ${filespath} ${uniquename}.plist \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/plists
</span> reinplace "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}/Library/LaunchDaemons/${uniquename}.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/LaunchDaemons/${uniquename}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}/Library/LaunchDaemons/${uniquename}.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/LaunchDaemons/${uniquename}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${startupitem.install} && [geteuid] == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/LaunchDaemons/${uniquename}/${uniquename}.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}/Library/LaunchDaemons/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/LaunchDaemons/${uniquename}/${uniquename}.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/plists/${uniquename}.plist
</span> }
}
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/dovecot/files/patch-src-lib-ioloop-notify-kqueue-c.diff b/mail/dovecot/files/patch-src-lib-ioloop-notify-kqueue-c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ff00735b926..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/dovecot/files/patch-src-lib-ioloop-notify-kqueue-c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/lib/ioloop-notify-kqueue.c 2020-09-18 19:56:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/lib/ioloop-notify-kqueue.c 2020-09-18 20:54:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ioloop-private.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llist.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "time-util.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span></pre><pre style='margin:0'>
</pre>