Attachment #225984 for bug #254007

Lines 1-6 Link Here

(-)b/mail/dovecot-fts-xapian/Makefile (+1 lines)
1	PORTNAME= fts-xapian	1	PORTNAME= fts-xapian
2	DISTVERSION= 1.4.9	2	DISTVERSION= 1.4.9
3	DISTVERSIONSUFFIX= b	3	DISTVERSIONSUFFIX= b
		4	PORTREVISION= 1
4	CATEGORIES= mail	5	CATEGORIES= mail
5	PKGNAMEPREFIX= dovecot-	6	PKGNAMEPREFIX= dovecot-
6		7

Lines 1-7 Link Here

(-)b/mail/dovecot-pigeonhole/Makefile (-1 / +1 lines)
1	# Created by: Nils Vogels <nivo+kw+ports.bfa274@is-root.com>	1	# Created by: Nils Vogels <nivo+kw+ports.bfa274@is-root.com>
2		2
3	PORTNAME= dovecot-pigeonhole	3	PORTNAME= dovecot-pigeonhole
4	PORTVERSION= 0.5.13	4	PORTVERSION= 0.5.15
5	CATEGORIES= mail	5	CATEGORIES= mail
6	MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/	6	MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
7	DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}	7	DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}

Lines 1-3 Link Here

(-)b/mail/dovecot-pigeonhole/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1609775237	1	TIMESTAMP = 1624318776
2	SHA256 (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17	2	SHA256 (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
3	SIZE (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 1908839	3	SIZE (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = 1935601

Lines 7-14 Link Here

(-)b/mail/dovecot/Makefile (-2 / +1 lines)
7	######################################################################	7	######################################################################
8		8
9	PORTNAME= dovecot	9	PORTNAME= dovecot
10	PORTVERSION= 2.3.13	10	PORTVERSION= 2.3.15
11	PORTREVISION= 1
12	CATEGORIES= mail	11	CATEGORIES= mail
13	MASTER_SITES= https://dovecot.org/releases/2.3/	12	MASTER_SITES= https://dovecot.org/releases/2.3/
14		13

Lines 1-3 Link Here

(-)b/mail/dovecot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1609941410	1	TIMESTAMP = 1624315433
2	SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4	2	SHA256 (dovecot-2.3.15.tar.gz) = 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
3	SIZE (dovecot-2.3.13.tar.gz) = 7456073	3	SIZE (dovecot-2.3.15.tar.gz) = 7608561




--- configure.orig	2021-06-14 13:40:48 UTC
+++ configure
@@ -26321,7 +26321,7 @@ $as_echo "$with_lua" >&6; }
 $as_echo "$with_lua" >&6; }
 
 else
 
-      for LUAPC in lua5.3 lua-5.3 lua53 lua5.1 lua-5.1 lua51 lua; do
+      for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
@@ -29748,13 +29748,13 @@ fi
 
 
   if test $want_stemmer != no; then

Removed Link Here

(-)a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c (-11 lines)
1	--- src/plugins/fts-solr/solr-connection.c.orig 2020-08-12 12:20:41 UTC
2	+++ src/plugins/fts-solr/solr-connection.c
3	@@ -103,7 +103,7 @@ int solr_connection_init(const struct fts_solr_setting
4	http_set.ssl = ssl_client_set;
5	http_set.debug = solr_set->debug;
6	http_set.rawlog_dir = solr_set->rawlog_dir;
7	- solr_http_client = http_client_init(&http_set);
8	+ solr_http_client = http_client_init_private(&http_set);
9	}
10
11	*conn_r = conn;

Removed Link Here

(-)a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c (-11 lines)
1	--- src/plugins/fts/fts-parser-tika.c.orig 2019-01-02 22:11:26 UTC
2	+++ src/plugins/fts/fts-parser-tika.c
3	@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struc
4	http_set.request_timeout_msecs = 60*1000;
5	http_set.ssl = &ssl_set;
6	http_set.debug = user->mail_debug;
7	- tika_http_client = http_client_init(&http_set);
8	+ tika_http_client = http_client_init_private(&http_set);
9	}
10	*http_url_r = tuser->http_url;
11	return 0;




%%ETCDIR%%/example-config/conf.d/10-logging.conf
%%ETCDIR%%/example-config/conf.d/10-mail.conf
%%ETCDIR%%/example-config/conf.d/10-master.conf
%%ETCDIR%%/example-config/conf.d/10-metrics.conf
%%ETCDIR%%/example-config/conf.d/10-ssl.conf
%%ETCDIR%%/example-config/conf.d/15-lda.conf
%%ETCDIR%%/example-config/conf.d/15-mailboxes.conf

include/dovecot/config-request.h
include/dovecot/config.h
include/dovecot/connection.h
include/dovecot/cpu-limit.h
include/dovecot/crc32.h
include/dovecot/cydir-storage.h
include/dovecot/cydir-sync.h
include/dovecot/data-stack.h
include/dovecot/db-checkpassword.h
include/dovecot/db-dict.h

include/dovecot/fts-tokenizer-private.h
include/dovecot/fts-tokenizer.h
include/dovecot/fts-user.h
include/dovecot/fuzzer.h
include/dovecot/guid.h
include/dovecot/hash-decl.h
include/dovecot/hash-format.h

include/dovecot/subscription-file.h
include/dovecot/syslog-util.h
include/dovecot/test-common.h
include/dovecot/test-mail-storage-common.h
include/dovecot/test-subprocess.h
include/dovecot/time-util.h
include/dovecot/unichar.h

lib/dovecot/auth/libauthdb_imap.so
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a
lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a

lib/dovecot/lib05_mail_crypt_acl_plugin.so
lib/dovecot/lib05_pop3_migration_plugin.a
lib/dovecot/lib05_pop3_migration_plugin.so
lib/dovecot/lib05_snarf_plugin.a
lib/dovecot/lib05_snarf_plugin.so
lib/dovecot/lib10_last_login_plugin.a
lib/dovecot/lib10_last_login_plugin.so
lib/dovecot/lib10_mail_crypt_plugin.a
lib/dovecot/lib10_mail_crypt_plugin.so
lib/dovecot/lib10_mail_filter_plugin.a
lib/dovecot/lib10_mail_filter_plugin.so
lib/dovecot/lib10_quota_plugin.a
lib/dovecot/lib10_quota_plugin.so
lib/dovecot/lib11_imap_quota_plugin.a

lib/dovecot/lib11_trash_plugin.so
lib/dovecot/lib15_notify_plugin.a
lib/dovecot/lib15_notify_plugin.so
lib/dovecot/lib20_autocreate_plugin.a
lib/dovecot/lib20_autocreate_plugin.so
lib/dovecot/lib20_charset_alias_plugin.a
lib/dovecot/lib20_charset_alias_plugin.so
lib/dovecot/lib20_expire_plugin.a
lib/dovecot/lib20_expire_plugin.so
lib/dovecot/lib20_fts_plugin.a
lib/dovecot/lib20_fts_plugin.so
lib/dovecot/lib20_listescape_plugin.a
- 

Return to bug 254007

Lines 1-15 Link Here

(-)b/mail/dovecot/files/patch-configure (-7 / +7 lines)
1	--- configure.orig 2020-12-22 13:27:02 UTC	1	--- configure.orig 2021-06-14 13:40:48 UTC
2	+++ configure	2	+++ configure
3	@@ -26053,7 +26053,7 @@ fi	3	@@ -26321,7 +26321,7 @@ $as_echo "$with_lua" >&6; }
4	$as_echo "$with_lua" >&6; }
5		4
6	if test "x$with_lua" != "xno"; then :	5	else
7	- for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do	6
8	+ for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do	7	- for LUAPC in lua5.3 lua-5.3 lua53 lua5.1 lua-5.1 lua51 lua; do
		8	+ for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
9		9
10	pkg_failed=no	10	pkg_failed=no
11	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5	11	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12	@@ -29355,13 +29355,13 @@ fi	12	@@ -29748,13 +29748,13 @@ fi
13		13
14		14
15	if test $want_stemmer != no; then	15	if test $want_stemmer != no; then

Lines 18-23 Link Here

(-)b/mail/dovecot/pkg-plist (-13 / +4 lines)
18	%%ETCDIR%%/example-config/conf.d/10-logging.conf	18	%%ETCDIR%%/example-config/conf.d/10-logging.conf
19	%%ETCDIR%%/example-config/conf.d/10-mail.conf	19	%%ETCDIR%%/example-config/conf.d/10-mail.conf
20	%%ETCDIR%%/example-config/conf.d/10-master.conf	20	%%ETCDIR%%/example-config/conf.d/10-master.conf
		21	%%ETCDIR%%/example-config/conf.d/10-metrics.conf
21	%%ETCDIR%%/example-config/conf.d/10-ssl.conf	22	%%ETCDIR%%/example-config/conf.d/10-ssl.conf
22	%%ETCDIR%%/example-config/conf.d/15-lda.conf	23	%%ETCDIR%%/example-config/conf.d/15-lda.conf
23	%%ETCDIR%%/example-config/conf.d/15-mailboxes.conf	24	%%ETCDIR%%/example-config/conf.d/15-mailboxes.conf
Lines 122-130 include/dovecot/config-parser.h Link Here
122	include/dovecot/config-request.h	123	include/dovecot/config-request.h
123	include/dovecot/config.h	124	include/dovecot/config.h
124	include/dovecot/connection.h	125	include/dovecot/connection.h
		126	include/dovecot/cpu-limit.h
