aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorler <ler@FreeBSD.org>2019-01-03 06:30:55 +0800
committerler <ler@FreeBSD.org>2019-01-03 06:30:55 +0800
commit8e5a5d4188af84113db4d7e90b2f9fadb434de88 (patch)
treea80d513ada76dd3bff708369265240a4a877bc66 /mail
parentd0a46236198c7030496de2f205059cbbcac43a6c (diff)
downloadfreebsd-ports-gnome-8e5a5d4188af84113db4d7e90b2f9fadb434de88.tar.gz
freebsd-ports-gnome-8e5a5d4188af84113db4d7e90b2f9fadb434de88.tar.zst
freebsd-ports-gnome-8e5a5d4188af84113db4d7e90b2f9fadb434de88.zip
mail/dovecot: Pick up a mailinglist patch for solr/tika separation.
solr and tika currently use the same http client connection. Upstream made the attached patches in response to my (ler@) bug report. Obtained from: upstream mailing list.
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot/Makefile2
-rw-r--r--mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c11
-rw-r--r--mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c11
3 files changed, 23 insertions, 1 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index b466d14b6d35..e46fa24bfefc 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dovecot
PORTVERSION= 2.3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail ipv6
MASTER_SITES= https://www.dovecot.org/releases/2.3/
diff --git a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c b/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c
new file mode 100644
index 000000000000..596e1cb6a6ea
--- /dev/null
+++ b/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c
@@ -0,0 +1,11 @@
+--- src/plugins/fts-solr/solr-connection.c.orig 2019-01-02 22:12:57 UTC
++++ src/plugins/fts-solr/solr-connection.c
+@@ -156,7 +156,7 @@ int solr_connection_init(const char *url,
+ http_set.request_timeout_msecs = 60*1000;
+ http_set.ssl = ssl_client_set;
+ http_set.debug = debug;
+- solr_http_client = http_client_init(&http_set);
++ solr_http_client = http_client_init_private(&http_set);
+ }
+
+ conn->xml_parser = XML_ParserCreate("UTF-8");
diff --git a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c b/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c
new file mode 100644
index 000000000000..2be6cae9aa32
--- /dev/null
+++ b/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c
@@ -0,0 +1,11 @@
+--- src/plugins/fts/fts-parser-tika.c.orig 2019-01-02 22:11:26 UTC
++++ src/plugins/fts/fts-parser-tika.c
+@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struc
+ http_set.request_timeout_msecs = 60*1000;
+ http_set.ssl = &ssl_set;
+ http_set.debug = user->mail_debug;
+- tika_http_client = http_client_init(&http_set);
++ tika_http_client = http_client_init_private(&http_set);
+ }
+ *http_url_r = tuser->http_url;
+ return 0;