cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to a newer checkout of dovecot-fts-flatcurve

Browse Source 
patch to explicitly init enums
This commit is contained in:
sthen 2022-01-04 15:47:40 +00:00
parent 4f322c076a
commit 434114499e
3 changed files with 98 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/dovecot-fts-flatcurve/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2021/12/10 10:22:15 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2022/01/04 15:47:40 sthen Exp $
COMMENT= full text search plugin for Dovecot using Xapian
GH_ACCOUNT= slusarz
GH_PROJECT= dovecot-fts-flatcurve
GH_COMMIT= f21c43f0f7b4735334898e686cae59890287614c
DISTNAME= dovecot-fts-flatcurve-0.1.1pre20210812
GH_COMMIT= 55883dd3b606272f1954e99a90ff34c17eb2571f
DISTNAME= dovecot-fts-flatcurve-0.1.1pre20211212
CATEGORIES= mail

4
mail/dovecot-fts-flatcurve/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dovecot-fts-flatcurve-0.1.1pre20210812-f21c43f0.tar.gz) = ClbeIuzSV1nHPlmvkihbkKF62i/bOTdNT+/kntMvsds=
SIZE (dovecot-fts-flatcurve-0.1.1pre20210812-f21c43f0.tar.gz) = 39438
SHA256 (dovecot-fts-flatcurve-0.1.1pre20211212-55883dd3.tar.gz) = dDtf5rONa8TkhHEgagVcVRy6XfQLZnHkKOnZaF2zsV8=
SIZE (dovecot-fts-flatcurve-0.1.1pre20211212-55883dd3.tar.gz) = 47973

93
mail/dovecot-fts-flatcurve/patches/patch-src_fts-backend-flatcurve-xapian_cpp Normal file
View File

@ -0,0 +1,93 @@
$OpenBSD: patch-src_fts-backend-flatcurve-xapian_cpp,v 1.1 2022/01/04 15:47:40 sthen Exp $
https://github.com/slusarz/dovecot-fts-flatcurve/issues/16
Index: src/fts-backend-flatcurve-xapian.cpp
--- src/fts-backend-flatcurve-xapian.cpp.orig
+++ src/fts-backend-flatcurve-xapian.cpp
@@ -504,7 +504,7 @@ fts_flatcurve_xapian_db_add(struct flatcurve_fts_backe
static int fts_flatcurve_xapian_lock(struct flatcurve_fts_backend *backend)
{
- enum dotlock_create_flags flags;
+ enum dotlock_create_flags flags = (enum dotlock_create_flags) 0;
int ret;
struct dotlock_settings set;
struct flatcurve_xapian *x = backend->xapian;
@@ -645,7 +645,7 @@ static struct flatcurve_xapian_db *
fts_flatcurve_xapian_write_db_current(struct flatcurve_fts_backend *backend,
enum flatcurve_xapian_db_opts opts)
{
- enum flatcurve_xapian_wdb wopts;
+ enum flatcurve_xapian_wdb wopts = (enum flatcurve_xapian_wdb) 0;
struct flatcurve_xapian *x = backend->xapian;
struct flatcurve_xapian_db *xdb;
@@ -860,7 +860,7 @@ fts_flatcurve_xapian_check_db_version(struct flatcurve
std::ostringstream ss;
int v;
std::string ver;
- enum flatcurve_xapian_wdb wopts;
+ enum flatcurve_xapian_wdb wopts = (enum flatcurve_xapian_wdb) 0;
ver = db->get_metadata(FLATCURVE_XAPIAN_DB_VERSION_KEY);
v = ver.empty() ? 0 : std::atoi(ver.c_str());
@@ -917,8 +917,8 @@ static struct flatcurve_xapian_db *
fts_flatcurve_xapian_write_db_by_uid(struct flatcurve_fts_backend *backend,
uint32_t uid)
{
- enum flatcurve_xapian_db_opts opts;
- enum flatcurve_xapian_wdb wopts;
+ enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) 0;
+ enum flatcurve_xapian_wdb wopts = (enum flatcurve_xapian_wdb) 0;
struct flatcurve_xapian_db *xdb;
(void)fts_flatcurve_xapian_read_db(backend, opts);
@@ -957,7 +957,7 @@ static void
fts_flatcurve_xapian_clear_document(struct flatcurve_fts_backend *backend)
{
struct flatcurve_xapian *x = backend->xapian;
- enum flatcurve_xapian_db_opts opts;
+ enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) 0;
struct flatcurve_xapian_db *xdb;
if ((x->doc == NULL) ||
@@ -1184,7 +1184,7 @@ void fts_flatcurve_xapian_expunge(struct flatcurve_fts
bool
fts_flatcurve_xapian_init_msg(struct flatcurve_fts_backend_update_context *ctx)
{
- enum flatcurve_xapian_db_opts opts;
+ enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) 0;
struct flatcurve_xapian *x = ctx->backend->xapian;
struct flatcurve_xapian_db *xdb;
@@ -1342,9 +1342,9 @@ fts_flatcurve_xapian_optimize_box_do(struct flatcurve_
void *key, *val;
struct flatcurve_xapian_db_path *n, *o;
struct timeval now, start;
- enum flatcurve_xapian_db_opts opts;
+ enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) 0;
struct flatcurve_xapian *x = backend->xapian;
- enum flatcurve_xapian_wdb wopts;
+ enum flatcurve_xapian_wdb wopts = (enum flatcurve_xapian_wdb) 0;
/* We need to lock all of the mailboxes so nothing changes while we
* are optimizing. */
@@ -1462,7 +1462,7 @@ fts_flatcurve_build_query_arg(struct flatcurve_fts_que
struct flatcurve_fts_query_arg *a;
Xapian::Database *db;
string_t *hdr, *hdr2;
- enum flatcurve_xapian_db_opts opts;
+ enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) 0;
std::string t;
struct flatcurve_fts_query_xapian *x = query->xapian;
@@ -1690,7 +1690,7 @@ struct fts_flatcurve_xapian_query_result *
fts_flatcurve_xapian_query_iter_next(struct fts_flatcurve_xapian_query_iter *iter)
{
Xapian::MSet m;
- enum flatcurve_xapian_db_opts opts;
+ enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) 0;
if (iter->enquire == NULL) {
if ((iter->query->xapian->query == NULL) ||