On 09/11/2018 11:15 AM, Stuart Henderson wrote:
On 2018/09/11 07:57, Renaud Allard wrote:
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?
Personally (having loosely been following the dovecot mailing list)
2.3.x doesn't fill me with confidence yet and I'd be happier to hold off
on updating the Dovecot-related ports until OpenBSD 6.4 is done.
Yes, it might be better to wait for the 6.4 freeze before committing
that one. I am running it in small prod in the meantime to test the
behavior.
: @@ -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
There's no need to change this @conflict
: @@ -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
Here you miss @sample'ing the new config file
I have corrected those 2 in the new patch.
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 - 1.268
+++ mail/dovecot/Makefile 11 Sep 2018 09:21:47 -
@@ -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
-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-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 - 1.67
+++ mail/dovecot/pkg/PLIST-server 11 Sep 2018 09:21:47 -
@@ -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/d
