Hi ports,
Diff below updates dovecot-fts-xapian from 1.2.9 to 1.3.1. I posted
previous update to 1.3 close to freeze, so repeating the changes from
then (less the patches I included which are now rolled into 1.3.1):
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.
- Timeouts on indexing, so if using lots of memory and taking forever
on some big messages it will commit at least something before
resuming
- New index optimization function
Question re. BUILD_ and RUN_DEPENDS; user has reported (running -stable)
that `pkg_add dovecot dovecot-fts-xapian` fails because
dovecot-fts-xapian-1.2.9p0 depends on dovecot-2.3.10p0v0;
dovecot-2.3.10.1v0 is in -stable. Is there something else I should be
doing to cause a rebuild to happen when dovecot is bumped, or should I
have manually bumped dovecot-fts-xapian?
---
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 27 May 2020 08:00:58 -0000
@@ -2,15 +2,13 @@
COMMENT= full text search plugin for Dovecot using Xapian
-V= 1.2.9
+V= 1.3.1
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 27 May 2020 08:00:58 -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.1.tar.gz) = FiAse8KK2P8v956858Lwv4eJTyppRBkge7SxhoMUiws=
+SIZE (fts-xapian-1.3.1.tar.gz) = 28026
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 27 May 2020 08:00:58 -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: