diff --git a/64f4464385bbcd763f90abc5e212c569b9279ffa.patch b/64f4464385bbcd763f90abc5e212c569b9279ffa.patch deleted file mode 100644 index e846809..0000000 --- a/64f4464385bbcd763f90abc5e212c569b9279ffa.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 64f4464385bbcd763f90abc5e212c569b9279ffa Mon Sep 17 00:00:00 2001 -From: Paul Howarth -Date: Mon, 2 Jul 2018 11:52:14 +0100 -Subject: [PATCH] lib-compression: Fix assert-crash in test suite on 32bit - systems - -Fix compilation warnings in test-compression.c due to mismatches -between size_t and uoff_t, which then manifests in assert-crashes -running the test suite on 32bit systems. ---- - src/lib-compression/test-compression.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/lib-compression/test-compression.c b/src/lib-compression/test-compression.c -index 0f7df3d1fe..f62d7d6094 100644 ---- a/src/lib-compression/test-compression.c -+++ b/src/lib-compression/test-compression.c -@@ -20,6 +20,7 @@ static void test_compression_handler(const struct compression_handler *handler) - unsigned char buf[IO_BLOCK_SIZE]; - const unsigned char *data; - size_t size; -+ uoff_t stream_size; - struct sha1_ctxt sha1; - unsigned char output_sha1[SHA1_RESULTLEN], input_sha1[SHA1_RESULTLEN]; - unsigned int i; -@@ -73,11 +74,11 @@ static void test_compression_handler(const struct compression_handler *handler) - file_input = i_stream_create_fd(fd, IO_BLOCK_SIZE); - input = handler->create_istream(file_input, FALSE); - -- test_assert(i_stream_get_size(input, FALSE, &size) == 1); -- test_assert(size == compressed_size); -+ test_assert(i_stream_get_size(input, FALSE, &stream_size) == 1); -+ test_assert(stream_size == compressed_size); - -- test_assert(i_stream_get_size(input, TRUE, &size) == 1); -- test_assert(size == uncompressed_size); -+ test_assert(i_stream_get_size(input, TRUE, &stream_size) == 1); -+ test_assert(stream_size == uncompressed_size); - - sha1_init(&sha1); - for (bool seeked = FALSE;;) { diff --git a/dovecot.spec b/dovecot.spec index bdb377c..0d5e2a4 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -3,7 +3,7 @@ Summary: Secure imap and pop3 server Name: dovecot Epoch: 1 -Version: 2.3.2 +Version: 2.3.2.1 %global prever %{nil} Release: 1%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 @@ -34,9 +34,6 @@ Patch8: dovecot-2.2.20-initbysystemd.patch Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch Patch10: dovecot-2.3.0.1-libxcrypt.patch -# for dovecot <= 2.3.2 -Patch11: 64f4464385bbcd763f90abc5e212c569b9279ffa.patch - Source15: prestartscript BuildRequires: gcc, gcc-c++, openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel @@ -138,7 +135,6 @@ This package provides the development files for dovecot. %patch8 -p1 -b .initbysystemd %patch9 -p1 -b .systemd_w_protectsystem %patch10 -p1 -b .libxcrypt -%patch11 -p1 -b .64f4464385bbcd763f90abc5e212c569b9279ffa #pushd dovecot-2*3-pigeonhole-%{pigeonholever} #popd @@ -501,6 +497,9 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Tue Jul 10 2018 Michal Hlavinka - 1:2.3.2.1-1 +- SSL/TLS servers may have crashed during client disconnection + * Mon Jul 09 2018 Michal Hlavinka - 1:2.3.2-1 - dovecot updated to 2.3.2, pigeonhole to 0.5.2 diff --git a/sources b/sources index 140a873..daab9d6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dovecot-2.3.2.tar.gz) = e040a02226aadfe1a81b89225c11e08d0a1aa7ac51c309a95acbc13beb8c1df8a5c891709c7dde0dfb11af0c0bc8a82d27ffba1fb5d9166379241f945d1e8402 +SHA512 (dovecot-2.3.2.1.tar.gz) = c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7 SHA512 (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c