Date: Wed, 1 Jan 2025 12:46:53 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b644ba6ef0a2 - main - mail/dovecot-fts-xapian: Update to 1.8.2 Message-ID: <202501011246.501CkrkO028173@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=b644ba6ef0a242bea11e4ee7a7e10107ed493bb5 commit b644ba6ef0a242bea11e4ee7a7e10107ed493bb5 Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2025-01-01 12:44:03 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2025-01-01 12:46:34 +0000 mail/dovecot-fts-xapian: Update to 1.8.2 Update to 1.8.2. This version fixes build with upcoming ICU 76, among other things. PR: 283541 --- mail/dovecot-fts-xapian/Makefile | 5 ++-- mail/dovecot-fts-xapian/distinfo | 6 ++--- .../patch-src_fts-backend-xapian-functions.cpp | 29 ++++++++++++++++++++++ .../files/patch-src_fts-backend-xapian.cpp | 22 ++++++++-------- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile index 27ea473f77e7..40409fe7915e 100644 --- a/mail/dovecot-fts-xapian/Makefile +++ b/mail/dovecot-fts-xapian/Makefile @@ -1,7 +1,6 @@ PORTNAME= fts-xapian -DISTVERSION= 1.5.4 -DISTVERSIONSUFFIX= b -PORTREVISION= 8 +DISTVERSION= 1.8.2 +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 b49a38017d7d..40def155438d 100644 --- a/mail/dovecot-fts-xapian/distinfo +++ b/mail/dovecot-fts-xapian/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648195324 -SHA256 (dovecot-fts-xapian-1.5.4b.tar.gz) = cfc60caade77aadc8441b971d2e49f7337033a1e83494163cd8abcd459c79f6d -SIZE (dovecot-fts-xapian-1.5.4b.tar.gz) = 33138 +TIMESTAMP = 1735735093 +SHA256 (dovecot-fts-xapian-1.8.2.tar.gz) = 197d78656f2d77c75b243b46281fca3f5b588d7da38ba50543b5e3522886a351 +SIZE (dovecot-fts-xapian-1.8.2.tar.gz) = 35326 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 new file mode 100644 index 000000000000..2e5cb7958c19 --- /dev/null +++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian-functions.cpp @@ -0,0 +1,29 @@ +--- src/fts-backend-xapian-functions.cpp.orig 2025-01-01 12:38:47 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); 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 index bab0275d4914..1bbdfc5eac0d 100644 --- a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp +++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp @@ -1,13 +1,11 @@ -Patch to silence a warning, until adopted by upstream (issue #101) - ---- src/fts-backend-xapian.cpp.orig 2022-03-25 21:16:29 UTC +--- src/fts-backend-xapian.cpp.orig 2025-01-01 12:39:49 UTC +++ src/fts-backend-xapian.cpp -@@ -750,7 +750,7 @@ struct fts_backend fts_backend_xapian = - { - .name = "xapian", - .flags = FTS_BACKEND_FLAG_BUILD_FULL_WORDS, -- { -+ .v = { - fts_backend_xapian_alloc, - fts_backend_xapian_init, - fts_backend_xapian_deinit, +@@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501011246.501CkrkO028173>