- rel 2; unbreak local_name handling after: Fix local name handling in v2.2.34 SNI...

diff --git a/dovecot-local_name.patch b/dovecot-local_name.patch
new file mode 100644 (file)
index 0000000..d6e34ee
--- /dev/null
+++ b/dovecot-local_name.patch
@@ -0,0 +1,11 @@
+--- dovecot-2.2.35/src/lib-master/master-service-settings-cache.c      2018-03-21 10:15:09.097480691 +0100
++++ dovecot-2.2.35/src/lib-master/master-service-settings-cache.c~     2018-03-19 10:30:01.000000000 +0100
+@@ -131,7 +131,7 @@ match_local_name(const char *local_name,
+                       return TRUE;
+               local_name = ptr+1;
+       }
+-      return dns_match_wildcard(filter_local_name, local_name) == 0;
++      return dns_match_wildcard(local_name, filter_local_name) == 0;
+ }
+ 
+ /* Remove any elements which there is no filter for */

diff --git a/dovecot.spec b/dovecot.spec
index ec9a7732c26efa5016d444d0c5d7caef42657c26..50235ffe3e7773c653fd038f6fa5b7c3e3dc2bbd 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.35
-Release:       1
+Release:       2
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
@@ -24,7 +24,7 @@ Source3:      %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
-
+Patch2:                %{name}-local_name.patch
 Patch3:                %{name}-disableSSLv3.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
@@ -162,7 +162,7 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 %patch3 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf