Attachment 225984 Details for Bug 254007 – Patch file

[patch] Patch file

mail_dovecot.patch (text/plain), 9.04 KB, created by Yasuhiro Kimura on 2021-06-21 23:56:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-06-21 23:56:03 UTC

Size: 9.04 KB

patch

obsolete

>From 4a3c4c40154f9bac2345e099acf01e8de42b5946 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@utahime.org>
>Date: Tue, 22 Jun 2021 08:50:14 +0900
>Subject: [PATCH] mail/dovecot mail/dovecot-pigeonhole: Update to latest
> release
>
>* Update mail/dovecot to 2.3.15.
>* Update mail/dovecot-pigeonhole to 0.5.15.
>* Bump PORTREVISION of mail/dovecot-fts-xapian.
>
>Release Notes: https://dovecot.org/pipermail/dovecot-news/2021-June/000457.html
>Relesae Notes: https://dovecot.org/pipermail/dovecot-news/2021-June/000458.html
>Security: 46a1b78f-d2dc-11eb-baa9-080027f515ea
>---
> mail/dovecot-fts-xapian/Makefile                 |  1 +
> mail/dovecot-pigeonhole/Makefile                 |  2 +-
> mail/dovecot-pigeonhole/distinfo                 |  6 +++---
> mail/dovecot/Makefile                            |  3 +--
> mail/dovecot/distinfo                            |  6 +++---
> mail/dovecot/files/patch-configure               | 14 +++++++-------
> .../patch-src_plugins_fts-solr_solr-connection.c | 11 -----------
> .../patch-src_plugins_fts_fts-parser-tika.c      | 11 -----------
> mail/dovecot/pkg-plist                           | 16 ++++------------
> 9 files changed, 20 insertions(+), 50 deletions(-)
> delete mode 100644 mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c
> delete mode 100644 mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c
>
>diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
>index 5479a380c04c..23fab9f5e29c 100644
>--- a/mail/dovecot-fts-xapian/Makefile
>+++ b/mail/dovecot-fts-xapian/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	fts-xapian
> DISTVERSION=	1.4.9
> DISTVERSIONSUFFIX=	b
>+PORTREVISION=	1
> CATEGORIES=	mail
> PKGNAMEPREFIX=	dovecot-
> 
>diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
>index d8cfcf00a84d..a3c7939801ea 100644
>--- a/mail/dovecot-pigeonhole/Makefile
>+++ b/mail/dovecot-pigeonhole/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Nils Vogels <nivo+kw+ports.bfa274@is-root.com>
> 
> PORTNAME=	dovecot-pigeonhole
>-PORTVERSION=	0.5.13
>+PORTVERSION=	0.5.15
> CATEGORIES=	mail
> MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
> DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
>diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
>index 97537214af42..70ab07ab1fd8 100644
>--- a/mail/dovecot-pigeonhole/distinfo
>+++ b/mail/dovecot-pigeonhole/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1609775237
>-SHA256 (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
>-SIZE (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 1908839
>+TIMESTAMP = 1624318776
>+SHA256 (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
>+SIZE (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = 1935601
>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 528fbb02a25a..8df7dddb2220 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -7,8 +7,7 @@
> ######################################################################
> 
> PORTNAME=	dovecot
>-PORTVERSION=	2.3.13
>-PORTREVISION=	1
>+PORTVERSION=	2.3.15
> CATEGORIES=	mail
> MASTER_SITES=	https://dovecot.org/releases/2.3/
> 
>diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
>index aa3436fe4e25..9649cabc0d05 100644
>--- a/mail/dovecot/distinfo
>+++ b/mail/dovecot/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1609941410
>-SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
>-SIZE (dovecot-2.3.13.tar.gz) = 7456073
>+TIMESTAMP = 1624315433
>+SHA256 (dovecot-2.3.15.tar.gz) = 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
>+SIZE (dovecot-2.3.15.tar.gz) = 7608561
>diff --git a/mail/dovecot/files/patch-configure b/mail/dovecot/files/patch-configure
>index 89691f439d56..fbe6be522f5f 100644
>--- a/mail/dovecot/files/patch-configure
>+++ b/mail/dovecot/files/patch-configure
>@@ -1,15 +1,15 @@
>---- configure.orig	2020-12-22 13:27:02 UTC
>+--- configure.orig	2021-06-14 13:40:48 UTC
> +++ configure
>-@@ -26053,7 +26053,7 @@ fi
>- $as_echo "$with_lua" >&6; }
>+@@ -26321,7 +26321,7 @@ $as_echo "$with_lua" >&6; }
>  
>-   if test "x$with_lua" != "xno"; then :
>--  for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 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
>+ 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
>-@@ -29355,13 +29355,13 @@ fi
>+@@ -29748,13 +29748,13 @@ fi
>  
>  
>    if test $want_stemmer != no; then
>diff --git a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c b/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c
>deleted file mode 100644
>index e6991bbf7900..000000000000
>--- a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/fts-solr/solr-connection.c.orig	2020-08-12 12:20:41 UTC
>-+++ src/plugins/fts-solr/solr-connection.c
>-@@ -103,7 +103,7 @@ int solr_connection_init(const struct fts_solr_setting
>- 		http_set.ssl = ssl_client_set;
>- 		http_set.debug = solr_set->debug;
>- 		http_set.rawlog_dir = solr_set->rawlog_dir;
>--		solr_http_client = http_client_init(&http_set);
>-+		solr_http_client = http_client_init_private(&http_set);
>- 	}
>- 
>- 	*conn_r = conn;
>diff --git a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c b/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c
>deleted file mode 100644
>index 2be6cae9aa32..000000000000
>--- a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/fts/fts-parser-tika.c.orig	2019-01-02 22:11:26 UTC
>-+++ src/plugins/fts/fts-parser-tika.c
>-@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struc
>- 		http_set.request_timeout_msecs = 60*1000;
>- 		http_set.ssl = &ssl_set;
>- 		http_set.debug = user->mail_debug;
>--		tika_http_client = http_client_init(&http_set);
>-+		tika_http_client = http_client_init_private(&http_set);
>- 	}
>- 	*http_url_r = tuser->http_url;
>- 	return 0;
>diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
>index a60d7a5c3f12..7dafef8fa6d6 100644
>--- a/mail/dovecot/pkg-plist
>+++ b/mail/dovecot/pkg-plist
>@@ -18,6 +18,7 @@
> %%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
>@@ -122,9 +123,8 @@ include/dovecot/config-parser.h
> 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
>@@ -205,6 +205,7 @@ include/dovecot/fts-tokenizer-generic-private.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
>@@ -639,6 +640,7 @@ include/dovecot/submission-settings.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
>@@ -661,8 +663,6 @@ lib/dovecot/auth/libauthdb_imap.a
> 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
>@@ -680,14 +680,10 @@ lib/dovecot/lib05_mail_crypt_acl_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
>@@ -696,12 +692,8 @@ lib/dovecot/lib11_trash_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
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 254007: 222969 | 225984