mail/dovecot: fix "2.3.1 Replication is throwing scary errors"

make makepatch for cleanliness
Submitted by:	remko
Reported by:	remko
Obtained from:	upstream

4 files changed, 36 insertions, 17 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 8389b053e55b..2a9a5e428728 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.3/
 
diff --git a/mail/dovecot/files/patch-UPSTREAM-opensmtpd b/mail/dovecot/files/patch-UPSTREAM-opensmtpd
index 13b41e844c52..8f59e867ac2d 100644
--- a/mail/dovecot/files/patch-UPSTREAM-opensmtpd
+++ b/mail/dovecot/files/patch-UPSTREAM-opensmtpd
@@ -7,16 +7,9 @@ Subject: [PATCH] lib-mail: message-address: Fix assert panic occurring in
 Panic was:
 
 Panic: file message-address.c: line 147 (parse_angle_addr): assertion failed: (*ctx->parser.data == '<')
----
- src/lib-mail/message-address.c      |  2 ++
- src/lib-mail/test-message-address.c | 28 ++++++++++++++++++++++++++++
- 2 files changed, 30 insertions(+)
-
-diff --git a/src/lib-mail/message-address.c b/src/lib-mail/message-address.c
-index 172a707d49..f7cc27f48e 100644
---- src/lib-mail/message-address.c
+--- src/lib-mail/message-address.c.orig	2018-03-20 10:15:40 UTC
 +++ src/lib-mail/message-address.c
-@@ -424,6 +424,8 @@ message_address_parse_path_real(pool_t pool, const unsigned char *data,
+@@ -424,6 +424,8 @@ message_address_parse_path_real(pool_t pool, const uns
  
  	if (rfc822_skip_lwsp(&ctx.parser) <= 0)
  		return -1;
@@ -25,9 +18,11 @@ index 172a707d49..f7cc27f48e 100644
  	if ((ret=parse_angle_addr(&ctx)) < 0 ||
  		(ctx.addr.mailbox != NULL && ctx.addr.domain == NULL)) {
  		ctx.addr.invalid_syntax = TRUE;
-diff --git a/src/lib-mail/test-message-address.c b/src/lib-mail/test-message-address.c
-index c1b5566d91..21084deec9 100644
---- src/lib-mail/test-message-address.c
+ src/lib-mail/message-address.c      |  2 ++
+ src/lib-mail/test-message-address.c | 28 ++++++++++++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+
+--- src/lib-mail/test-message-address.c.orig	2018-03-20 10:15:40 UTC
 +++ src/lib-mail/test-message-address.c
 @@ -395,11 +395,39 @@ static void test_message_address_path(void)
  	test_end();
diff --git a/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c b/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c
new file mode 100644
index 000000000000..f95c96a181b1
--- /dev/null
+++ b/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c
@@ -0,0 +1,12 @@
+--- src/doveadm/client-connection-tcp.c.orig	2018-03-20 10:15:40 UTC
++++ src/doveadm/client-connection-tcp.c
+@@ -334,6 +334,9 @@ static int doveadm_cmd_handle(struct client_connection
+ 	   running one and we can't call the original one recursively, so
+ 	   create a new ioloop. */
+ 	conn->ioloop = io_loop_create();
++	o_stream_switch_ioloop(conn->output);
++	if (conn->log_out != NULL)
++		o_stream_switch_ioloop(conn->log_out);
+ 
+ 	if (cmd_ver2 != NULL)
+ 		doveadm_cmd_server_run_ver2(conn, argc, argv, cctx);
diff --git a/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh b/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh
index 036303ba8079..118496f53073 100644
--- a/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh
+++ b/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh
@@ -1,9 +1,9 @@
 /usr gets changed to ${LOCALBASE} in post-patch:, so we
 cheat and set xpdf's path to /usr/lib.
 
---- src/plugins/fts/decode2text.sh.orig	2015-12-12 16:32:01 UTC
+--- src/plugins/fts/decode2text.sh.orig	2017-10-28 12:21:20 UTC
 +++ src/plugins/fts/decode2text.sh
-@@ -79,7 +79,11 @@ wait_timeout() {
+@@ -79,16 +79,20 @@ wait_timeout() {
  LANG=en_US.UTF-8
  export LANG
  if [ $fmt = "pdf" ]; then
@@ -11,8 +11,20 @@ cheat and set xpdf's path to /usr/lib.
 +  if [ -x /usr/lib/xpdf/pdftotext ]; then
 +    /usr/lib/xpdf/pdftotext $path - 2>/dev/null&
 +  else
-+    /usr/bin/pdftotext $path - 2>/dev/null&
++    /usr/local/bin/pdftotext $path - 2>/dev/null&
 +  fi
    wait_timeout 2>/dev/null
  elif [ $fmt = "doc" ]; then
-   (/usr/bin/catdoc $path; true) 2>/dev/null&
+-  (/usr/bin/catdoc $path; true) 2>/dev/null&
++  (/usr/local/bin/catdoc $path; true) 2>/dev/null&
+   wait_timeout 2>/dev/null
+ elif [ $fmt = "ppt" ]; then
+-  (/usr/bin/catppt $path; true) 2>/dev/null&
++  (/usr/local/bin/catppt $path; true) 2>/dev/null&
+   wait_timeout 2>/dev/null
+ elif [ $fmt = "xls" ]; then
+-  (/usr/bin/xls2csv $path; true) 2>/dev/null&
++  (/usr/local/bin/xls2csv $path; true) 2>/dev/null&
+   wait_timeout 2>/dev/null
+ elif [ $fmt = "odt" -o $fmt = "ods" -o $fmt = "odp" ]; then
+   xmlunzip "content.xml"