125	include/dovecot/crc32.h	127	include/dovecot/crc32.h
126	include/dovecot/cydir-storage.h
127	include/dovecot/cydir-sync.h
128	include/dovecot/data-stack.h	128	include/dovecot/data-stack.h
129	include/dovecot/db-checkpassword.h	129	include/dovecot/db-checkpassword.h
130	include/dovecot/db-dict.h	130	include/dovecot/db-dict.h
Lines 205-210 include/dovecot/fts-tokenizer-generic-private.h Link Here
205	include/dovecot/fts-tokenizer-private.h	205	include/dovecot/fts-tokenizer-private.h
206	include/dovecot/fts-tokenizer.h	206	include/dovecot/fts-tokenizer.h
207	include/dovecot/fts-user.h	207	include/dovecot/fts-user.h
		208	include/dovecot/fuzzer.h
208	include/dovecot/guid.h	209	include/dovecot/guid.h
209	include/dovecot/hash-decl.h	210	include/dovecot/hash-decl.h
210	include/dovecot/hash-format.h	211	include/dovecot/hash-format.h
Lines 639-644 include/dovecot/submission-settings.h Link Here
639	include/dovecot/subscription-file.h	640	include/dovecot/subscription-file.h
640	include/dovecot/syslog-util.h	641	include/dovecot/syslog-util.h
641	include/dovecot/test-common.h	642	include/dovecot/test-common.h
		643	include/dovecot/test-mail-storage-common.h
642	include/dovecot/test-subprocess.h	644	include/dovecot/test-subprocess.h
643	include/dovecot/time-util.h	645	include/dovecot/time-util.h
644	include/dovecot/unichar.h	646	include/dovecot/unichar.h
Lines 661-668 lib/dovecot/auth/libauthdb_imap.a Link Here
661	lib/dovecot/auth/libauthdb_imap.so	663	lib/dovecot/auth/libauthdb_imap.so
662	lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a	664	lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a
663	lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so	665	lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
664	lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a
665	lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
666	lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a	666	lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a
667	lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so	667	lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
668	lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a	668	lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a
Lines 680-693 lib/dovecot/lib05_mail_crypt_acl_plugin.a Link Here
680	lib/dovecot/lib05_mail_crypt_acl_plugin.so	680	lib/dovecot/lib05_mail_crypt_acl_plugin.so
681	lib/dovecot/lib05_pop3_migration_plugin.a	681	lib/dovecot/lib05_pop3_migration_plugin.a
682	lib/dovecot/lib05_pop3_migration_plugin.so	682	lib/dovecot/lib05_pop3_migration_plugin.so
683	lib/dovecot/lib05_snarf_plugin.a
684	lib/dovecot/lib05_snarf_plugin.so
685	lib/dovecot/lib10_last_login_plugin.a	683	lib/dovecot/lib10_last_login_plugin.a
686	lib/dovecot/lib10_last_login_plugin.so	684	lib/dovecot/lib10_last_login_plugin.so
687	lib/dovecot/lib10_mail_crypt_plugin.a	685	lib/dovecot/lib10_mail_crypt_plugin.a
688	lib/dovecot/lib10_mail_crypt_plugin.so	686	lib/dovecot/lib10_mail_crypt_plugin.so
689	lib/dovecot/lib10_mail_filter_plugin.a
690	lib/dovecot/lib10_mail_filter_plugin.so
691	lib/dovecot/lib10_quota_plugin.a	687	lib/dovecot/lib10_quota_plugin.a
692	lib/dovecot/lib10_quota_plugin.so	688	lib/dovecot/lib10_quota_plugin.so
693	lib/dovecot/lib11_imap_quota_plugin.a	689	lib/dovecot/lib11_imap_quota_plugin.a
Lines 696-707 lib/dovecot/lib11_trash_plugin.a Link Here
696	lib/dovecot/lib11_trash_plugin.so	692	lib/dovecot/lib11_trash_plugin.so
697	lib/dovecot/lib15_notify_plugin.a	693	lib/dovecot/lib15_notify_plugin.a
698	lib/dovecot/lib15_notify_plugin.so	694	lib/dovecot/lib15_notify_plugin.so
699	lib/dovecot/lib20_autocreate_plugin.a
700	lib/dovecot/lib20_autocreate_plugin.so
701	lib/dovecot/lib20_charset_alias_plugin.a	695	lib/dovecot/lib20_charset_alias_plugin.a
702	lib/dovecot/lib20_charset_alias_plugin.so	696	lib/dovecot/lib20_charset_alias_plugin.so
703	lib/dovecot/lib20_expire_plugin.a
704	lib/dovecot/lib20_expire_plugin.so
705	lib/dovecot/lib20_fts_plugin.a	697	lib/dovecot/lib20_fts_plugin.a
706	lib/dovecot/lib20_fts_plugin.so	698	lib/dovecot/lib20_fts_plugin.so
707	lib/dovecot/lib20_listescape_plugin.a	699	lib/dovecot/lib20_listescape_plugin.a
708	-