git: 3b00cc395220 - main - mail/dovecot-fts-xapian: Update to 1.9.3
Date: Wed, 18 Mar 2026 09:13:03 UTC
The branch main has been updated by marius:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3b00cc39522026fe5aed5c8ef1f043c7378170eb
commit 3b00cc39522026fe5aed5c8ef1f043c7378170eb
Author: Marius Strobl <marius@FreeBSD.org>
AuthorDate: 2026-03-18 08:33:12 +0000
Commit: Marius Strobl <marius@FreeBSD.org>
CommitDate: 2026-03-18 09:12:47 +0000
mail/dovecot-fts-xapian: Update to 1.9.3
This update adds support for dovecot 2.4, allows to limit the amount
of threads via the maxthreads option and fixes several bugs.
For 2.3, e. g. optionally use:
plugin {
fts = xapian
fts_xapian = lowmemory=500 maxthreads=4 partial=3 verbose=0
fts_autoindex = yes
fts_enforced = yes
<...>
}
Approved by: otis (maintainer)
Differential Revision: https://reviews.freebsd.org/D55911
---
mail/dovecot-fts-xapian/Makefile | 4 +--
mail/dovecot-fts-xapian/distinfo | 6 ++--
.../patch-src_fts-backend-xapian-functions.cpp | 32 +++++-----------------
.../files/patch-src_fts-backend-xapian.cpp | 11 --------
4 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index e17be77beb5e..a873cafc37b0 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fts-xapian
-DISTVERSION= 1.8.2
-PORTREVISION?= 2
+DISTVERSION= 1.9.3
+PORTREVISION?= 0
CATEGORIES= mail
MASTER_SITES= https://github.com/grosjo/fts-xapian/releases/download/${DISTVERSIONFULL}/
PKGNAMEPREFIX= dovecot-
diff --git a/mail/dovecot-fts-xapian/distinfo b/mail/dovecot-fts-xapian/distinfo
index 40def155438d..8b3cd4768adc 100644
--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735735093
-SHA256 (dovecot-fts-xapian-1.8.2.tar.gz) = 197d78656f2d77c75b243b46281fca3f5b588d7da38ba50543b5e3522886a351
-SIZE (dovecot-fts-xapian-1.8.2.tar.gz) = 35326
+TIMESTAMP = 1773820502
+SHA256 (dovecot-fts-xapian-1.9.3.tar.gz) = b2ab1623d45d19f3086e8044957b1572d65659849ccc19bd6b276dac07f98df7
+SIZE (dovecot-fts-xapian-1.9.3.tar.gz) = 37816
diff --git a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian-functions.cpp b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian-functions.cpp
index 2e5cb7958c19..d2d5e2ed8198 100644
--- a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian-functions.cpp
+++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian-functions.cpp
@@ -1,29 +1,11 @@
---- src/fts-backend-xapian-functions.cpp.orig 2025-01-01 12:38:47 UTC
+--- src/fts-backend-xapian-functions.cpp.orig 2025-08-26 00:29:45 UTC
+++ src/fts-backend-xapian-functions.cpp
@@ -21,7 +21,7 @@ static long fts_backend_xapian_get_free_memory(int ver
if(verbose>1) syslog(LOG_WARNING,"FTS Xapian: Memory limit not available from getrlimit (probably vsz_limit not set");
#if defined(__FreeBSD__) || defined(__NetBSD__)
- u_int page_size;
-- uint_size uint_size = sizeof(page_size);
-+ size_t uint_size = sizeof(page_size);
- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &uint_size, NULL, 0);
- struct vmtotal vmt;
- size_t vmt_size = sizeof(vmt);
-@@ -906,7 +906,7 @@ class XDocsWriter
-
- if(sqlite3_exec(db,sql.c_str(),NULL,0,&zErrMsg) != SQLITE_OK )
- {
-- syslog(LOG_ERR,"FTS Xapian: Can not replace keyword : %s",sql.c_str(),zErrMsg);
-+ syslog(LOG_ERR,"FTS Xapian: Can not replace keyword %s: %s",sql.c_str(),zErrMsg);
- sqlite3_free(zErrMsg);
- sqlite3_close(db);
- return;
-@@ -1531,7 +1531,7 @@ static void fts_backend_xapian_build_qs(XQuerySet * qs
- std::vector<icu::UnicodeString *> st; st.clear();
- if(sqlite3_exec(db,sql.c_str(),fts_backend_xapian_sqlite3_vector_icu,&st,&zErrMsg) != SQLITE_OK )
- {
-- syslog(LOG_ERR,"FTS Xapian: Can not search keyword : %s",sql.c_str(),zErrMsg);
-+ syslog(LOG_ERR,"FTS Xapian: Can not search keyword %s: %s",sql.c_str(),zErrMsg);
- sqlite3_free(zErrMsg);
- }
- sqlite3_close(db);
+ u_int page_size;
+- uint_size uint_size = sizeof(page_size);
++ size_t uint_size = sizeof(page_size);
+ sysctlbyname("vm.stats.vm.v_page_size", &page_size, &uint_size, NULL, 0);
+ struct vmtotal vmt;
+ size_t vmt_size = sizeof(vmt);
diff --git a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
deleted file mode 100644
index 1bbdfc5eac0d..000000000000
--- a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fts-backend-xapian.cpp.orig 2025-01-01 12:39:49 UTC
-+++ src/fts-backend-xapian.cpp
-@@ -542,7 +542,7 @@ static int fts_backend_xapian_optimize(struct fts_back
- }
- i_free(u);
- }
-- if(fts_xapian_settings.verbose>0) i_info("FTS Xapian: Optimize - Closing DB %s",s);
-+ if(fts_xapian_settings.verbose>0) i_info("FTS Xapian: Optimize - Closing DB %s",s.c_str());
- fts_backend_xapian_close_db(db,s.c_str(),"fts_optimize",fts_xapian_settings.verbose);
- }
- catch(Xapian::Error e)