Diff below updates dovecot-fts-xapian to 1.3.
Author likes to drop the .0 on a new minor version; does the port system
care about that, or should I add the third digit back in to PKGNAME?
Changes:
- There is a new dependency on sqlite3; this is used to speed up
expunges
- Author has clarified some details around the vsz_limit parameter.
Looking at dovecot docs, increasing default_vsz_limit doesn't seem
necessary, so README changed to reflect this.
- A small patch added in to fix up a couple of compiler warnings with
printf formats. One minor (using %d for a long), one more serious
(trying to treat a C++ class as a plain-text c-string). These have
been fed back to author today so hopefully can be removed next
release.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot-fts-xapian/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- Makefile 15 Feb 2020 15:38:26 -0000 1.3
+++ Makefile 12 Apr 2020 05:22:12 -0000
@@ -2,15 +2,13 @@
COMMENT= full text search plugin for Dovecot using Xapian
-V= 1.2.9
+V= 1.3
GH_ACCOUNT= grosjo
GH_PROJECT= fts-xapian
GH_TAGNAME= ${V}
PKGNAME= dovecot-fts-xapian-${V}
-# remove DISTNAME at next update; upstream rerolled the distfile
-DISTNAME= fts-xapian-${V}-1
REVISION= 0
CATEGORIES= mail
@@ -22,8 +20,8 @@ MAINTAINER= Tom Wong-Cornall <tom@wongc
# LGPLv2.1
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} icudata icui18n icuio icuuc m uuid
-WANTLIB += xapian z
+WANTLIB += ${COMPILER_LIBCXX} icudata icui18n icuio icuuc m sqlite3
+WANTLIB += uuid xapian z
COMPILER= base-clang ports-gcc
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/dovecot-fts-xapian/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo 15 Feb 2020 15:38:26 -0000 1.3
+++ distinfo 12 Apr 2020 05:22:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (fts-xapian-1.2.9-1.tar.gz) =
aiOyGs0V31JMA9mlN2BqHkIuZ0gXVl7fD6gL0govYog=
-SIZE (fts-xapian-1.2.9-1.tar.gz) = 26510
+SHA256 (fts-xapian-1.3.tar.gz) = u3S3ri1mFsRmdA6XytiDdtf/jUsMTGTi4N4suocbPE0=
+SIZE (fts-xapian-1.3.tar.gz) = 27628
Index: patches/patch-src_fts-backend-xapian-functions_cpp
===================================================================
RCS file: patches/patch-src_fts-backend-xapian-functions_cpp
diff -N patches/patch-src_fts-backend-xapian-functions_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_fts-backend-xapian-functions_cpp 12 Apr 2020 05:22:12
-0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: src/fts-backend-xapian-functions.cpp
+--- src/fts-backend-xapian-functions.cpp.orig
++++ src/fts-backend-xapian-functions.cpp
+@@ -583,7 +583,7 @@ static void fts_backend_xapian_expunge(struct xapian_f
+ d = xfe.did[i];
+ u = xfe.uid[i];
+
+- if(verbose>0) i_info("FTS Xapian: Deleting terms for expunged
UID=%d (Docid=%d)",u,d);
++ if(verbose>0) i_info("FTS Xapian: Deleting terms for expunged
UID=%ld (Docid=%d)",u,d);
+ try
+ {
+ backend->dbw->delete_document(d);
+@@ -898,7 +898,9 @@ bool fts_backend_xapian_index_hdr(Xapian::WritableData
+ }
+ catch(Xapian::Error e)
+ {
+- i_error("FTS Xapian: fts_backend_xapian_index_hdr (%s) ->
%s",field,data);
++ std::string s;
++ data->toUTF8String(s);
++ i_error("FTS Xapian: fts_backend_xapian_index_hdr (%s) ->
%s",field,s.c_str());
+ i_error("FTS Xapian: %s",e.get_msg().c_str());
+ }
+ return false;
Index: pkg/README
===================================================================
RCS file: /cvs/ports/mail/dovecot-fts-xapian/pkg/README,v
retrieving revision 1.2
diff -u -p -u -r1.2 README
--- pkg/README 15 Feb 2020 08:51:23 -0000 1.2
+++ pkg/README 12 Apr 2020 05:22:12 -0000
@@ -10,9 +10,11 @@ most users:
mail_plugins = (...) fts fts_xapian (...)
-The default_vsz_limit will usually need to be increased in 10-master.conf:
+The service's vsz_limit may need to be increased (or disabled) in
10-master.conf:
- default_vsz_limit = 2GB
+ service indexer-worker {
+ vsz_limit = 0 # or 1GB etc.
+ }
Then configure the plugin's settings in 90-plugin.conf:
