- up to 2.3.7.1

diff --git a/dovecot-small_fixes.patch b/dovecot-small_fixes.patch
deleted file mode 100644 (file)
index 2cbd631..0000000
--- a/dovecot-small_fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 25028730cd1b76e373ff989625132d526eea2504 Mon Sep 17 00:00:00 2001
-From: Timo Sirainen <timo.sirainen@open-xchange.com>
-Date: Mon, 15 Jul 2019 10:14:23 +0300
-Subject: [PATCH] lib: ostream-file: Don't log any errors when setting
- TCP_NODELAY
-
-It's likely never useful to log the error, and it seems more and more
-unexpected errors just keep popping up.
----
- src/lib/ostream-file.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
-index e7e6f62d12..82bf729ac0 100644
---- a/src/lib/ostream-file.c
-+++ b/src/lib/ostream-file.c
-@@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream)
- static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream)
- {
-       if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) {
--              if (errno != ENOTSUP && errno != ENOTSOCK &&
--                  errno != ENOPROTOOPT) {
--                      i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m",
--                              o_stream_get_name(&fstream->ostream.ostream));
--              }
-+              /* Don't bother logging errors. There are quite a lot of
-+                 different errors that need to be ignored, and it differs
-+                 between OSes. At least:
-+                 Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT
-+                 FreeBSD: EINVAL, ECONNRESET */
-               fstream->no_socket_nodelay = TRUE;
-       } else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) {
--              /* We already successfully enabled TCP_NODELAY, so we're really
--                 not expecting any errors here. */
--              i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m",
--                      o_stream_get_name(&fstream->ostream.ostream));
-+              /* We already successfully enabled TCP_NODELAY, so there
-+                 shouldn't really be errors. Except ECONNRESET can possibly
-+                 still happen between these two calls, so again don't log
-+                 errors. */
-               fstream->no_socket_nodelay = TRUE;
-       }
- }

diff --git a/dovecot.spec b/dovecot.spec
index a58cf7ec4d1fdc743b259d5198a95cc40f631c36..727de13ae5b7416d8636f0c09bb92c9b5469416a 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -12,20 +12,19 @@
 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.3.7
+Version:       2.3.7.1
 Release:       1
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
 Source0:       http://dovecot.org/releases/2.3/%{name}-%{version}.tar.gz
-# Source0-md5: fe290112b12e95363c2ffc8d043a40a4
+# Source0-md5: 39a565038aa4ae4123f19fce790e5535
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
-Patch2:                dovecot-small_fixes.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -163,7 +162,6 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf