Date: Wed, 6 Jun 2018 19:23:00 +0000 (UTC) From: Larry Rosenman <ler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471880 - in head/mail/dovecot: . files Message-ID: <201806061923.w56JN0VI090634@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ler Date: Wed Jun 6 19:23:00 2018 New Revision: 471880 URL: https://svnweb.freebsd.org/changeset/ports/471880 Log: mail/dovecot: fix "2.3.1 Replication is throwing scary errors" make makepatch for cleanliness Submitted by: remko Reported by: remko Obtained from: upstream Added: head/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c (contents, props changed) Modified: head/mail/dovecot/Makefile head/mail/dovecot/files/patch-UPSTREAM-opensmtpd head/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh Modified: head/mail/dovecot/Makefile ============================================================================== --- head/mail/dovecot/Makefile Wed Jun 6 19:03:41 2018 (r471879) +++ head/mail/dovecot/Makefile Wed Jun 6 19:23:00 2018 (r471880) @@ -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/ Modified: head/mail/dovecot/files/patch-UPSTREAM-opensmtpd ============================================================================== --- head/mail/dovecot/files/patch-UPSTREAM-opensmtpd Wed Jun 6 19:03:41 2018 (r471879) +++ head/mail/dovecot/files/patch-UPSTREAM-opensmtpd Wed Jun 6 19:23:00 2018 (r471880) @@ -7,16 +7,9 @@ Subject: [PATCH] lib-mail: message-address: Fix assert 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(); Added: head/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c Wed Jun 6 19:23:00 2018 (r471880) @@ -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); Modified: head/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh ============================================================================== --- head/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh Wed Jun 6 19:03:41 2018 (r471879) +++ head/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh Wed Jun 6 19:23:00 2018 (r471880) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806061923.w56JN0VI090634>