freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail/dovecot-fts-xapian: Update to 1.8.2

Browse Source 
Update to 1.8.2. This version fixes build with upcoming ICU 76, among
other things.

PR:		283541
This commit is contained in:
Juraj Lutter
2025-01-01 13:44:03 +01:00
parent 639df0f71a
commit b644ba6ef0
4 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/dovecot-fts-xapian/Makefile
+2 -3
View File
@@ -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-
mail/dovecot-fts-xapian/distinfo
+3 -3
View File
@@ -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
mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian-functions.cpp
+29
View File
@@ -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);
mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
+10 -12
View File
@@ -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)