- update pigeonhole to 0.5.0.1

- imap4flags extension: Fix binary corruption occurring when
    setflag/addflag/removeflag flag-list is a variable.
  - sieve-extprograms plugin: Fix segfault occurring when used in
    IMAPSieve context.
- drop 321a39be974deb2e7eff7b2a509a3ee6ff2e5ae1.patch

OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot23?expand=0&rev=8

321a39be974deb2e7eff7b2a509a3ee6ff2e5ae1.patch

@@ -1,61 +0,0 @@
-From 321a39be974deb2e7eff7b2a509a3ee6ff2e5ae1 Mon Sep 17 00:00:00 2001
-From: Stephan Bosch <stephan.bosch@dovecot.fi>
-Date: Mon, 25 Dec 2017 18:20:14 +0100
-Subject: [PATCH] plugins: sieve-extprograms: Fix segfault occurring when used
- in IMAPSieve context.
-
-This was caused by recent lib-smtp changes.
-There is no envelope in IMAPSieve context, so the rcpt parameters are NULL, causing the segfault.
----
- .../sieve-extprograms/sieve-extprograms-common.c   | 29 +++++++++++++---------
- 1 file changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-common.c b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
-index 8fef2f53..5f0ed728 100644
---- a/src/plugins/sieve-extprograms/sieve-extprograms-common.c
-+++ b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
-@@ -415,6 +415,7 @@ struct sieve_extprogram *sieve_extprogram_create
- 	struct sieve_instance *svinst = ext->svinst;
- 	struct sieve_extprograms_config *ext_config =
- 		(struct sieve_extprograms_config *) ext->context;
-+	const struct smtp_address *sender, *recipient, *orig_recipient;
- 	struct sieve_extprogram *sprog;
- 	const char *path = NULL;
- 	struct stat st;
-@@ -549,20 +550,24 @@ struct sieve_extprogram *sieve_extprogram_create
- 		program_client_set_env(sprog->program_client, "HOME", svinst->home_dir);
- 	if ( svinst->hostname != NULL )
- 		program_client_set_env(sprog->program_client, "HOST", svinst->hostname);
--	if ( !smtp_address_isnull(msgdata->envelope.mail_from) ) {
--		program_client_set_env
--			(sprog->program_client, "SENDER",
--				smtp_address_encode(msgdata->envelope.mail_from));
-+
-+	sender = msgdata->envelope.mail_from;
-+	recipient = msgdata->envelope.rcpt_to;
-+	orig_recipient = NULL;
-+	if ( msgdata->envelope.rcpt_params != NULL )
-+		orig_recipient = msgdata->envelope.rcpt_params->orcpt.addr;
-+
-+	if ( !smtp_address_isnull(sender) ) {
-+		program_client_set_env(sprog->program_client, "SENDER",
-+				       smtp_address_encode(sender));
- 	}
--	if ( !smtp_address_isnull(msgdata->envelope.rcpt_to) ) {
--		program_client_set_env
--			(sprog->program_client, "RECIPIENT",
--				smtp_address_encode(msgdata->envelope.rcpt_to));
-+	if ( !smtp_address_isnull(recipient) ) {
-+		program_client_set_env(sprog->program_client, "RECIPIENT",
-+				       smtp_address_encode(recipient));
- 	}
--	if ( !smtp_address_isnull(msgdata->envelope.rcpt_params->orcpt.addr) ) {
--		program_client_set_env
--			(sprog->program_client, "ORIG_RECIPIENT",
--				smtp_address_encode(msgdata->envelope.rcpt_params->orcpt.addr));
-+	if ( !smtp_address_isnull(orig_recipient) ) {
-+		program_client_set_env(sprog->program_client, "ORIG_RECIPIENT",
-+				       smtp_address_encode(orig_recipient));
- 	}
- 
- 	return sprog;

dovecot-2.3-pigeonhole-0.5.0.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56356d14b10c45aa472074e85bfc582c2f08a15a43ecf24f481df39b206efad2
+size 1783039

dovecot-2.3-pigeonhole-0.5.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54c887a493605322e5b968b86f7ba0cf5c503f68513a8cbcd866185f2b237954
-size 1782375

dovecot23.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Mar  6 19:28:49 UTC 2018 - mrueckert@suse.de
+
+- update pigeonhole to 0.5.0.1
+  - imap4flags extension: Fix binary corruption occurring when
+    setflag/addflag/removeflag flag-list is a variable.
+  - sieve-extprograms plugin: Fix segfault occurring when used in
+    IMAPSieve context.
+- drop 321a39be974deb2e7eff7b2a509a3ee6ff2e5ae1.patch
+
 -------------------------------------------------------------------
 Tue Mar  6 17:54:58 UTC 2018 - mrueckert@suse.de
 

dovecot23.spec

@@ -21,7 +21,7 @@ Version:        2.3.0.1
 Release:        0
 %define pkg_name dovecot
 %define dovecot_version 2.3.0.1
-%define dovecot_pigeonhole_version 0.5.0
+%define dovecot_pigeonhole_version 0.5.0.1
 %define dovecot_branch  2.3
 %define dovecot_pigeonhole_source_dir %{pkg_name}-%{dovecot_branch}-pigeonhole-%{dovecot_pigeonhole_version}
 %define dovecot_pigeonhole_docdir     %{_docdir}/%{pkg_name}/dovecot-pigeonhole
@@ -133,8 +133,7 @@ Source8:        dovecot-2.2-pigeonhole.configfiles
 Source9:        dovecot-2.3-pigeonhole.configfiles
 Patch:          dovecot-2.3.0-dont_use_etc_ssl_certs.patch
 Patch1:         dovecot-2.3.0-better_ssl_defaults.patch
-Patch2:         https://github.com/stephanbosch/pigeonhole-core/commit/321a39be974deb2e7eff7b2a509a3ee6ff2e5ae1.patch
+Patch2:         dovecot-2.3.0.1-over-quota-lmtp-crash.patch
-Patch3:         dovecot-2.3.0.1-over-quota-lmtp-crash.patch
 Summary:        IMAP and POP3 Server Written Primarily with Security in Mind
 License:        BSD-3-Clause and LGPL-2.1+ and MIT
 Group:          Productivity/Networking/Email/Servers
@@ -314,10 +313,7 @@ dovecot tree.
 %setup -q -n %{pkg_name}-%{dovecot_version} -a 1
 %patch -p1
 %patch1 -p1
-%patch3 -p1
-pushd %{dovecot_pigeonhole_source_dir}
 %patch2 -p1
-popd
 gzip -9v ChangeLog
 # Fix plugins dir.
 sed -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf