- rel 5; drop invalid assert

diff --git a/dovecot-bad-assert.patch b/dovecot-bad-assert.patch
new file mode 100644 (file)
index 0000000..66da138
--- /dev/null
+++ b/dovecot-bad-assert.patch
@@ -0,0 +1,22 @@
+From 6c969ac21a43cc10ee1f1a91a4f39e4864c886cb Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tuomi@dovecot.fi>
+Date: Fri, 15 Jul 2016 11:31:25 +0300
+Subject: [PATCH] auth: Remove i_assert for credentials scheme
+
+---
+ src/auth/auth-request.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
+index 15cffeb..c701940 100644
+--- a/src/auth/auth-request.c
++++ b/src/auth/auth-request.c
+@@ -1065,8 +1065,6 @@ void auth_request_lookup_credentials(struct auth_request *request,
+ 
+       if (request->credentials_scheme == NULL)
+               request->credentials_scheme = p_strdup(request->pool, scheme);
+-      else
+-              i_assert(request->credentials_scheme == scheme);
+ 
+       if (request->policy_processed)
+               auth_request_lookup_credentials_policy_continue(request, callback);

diff --git a/dovecot.spec b/dovecot.spec
index 733be18ee396ea18f6b30fb0ad749f65f0735a4c..bef186d5ec614ac0d13e3bb8965baaac3c2196b0 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -12,7 +12,7 @@ Summary:      IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:          dovecot
 Version:       2.2.25
-Release:       4
+Release:       5
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
@@ -26,6 +26,7 @@ Patch0:               %{name}-config.patch
 Patch1:                %{name}-rpath.patch
 Patch2:                %{name}-local-name.patch
 Patch3:                %{name}-disableSSLv3.patch
+Patch4:                dovecot-bad-assert.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -160,6 +161,7 @@ Współdzielone biblioteki Dovecota.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p2
+%patch4 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf