Update to 1.2.2

4 files changed, 5 insertions, 92 deletions

diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index 9d41085180a2..b65f77d347bf 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	fts-xapian
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
diff --git a/mail/dovecot-fts-xapian/distinfo b/mail/dovecot-fts-xapian/distinfo
index 8404216b57f8..10c56ebe671d 100644
--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569926733
-SHA256 (grosjo-fts-xapian-fts-xapian-1.2.1_GH0.tar.gz) = 9c8dbaa3ddf5f489356a3ec40af012c02aaa6af7ae513ade5b208d3d19771277
-SIZE (grosjo-fts-xapian-fts-xapian-1.2.1_GH0.tar.gz) = 27267
+TIMESTAMP = 1574756401
+SHA256 (grosjo-fts-xapian-fts-xapian-1.2.2_GH0.tar.gz) = 3971fa7d7b7390c1ad4791d4162a07ecce8ded82a22251dd7e66f32b1b655491
+SIZE (grosjo-fts-xapian-fts-xapian-1.2.2_GH0.tar.gz) = 27327
diff --git a/mail/dovecot-fts-xapian/files/patch-reduce-verbosity b/mail/dovecot-fts-xapian/files/patch-reduce-verbosity
deleted file mode 100644
index b3dcf493a18d..000000000000
--- a/mail/dovecot-fts-xapian/files/patch-reduce-verbosity
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git src/fts-backend-xapian-functions.cpp src/fts-backend-xapian-functions.cpp
-index e7f8324..ed0ab1a 100644
---- src/fts-backend-xapian-functions.cpp
-+++ src/fts-backend-xapian-functions.cpp
-@@ -35,7 +35,6 @@ class XQuerySet
- 	bool item_neg; // for the term
- 	long qsize;
- 	long limit;
--	bool display;
- 
- 	XQuerySet()
- 	{
-@@ -45,7 +44,6 @@ class XQuerySet
- 		header=NULL;
-                 text=NULL;
- 		global_neg=false;
--		display=false;
- 	}
- 
- 	XQuerySet(bool is_and, bool is_neg, long l)
-@@ -57,7 +55,6 @@ class XQuerySet
- 		text=NULL;
- 		global_and=is_and;
- 		global_neg=is_neg;
--		display=true;
- 	}
- 
- 	~XQuerySet()
-@@ -293,7 +290,7 @@ class XQuerySet
- 
- 		char *s = i_strdup(get_string().c_str());
- 	
--		if(display) { i_info("FTS Xapian: Query= %s",s); }
-+		i_debug("FTS Xapian: Query= %s",s);
- 
- 		qp->set_database(*db);
- 	
-@@ -452,7 +449,7 @@ static void fts_backend_xapian_oldbox(struct xapian_fts_backend *backend)
- 		}
-         	/* End Performance calculator*/
- 	
--                i_info("FTS Xapian: Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r);
-+                i_debug("FTS Xapian: Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r);
-                 i_free(backend->oldbox);
-                 backend->oldbox=NULL;
-         }
-diff --git src/fts-backend-xapian.cpp src/fts-backend-xapian.cpp
-index 5ff83d0..d55852c 100644
---- src/fts-backend-xapian.cpp
-+++ src/fts-backend-xapian.cpp
-@@ -442,12 +442,12 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo
- 
- 	if((flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0)
- 	{
--		i_info("FTS Xapian: FLAG=AND");
-+		i_debug("FTS Xapian: FLAG=AND");
- 		is_and=true;
- 	}
- 	else
- 	{
--		i_info("FTS Xapian: FLAG=OR");
-+		i_debug("FTS Xapian: FLAG=OR");
- 	}
- 
- 	XQuerySet * qs = new XQuerySet(is_and,false,backend->partial);
-@@ -480,7 +480,7 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo
- 	/* Performance calc */
-         gettimeofday(&tp, NULL);
-         dt = tp.tv_sec * 1000 + tp.tv_usec / 1000 - dt;
--	i_info("FTS Xapian: %ld results in %ld ms",n,dt);	
-+	i_debug("FTS Xapian: %ld results in %ld ms",n,dt);
- 
- 	return 0;
- }
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 de42b3940487..000000000000
--- a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/fts-backend-xapian.cpp.orig	2019-08-18 16:36:45 UTC
-+++ src/fts-backend-xapian.cpp
-@@ -115,9 +115,7 @@ static int fts_backend_xapian_init(struct fts_backend 
-     	}
- 
- 	const char * path = mailbox_list_get_root_forced(_backend->ns->list, MAILBOX_LIST_PATH_TYPE_INDEX);
--	long l=strlen(path)+strlen(XAPIAN_FILE_PREFIX)+2;
--	backend->path = (char *)i_malloc(l*sizeof(char));
--	snprintf(backend->path,l,"%s/%s",path,XAPIAN_FILE_PREFIX);
-+	backend->path = i_strconcat(path, "/" XAPIAN_FILE_PREFIX, NULL);
- 
- 	struct stat sb;
- 	if(!( (stat(backend->path, &sb)==0) && S_ISDIR(sb.st_mode)))