commit b4de33e3d77464af2bed7076025ba094d1fc0ba1
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Oct 28 20:57:07 2016 +0200
- up to 2.2.26.0 (few fixes for bugs in 2.2.26 release)
dovecot-bad-assert.patch | 22 ----------------------
dovecot.spec | 6 ++----
2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/dovecot.spec b/dovecot.spec
index a7b6910..c3c67fb 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,13 +11,13 @@
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.26
+Version: 2.2.26.0
Release: 1
Epoch: 1
License: MIT (libraries), LGPL v2.1 (the rest)
Group: Networking/Daemons
Source0: http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
-# Source0-md5: 54d96c68316cd75432e1f4234ecc82d9
+# Source0-md5: 85bc42328de41d1eb8d6d3f1db666db8
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}.sysconfig
@@ -26,7 +26,6 @@ Patch0: %{name}-config.patch
Patch1: %{name}-rpath.patch
Patch3: %{name}-disableSSLv3.patch
-Patch4: dovecot-bad-assert.patch
URL: http://dovecot.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -161,7 +160,6 @@ Współdzielone biblioteki Dovecota.
%patch1 -p1
%patch3 -p2
-%patch4 -p1
%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g'
doc/example-config/*.conf doc/example-config/conf.d/*.conf
diff --git a/dovecot-bad-assert.patch b/dovecot-bad-assert.patch
deleted file mode 100644
index 66da138..0000000
--- a/dovecot-bad-assert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6c969ac21a43cc10ee1f1a91a4f39e4864c886cb Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <[email protected]>
-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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dovecot.git/commitdiff/b4de33e3d77464af2bed7076025ba094d1fc0ba1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
