Hello,
As you may have heard dovecot 2.2 is now EOL
(https://www.mail-archive.com/dovecot-news@dovecot.org/msg00341.html),
which means that if you run into trouble, you will have to replicate it
on 2.3.
Here are some patches for dovecot and dovecot-pigeonhole to upgrade them
to 2.3.2.
Could you check?
Index: mail/dovecot/Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.268
diff -u -p -r1.268 Makefile
--- mail/dovecot/Makefile 4 Sep 2018 12:46:15 -0000 1.268
+++ mail/dovecot/Makefile 11 Sep 2018 05:50:14 -0000
@@ -5,8 +5,8 @@ COMMENT-ldap= LDAP authentication / dict
COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
-V_MAJOR= 2.2
-V_DOVECOT= 2.2.36
+V_MAJOR= 2.3
+V_DOVECOT= 2.3.2
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
@@ -36,7 +36,7 @@ MAINTAINER= Brad Smith <b...@comstyle.co
# LGPLv2.1 and MIT
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB-server= bz2 c crypto expat iconv lz4 lzma m pthread sqlite3 ssl z
+WANTLIB-server= bz2 c crypto expat iconv lz4 lzma m pthread sqlite3 ssl z sodium
WANTLIB-ldap= crypto iconv lber ldap sasl2 ssl lib/dovecot/dovecot
WANTLIB-mysql= crypto m lib/mysql/mysqlclient pthread ssl z
WANTLIB-postgresql= pq
@@ -45,7 +45,8 @@ LIB_DEPENDS+= archivers/bzip2 \
archivers/lz4 \
archivers/xz \
converters/libiconv \
- databases/sqlite3
+ databases/sqlite3 \
+ security/libsodium
LIB_DEPENDS-ldap= ${BASE_PKGPATH} \
databases/openldap
LIB_DEPENDS-mysql= databases/mariadb
Index: mail/dovecot/distinfo
===================================================================
RCS file: /cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.137
diff -u -p -r1.137 distinfo
--- mail/dovecot/distinfo 29 May 2018 14:25:11 -0000 1.137
+++ mail/dovecot/distinfo 11 Sep 2018 05:50:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.2.36.tar.gz) = 6auom7GsHpWBuE5KelD1MUJTlhTq98xMgAB+vqSYi+U=
-SIZE (dovecot-2.2.36.tar.gz) = 6239707
+SHA256 (dovecot-2.3.2.tar.gz) = bkjw+mB2hCfwMDWwo+k9GuKblyuyvZypmMzGoPba45M=
+SIZE (dovecot-2.3.2.tar.gz) = 6796744
Index: mail/dovecot/patches/patch-src_auth_password-scheme-crypt_c
===================================================================
RCS file: /cvs/ports/mail/dovecot/patches/patch-src_auth_password-scheme-crypt_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_auth_password-scheme-crypt_c
--- mail/dovecot/patches/patch-src_auth_password-scheme-crypt_c 1 Nov 2016 14:12:04 -0000 1.4
+++ mail/dovecot/patches/patch-src_auth_password-scheme-crypt_c 11 Sep 2018 05:50:14 -0000
@@ -31,30 +31,31 @@ will work with whichever password format
--- src/auth/password-scheme-crypt.c.orig Fri Jan 8 01:04:13 2016
+++ src/auth/password-scheme-crypt.c Fri Jan 8 01:23:35 2016
-@@ -111,7 +111,12 @@ static const struct {
+@@ -149,7 +149,12 @@
const char *salt;
const char *expected;
} sample[] = {
+#ifdef __OpenBSD__
-+ { "08/15!test~4711", "$2a$04$0123456789abcdefABCDEF",
-+ "$2a$04$0123456789abcdefABCDE.N.drYX5yIAL1LkTaaZotW3yI0hQhZru" },
++ { "08/15!test~4711", "$2a$04$0123456789abcdefABCDEF",
++ "$2a$04$0123456789abcdefABCDE.N.drYX5yIAL1LkTaaZotW3yI0hQhZru" },
+#else
{ "08/15!test~4711", "JB", "JBOZ0DgmtucwE" },
+#endif
- { "08/15!test~4711", "$2a$04$0123456789abcdefABCDEF",
- "$2a$04$0123456789abcdefABCDE.N.drYX5yIAL1LkTaaZotW3yI0hQhZru" },
{ "08/15!test~4711", "$5$rounds=1000$0123456789abcdef",
-@@ -124,8 +129,13 @@ static const struct {
+ "$5$rounds=1000$0123456789abcdef$K/DksR0DT01hGc8g/kt"
+ "9McEgrbFMKi9qrb1jehe7hn4" },
+@@ -160,8 +165,13 @@
/* keep in sync with the sample struct above */
static const struct password_scheme crypt_schemes[] = {
+#ifdef __OpenBSD__
- { "CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
-+ crypt_generate_blowfisch },
+ { "DES-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
+- crypt_generate_des },
++ crypt_generate_blowfish },
+#else
-+ { "CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
- crypt_generate_des },
++ { "DES-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
++ crypt_generate_des },
+#endif
- { "BLF-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
- crypt_generate_blowfisch },
{ "SHA256-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
+ crypt_generate_sha256 },
+ { "SHA512-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
Index: mail/dovecot/patches/patch-src_lib-master_master-service-ssl-settings_c
===================================================================
RCS file: /cvs/ports/mail/dovecot/patches/patch-src_lib-master_master-service-ssl-settings_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_lib-master_master-service-ssl-settings_c
--- mail/dovecot/patches/patch-src_lib-master_master-service-ssl-settings_c 10 Mar 2018 21:54:30 -0000 1.1
+++ mail/dovecot/patches/patch-src_lib-master_master-service-ssl-settings_c 11 Sep 2018 05:50:14 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_lib-master_master-service-ssl-settings_c,v 1.1 2018/03/10 21:54:30 sthen Exp $
-
-Index: src/lib-master/master-service-ssl-settings.c
---- src/lib-master/master-service-ssl-settings.c.orig
-+++ src/lib-master/master-service-ssl-settings.c
-@@ -52,7 +52,7 @@ static const struct master_service_ssl_settings master
- .ssl_alt_key = "",
- .ssl_key_password = "",
- .ssl_cipher_list = "ALL:!LOW:!SSLv2:!EXP:!aNULL",
--#ifdef SSL_TXT_SSLV2
-+#ifdef SSL_TXT_SSLV2 && !defined(LIBRESSL_VERSION_NUMBER)
- .ssl_protocols = "!SSLv2 !SSLv3",
- #else
- .ssl_protocols = "!SSLv3",
Index: mail/dovecot/patches/patch-src_master_master-settings_c
===================================================================
RCS file: /cvs/ports/mail/dovecot/patches/patch-src_master_master-settings_c,v
retrieving revision 1.19
diff -u -p -r1.19 patch-src_master_master-settings_c
--- mail/dovecot/patches/patch-src_master_master-settings_c 5 Nov 2017 19:27:56 -0000 1.19
+++ mail/dovecot/patches/patch-src_master_master-settings_c 11 Sep 2018 05:50:14 -0000
@@ -6,13 +6,15 @@ is rebuilt as part of the Dovecot build.
Index: src/master/master-settings.c
--- src/master/master-settings.c.orig
+++ src/master/master-settings.c
-@@ -208,8 +208,8 @@ static const struct master_settings master_default_set
+@@ -209,9 +209,9 @@
.protocols = "imap pop3 lmtp",
.listen = "*, ::",
.ssl = "yes:no:required",
- .default_internal_user = "dovecot",
+- .default_internal_group = "dovecot",
- .default_login_user = "dovenull",
+ .default_internal_user = "_dovecot",
++ .default_internal_group = "_dovecot",
+ .default_login_user = "_dovenull",
.default_process_limit = 100,
.default_client_limit = 1000,
Index: mail/dovecot/patches/patch-src_plugins_fts-solr_fts-backend-solr_c
===================================================================
RCS file: /cvs/ports/mail/dovecot/patches/patch-src_plugins_fts-solr_fts-backend-solr_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_plugins_fts-solr_fts-backend-solr_c
--- mail/dovecot/patches/patch-src_plugins_fts-solr_fts-backend-solr_c 10 Mar 2018 21:54:30 -0000 1.1
+++ mail/dovecot/patches/patch-src_plugins_fts-solr_fts-backend-solr_c 11 Sep 2018 05:50:14 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-src_plugins_fts-solr_fts-backend-solr_c,v 1.1 2018/03/10 21:54:30 sthen Exp $
-
-From f987ef0632fc7be03e7f26dcd99695a6936c284e Mon Sep 17 00:00:00 2001
-From: Simon Frankenberger <si...@fraho.eu>
-Date: Thu, 9 Nov 2017 07:08:24 +0100
-Subject: [PATCH] fts-solr: Explicitly ask for XML responses
-
-With recent solr versions (7.0+) the default response
-writer changed from XML to JSON. This commit sets the
-"wt" query parameter for all requests, so that the right
-response type is written.
-
-Index: src/plugins/fts-solr/fts-backend-solr.c
---- src/plugins/fts-solr/fts-backend-solr.c.orig
-+++ src/plugins/fts-solr/fts-backend-solr.c
-@@ -217,7 +217,7 @@ get_last_uid_fallback(struct fts_backend *_backend, st
- int ret = 0;
-
- str = t_str_new(256);
-- str_append(str, "fl=uid&rows=1&sort=uid+desc&q=");
-+ str_append(str, "wt=xml&fl=uid&rows=1&sort=uid+desc&q=");
-
- if (fts_mailbox_get_guid(box, &box_guid) < 0)
- return -1;
-@@ -829,7 +829,7 @@ fts_backend_solr_lookup(struct fts_backend *_backend,
- mailbox_get_open_status(box, STATUS_UIDNEXT, &status);
-
- str = t_str_new(256);
-- str_printfa(str, "fl=uid,score&rows=%u&sort=uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
-+ str_printfa(str, "wt=xml&fl=uid,score&rows=%u&sort=uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
- status.uidnext);
- prefix_len = str_len(str);
-
-@@ -939,7 +939,7 @@ fts_backend_solr_lookup_multi(struct fts_backend *back
- string_t *str;
-
- str = t_str_new(256);
-- str_printfa(str, "fl=box,uid,score&rows=%u&sort=box+asc,uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
-+ str_printfa(str, "wt=xml&fl=box,uid,score&rows=%u&sort=box+asc,uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
- SOLR_MAX_MULTI_ROWS);
-
- if (solr_add_definite_query_args(str, args, and_args)) {
Index: mail/dovecot/pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/mail/dovecot/pkg/PLIST-ldap,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-ldap
--- mail/dovecot/pkg/PLIST-ldap 12 Nov 2016 15:37:32 -0000 1.3
+++ mail/dovecot/pkg/PLIST-ldap 11 Sep 2018 05:50:14 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-ldap,v 1.3 2016/11/12 15:37:32 sthen Exp $
-@conflict dovecot-<=2.2.26.0p0
+@conflict dovecot-<=2.3.2.0p0
include/dovecot/ldap-client.h
lib/dovecot/auth/libauthdb_ldap.so
lib/dovecot/dict/libdict_ldap.so
Index: mail/dovecot/pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/mail/dovecot/pkg/PLIST-server,v
retrieving revision 1.67
diff -u -p -r1.67 PLIST-server
--- mail/dovecot/pkg/PLIST-server 4 Sep 2018 12:46:15 -0000 1.67
+++ mail/dovecot/pkg/PLIST-server 11 Sep 2018 05:50:14 -0000
@@ -19,11 +19,12 @@
@newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
@newuser _dovenull:666:_dovenull:daemon:Dovecot Login User:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/dovecot/*
+@sample ${SYSCONFDIR}/dovecot/
+@rcscript ${RCDIR}/dovecot
@bin bin/doveadm
@bin bin/doveconf
bin/dsync
include/dovecot/
-include/dovecot/abspath.h
include/dovecot/access-lookup.h
include/dovecot/acl-api-private.h
include/dovecot/acl-api.h
@@ -65,6 +66,7 @@ include/dovecot/backtrace-string.h
include/dovecot/base32.h
include/dovecot/base64.h
include/dovecot/bits.h
+include/dovecot/bloomfilter.h
include/dovecot/bsearch-insert-pos.h
include/dovecot/buffer.h
include/dovecot/byteorder.h
@@ -100,8 +102,6 @@ include/dovecot/dcrypt-private.h
include/dovecot/dcrypt.h
include/dovecot/dict-client.h
include/dovecot/dict-private.h
-include/dovecot/dict-sql-settings.h
-include/dovecot/dict-sql.h
include/dovecot/dict-transaction-memory.h
include/dovecot/dict.h
include/dovecot/dns-lookup.h
@@ -122,14 +122,14 @@ include/dovecot/dsasl-client-private.h
include/dovecot/dsasl-client.h
include/dovecot/dsync-brain.h
include/dovecot/dsync-ibc.h
-include/dovecot/duplicate.h
include/dovecot/eacces-error.h
include/dovecot/env-util.h
+include/dovecot/event-filter.h
+include/dovecot/event-log.h
include/dovecot/execv-const.h
include/dovecot/fail-mail-storage.h
include/dovecot/failures.h
-include/dovecot/fd-close-on-exec.h
-include/dovecot/fd-set-nonblock.h
+include/dovecot/fd-util.h
include/dovecot/fdatasync-path.h
include/dovecot/fdpass.h
include/dovecot/file-cache.h
@@ -178,6 +178,7 @@ include/dovecot/hostpid.h
include/dovecot/http-auth.h
include/dovecot/http-client-private.h
include/dovecot/http-client.h
+include/dovecot/http-common.h
include/dovecot/http-date.h
include/dovecot/http-header-parser.h
include/dovecot/http-header.h
@@ -264,6 +265,8 @@ include/dovecot/ioloop.h
include/dovecot/iostream-lz4.h
include/dovecot/iostream-openssl.h
include/dovecot/iostream-private.h
+include/dovecot/iostream-proxy.h
+include/dovecot/iostream-pump.h
include/dovecot/iostream-rawlog-private.h
include/dovecot/iostream-rawlog.h
include/dovecot/iostream-ssl-private.h
@@ -310,10 +313,11 @@ include/dovecot/istream.h
include/dovecot/json-parser.h
include/dovecot/json-tree.h
include/dovecot/lda-settings.h
+include/dovecot/lib-event-private.h
+include/dovecot/lib-event.h
include/dovecot/lib-signals.h
include/dovecot/lib.h
include/dovecot/llist.h
-include/dovecot/lmtp-client.h
include/dovecot/log-throttle.h
include/dovecot/login-common.h
include/dovecot/login-proxy-state.h
@@ -325,6 +329,7 @@ include/dovecot/mail-cache-private.h
include/dovecot/mail-cache.h
include/dovecot/mail-copy.h
include/dovecot/mail-deliver.h
+include/dovecot/mail-duplicate.h
include/dovecot/mail-error.h
include/dovecot/mail-html2text.h
include/dovecot/mail-index-alloc-cache.h
@@ -419,6 +424,7 @@ include/dovecot/mdbox-sync.h
include/dovecot/mech-otp-skey-common.h
include/dovecot/mech-plain-common.h
include/dovecot/mech.h
+include/dovecot/memarea.h
include/dovecot/mempool.h
include/dovecot/message-address.h
include/dovecot/message-binary-part.h
@@ -440,8 +446,8 @@ include/dovecot/mkdir-parents.h
include/dovecot/mmap-util.h
include/dovecot/module-context.h
include/dovecot/module-dir.h
-include/dovecot/mountpoint-list.h
include/dovecot/mountpoint.h
+include/dovecot/murmurhash3.h
include/dovecot/mycrypt.h
include/dovecot/net.h
include/dovecot/nfs-workarounds.h
@@ -452,7 +458,6 @@ include/dovecot/oauth2.h
include/dovecot/ostream-cmp.h
include/dovecot/ostream-dot.h
include/dovecot/ostream-encrypt.h
-include/dovecot/ostream-escaped.h
include/dovecot/ostream-failure-at.h
include/dovecot/ostream-file-private.h
include/dovecot/ostream-hash.h
@@ -469,6 +474,7 @@ include/dovecot/passdb-cache.h
include/dovecot/passdb-template.h
include/dovecot/passdb.h
include/dovecot/password-scheme.h
+include/dovecot/path-util.h
include/dovecot/pkcs5.h
include/dovecot/pop3-capability.h
include/dovecot/pop3-client.h
@@ -511,7 +517,6 @@ include/dovecot/quota-plugin.h
include/dovecot/quota-private.h
include/dovecot/quota.h
include/dovecot/quoted-printable.h
-include/dovecot/rand.h
include/dovecot/randgen.h
include/dovecot/raw-storage.h
include/dovecot/raw-sync.h
@@ -537,13 +542,31 @@ include/dovecot/sha1.h
include/dovecot/sha2.h
include/dovecot/sha3.h
include/dovecot/shared-storage.h
+include/dovecot/smtp-address.h
+include/dovecot/smtp-client-command.h
+include/dovecot/smtp-client-connection.h
+include/dovecot/smtp-client-private.h
+include/dovecot/smtp-client-transaction.h
include/dovecot/smtp-client.h
+include/dovecot/smtp-command-parser.h
+include/dovecot/smtp-command.h
+include/dovecot/smtp-common.h
+include/dovecot/smtp-params.h
+include/dovecot/smtp-parser.h
+include/dovecot/smtp-reply-parser.h
+include/dovecot/smtp-reply.h
+include/dovecot/smtp-server-private.h
+include/dovecot/smtp-server.h
+include/dovecot/smtp-submit-settings.h
+include/dovecot/smtp-submit.h
+include/dovecot/smtp-syntax.h
include/dovecot/sort.h
include/dovecot/sql-api-private.h
include/dovecot/sql-api.h
include/dovecot/sql-db-cache.h
-include/dovecot/ssl-proxy.h
+include/dovecot/stats-client.h
include/dovecot/stats-connection.h
+include/dovecot/stats-dist.h
include/dovecot/stats-parser.h
include/dovecot/stats.h
include/dovecot/str-find.h
@@ -557,7 +580,6 @@ include/dovecot/subscription-file.h
include/dovecot/syslog-util.h
include/dovecot/test-common.h
include/dovecot/time-util.h
-include/dovecot/timing.h
include/dovecot/unichar.h
include/dovecot/unix-socket-create.h
include/dovecot/unlink-directory.h
@@ -617,8 +639,8 @@ lib/dovecot/lib20_zlib_plugin.so
lib/dovecot/lib21_fts_solr_plugin.so
lib/dovecot/lib21_fts_squat_plugin.so
lib/dovecot/lib30_imap_zlib_plugin.so
-lib/dovecot/lib90_stats_plugin.so
-lib/dovecot/lib95_imap_stats_plugin.so
+lib/dovecot/lib90_old_stats_plugin.so
+lib/dovecot/lib95_imap_old_stats_plugin.so
lib/dovecot/lib99_welcome_plugin.so
lib/dovecot/libdcrypt_openssl.so
@lib lib/dovecot/libdovecot-compression.so.${LIBdovecot-compression_VERSION}
@@ -634,9 +656,9 @@ lib/dovecot/libfs_compress.so
lib/dovecot/libfs_crypt.so
lib/dovecot/libfs_mail_crypt.so
lib/dovecot/libssl_iostream_openssl.so
-lib/dovecot/stats/
-lib/dovecot/stats/libstats_auth.so
-lib/dovecot/stats/libstats_mail.so
+lib/dovecot/old-stats/
+lib/dovecot/old-stats/libold_stats_mail.so
+lib/dovecot/old-stats/libstats_auth.so
libexec/dovecot/
@bin libexec/dovecot/aggregator
@bin libexec/dovecot/anvil
@@ -663,6 +685,7 @@ libexec/dovecot/deliver
@bin libexec/dovecot/lmtp
@bin libexec/dovecot/log
@bin libexec/dovecot/maildirlock
+@bin libexec/dovecot/old-stats
@bin libexec/dovecot/pop3
@bin libexec/dovecot/pop3-login
@bin libexec/dovecot/quota-status
@@ -670,8 +693,9 @@ libexec/dovecot/deliver
@bin libexec/dovecot/replicator
@bin libexec/dovecot/script
@bin libexec/dovecot/script-login
-@bin libexec/dovecot/ssl-params
@bin libexec/dovecot/stats
+@bin libexec/dovecot/submission
+@bin libexec/dovecot/submission-login
@bin libexec/dovecot/xml2text
@comment @man man/man1/deliver.1
@man man/man1/doveadm-acl.1
@@ -699,7 +723,6 @@ libexec/dovecot/deliver
@man man/man1/doveadm-log.1
@man man/man1/doveadm-mailbox-cryptokey.1
@man man/man1/doveadm-mailbox.1
-@man man/man1/doveadm-mount.1
@man man/man1/doveadm-move.1
@man man/man1/doveadm-penalty.1
@man man/man1/doveadm-proxy.1
@@ -709,6 +732,7 @@ libexec/dovecot/deliver
@man man/man1/doveadm-rebuild.1
@man man/man1/doveadm-reload.1
@man man/man1/doveadm-replicator.1
+@man man/man1/doveadm-save.1
@man man/man1/doveadm-search.1
@man man/man1/doveadm-stats.1
@man man/man1/doveadm-stop.1
@@ -907,9 +931,11 @@ share/doc/dovecot/wiki/Pigeonhole.Sieve.
share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Include.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.SpamtestVirustest.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Vacation.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Variables.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Extdata.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Extprograms.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.IMAPFilterSieve.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.IMAPSieve.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Pipe.txt
share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.txt
@@ -1021,7 +1047,6 @@ share/examples/dovecot/
share/examples/dovecot/dovecot-openssl.cnf
@sample /etc/ssl/dovecot-openssl.cnf
share/examples/dovecot/example-config/
-@sample ${SYSCONFDIR}/dovecot/
share/examples/dovecot/example-config/conf.d/
@sample ${SYSCONFDIR}/dovecot/conf.d/
share/examples/dovecot/example-config/conf.d/10-auth.conf
@@ -1046,6 +1071,7 @@ share/examples/dovecot/example-config/co
@sample ${SYSCONFDIR}/dovecot/conf.d/20-lmtp.conf
share/examples/dovecot/example-config/conf.d/20-pop3.conf
@sample ${SYSCONFDIR}/dovecot/conf.d/20-pop3.conf
+share/examples/dovecot/example-config/conf.d/20-submission.conf
share/examples/dovecot/example-config/conf.d/90-acl.conf
@sample ${SYSCONFDIR}/dovecot/conf.d/90-acl.conf
share/examples/dovecot/example-config/conf.d/90-plugin.conf
@@ -1087,8 +1113,7 @@ share/examples/dovecot/example-config/do
@mode 750
@group _dovenull
@sample /var/dovecot/login/
-@extra /etc/ssl/dovecotcert.pem
-@extra /etc/ssl/private/dovecot.pem
@mode
@group
-@rcscript ${RCDIR}/dovecot
+@extra /etc/ssl/dovecotcert.pem
+@extra /etc/ssl/private/dovecot.pem
Index: mail/dovecot-pigeonhole/Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot-pigeonhole/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- mail/dovecot-pigeonhole/Makefile 29 May 2018 14:25:29 -0000 1.59
+++ mail/dovecot-pigeonhole/Makefile 10 Sep 2018 13:50:41 -0000
@@ -2,8 +2,8 @@
COMMENT= Sieve mail filtering for Dovecot
-V_SIEVE= 0.4.24
-V_DOVECOT= 2.2
+V_SIEVE= 0.5.2
+V_DOVECOT= 2.3
DISTNAME= dovecot-${V_DOVECOT}-pigeonhole-${V_SIEVE}
PKGNAME= dovecot-pigeonhole-${V_SIEVE}
@@ -25,7 +25,7 @@ WANTLIB= lib/dovecot/dovecot lib/dovecot
c crypto iconv ssl
LIB_DEPENDS= converters/libiconv \
- mail/dovecot>=2.2.26
+ mail/dovecot>=2.3.2
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --docdir=${PREFIX}/share/doc
Index: mail/dovecot-pigeonhole/distinfo
===================================================================
RCS file: /cvs/ports/mail/dovecot-pigeonhole/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- mail/dovecot-pigeonhole/distinfo 29 May 2018 14:25:29 -0000 1.30
+++ mail/dovecot-pigeonhole/distinfo 10 Sep 2018 13:50:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.2-pigeonhole-0.4.24.tar.gz) = g2JTq5vp4N1Qn0u5GRwpezWWQWVjoT3Fy4XzMxIGAPY=
-SIZE (dovecot-2.2-pigeonhole-0.4.24.tar.gz) = 1808131
+SHA256 (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = lQ6OFcWOU5dhJV4UDdNnjdJHf6QypfK4BOU4Ib3AJTU=
+SIZE (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = 1814618
Index: mail/dovecot-pigeonhole/patches/patch-src_managesieve-login_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/dovecot-pigeonhole/patches/patch-src_managesieve-login_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_managesieve-login_Makefile_in
--- mail/dovecot-pigeonhole/patches/patch-src_managesieve-login_Makefile_in 13 Oct 2017 10:09:01 -0000 1.12
+++ mail/dovecot-pigeonhole/patches/patch-src_managesieve-login_Makefile_in 10 Sep 2018 13:50:41 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-src_managesieve-login_Makefile_in,v 1.12 2017/10/13 10:09:01 sthen Exp $
--- src/managesieve-login/Makefile.in.orig Thu Oct 12 16:05:54 2017
+++ src/managesieve-login/Makefile.in Thu Oct 12 19:43:21 2017
-@@ -419,7 +419,7 @@ libmanagesieve_login_settings_la_CFLAGS = \
- libs = \
- $(top_builddir)/src/lib-managesieve/libmanagesieve.a
+@@ -427,7 +427,7 @@
+ managesieve_login_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
+ managesieve_login_LDFLAGS = $(BINARY_LDFLAGS)
-managesieve_login_LDADD = $(libs) $(LIBDOVECOT_LOGIN) $(LIBDOVECOT)
+managesieve_login_LDADD = $(libs) $(LIBDOVECOT_LOGIN) $(LIBDOVECOT) -Wl,-rpath,$(dovecot_pkglibdir)
managesieve_login_DEPENDENCIES = $(libs) $(LIBDOVECOT_LOGIN_DEPS) $(LIBDOVECOT_DEPS)
Index: mail/dovecot-pigeonhole/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/dovecot-pigeonhole/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- mail/dovecot-pigeonhole/pkg/PLIST 29 May 2018 14:25:29 -0000 1.15
+++ mail/dovecot-pigeonhole/pkg/PLIST 10 Sep 2018 13:50:41 -0000
@@ -16,7 +16,6 @@ include/dovecot/sieve/edit-mail.h
include/dovecot/sieve/mail-raw.h
include/dovecot/sieve/pigeonhole-config.h
include/dovecot/sieve/pigeonhole-version.h
-include/dovecot/sieve/realpath.h
include/dovecot/sieve/rfc2822.h
include/dovecot/sieve/sieve-actions.h
include/dovecot/sieve/sieve-address-parts.h
@@ -65,7 +64,6 @@ include/dovecot/sieve/sieve-stringlist.h
include/dovecot/sieve/sieve-types.h
include/dovecot/sieve/sieve-validator.h
include/dovecot/sieve/sieve.h
-include/dovecot/sieve/strtrim.h
lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.so
lib/dovecot/lib90_sieve_plugin.so
lib/dovecot/lib95_imap_filter_sieve_plugin.so
