On 2021-02-07 7:32 pm, John Fawcett wrote: 

> On 07/02/2021 20:15, @lbutlr wrote:
> On 07 Feb 2021, at 02:07, @lbutlr <krem...@kreme.com> wrote: On 06 Feb 2021, 
> at 11:06, John Fawcett <j...@voipsupport.it> wrote: 19.08.20 Is that a 
> malformed ISO date 2019-08-20 or a truncated europeans style 19-08-2020?
 Either way, I cannot find the message in my dovecot folder. Closest I
can find is Message-ID:
<20200820141341.ga1...@meili.valhalla.31bits.net> from the 2020-08-20 at
16:13:52 but there is no patch in that mail. 

here's the post in the list archives

https://dovecot.org/pipermail/dovecot/2020-August/119703.html [1]

Thanks so much for the help - I've verified the patch and it works
nicely. Here's a simple script for 20.04 - it's very manual, you have to
choose the version to download. 

It's just two lines of patch - is there any chance this will be fixed in
the next point release ? 

Links:
------
[1] https://dovecot.org/pipermail/dovecot/2020-August/119703.html
#/bin/bash

## dovecot solr fts has a big that causes tika to fault when indexing.
# https://dovecot.org/pipermail/dovecot/2020-August/119703.html

# Browse https://repo.dovecot.org/ce-2.3-latest/ to find correct package to pull down
#  eg    https://repo.dovecot.org/ce-2.3-latest/ubuntu/focal/pool/main/2.3.13-2_ce/

sudo apt install -y --no-install-recommends devscripts build-essential
mkdir dovecot
cd dovecot

# Fetch patch
# https://dovecot.org/pipermail/dovecot/2020-August/119703.html

cat > fts-solr-tika.patch << 'EOF'
diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c
index ae720b5e2870a852c1b6c440939e3c7c0fa72b5c..9d364f93e2cd1b716b9ab61bd39656a6c5b1ea04 100644
--- a/src/plugins/fts-solr/solr-connection.c
+++ b/src/plugins/fts-solr/solr-connection.c
@@ -103,7 +103,7 @@ int solr_connection_init(const struct fts_solr_settings *solr_set,
 		http_set.ssl = ssl_client_set;
 		http_set.debug = solr_set->debug;
 		http_set.rawlog_dir = solr_set->rawlog_dir;
-		solr_http_client = http_client_init(&http_set);
+		solr_http_client = http_client_init_private(&http_set);
 	}

 	*conn_r = conn;
diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c
index a4b8b5c3034f57e22e77caa759c090da6b62f8ba..b8b57a350b9a710d101ac7ccbcc14560d415d905 100644
--- a/src/plugins/fts/fts-parser-tika.c
+++ b/src/plugins/fts/fts-parser-tika.c
@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struct http_url **http_url_r)
 		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;
EOF

# Download dovecot
dget -u https://repo.dovecot.org/ce-2.3-latest/ubuntu/focal/pool/main/2.3.13-2_ce/dovecot-Ubuntu_20.04.dsc

# Get build dependencies
sudo apt install -y --no-install-recommends pkg-config libpam0g-dev libldap2-dev libpq-dev libmysqlclient-dev libsqlite3-dev libsasl2-dev krb5-multidev libbz2-dev libdb-dev libcurl4-gnutls-dev libexpat-dev libwrap0-dev dh-systemd libclucene-dev liblzma-dev liblz4-dev libexttextcat-dev libstemmer-dev dh-exec liblua5.2-dev libsodium-dev libzstd-dev

# Patch dovecot and build
cd dovecot-2.3.13
patch -p1 < ../fts-solr-tika.patch
dpkg-buildpackage -rfakeroot -b -uc -us

# Install new dovecot-solr package

cd ..
# sudo dpkg -i dovecot-solr_2.3.13-2+ubuntu20.04_amd64.deb
# sudo systemctl restart dovecot

# Test indexing

# sudo doveadm -D index -u j...@example.com INBOX

exit

Reply via email to