From dfb70b1feae719cce8cf39d3d47e1dafcaf0c571 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 28 Mar 2024 17:06:41 +0300 Subject: [PATCH] import dovecot-2.3.16-11.el9 --- SOURCES/dovecot-2.3.16-d7705bc6.patch | 17 +++++++++++++++++ SPECS/dovecot.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 SOURCES/dovecot-2.3.16-d7705bc6.patch diff --git a/SOURCES/dovecot-2.3.16-d7705bc6.patch b/SOURCES/dovecot-2.3.16-d7705bc6.patch new file mode 100644 index 0000000..4884806 --- /dev/null +++ b/SOURCES/dovecot-2.3.16-d7705bc6.patch @@ -0,0 +1,17 @@ +diff --git a/src/lib-index/mail-index-sync.c b/src/lib-index/mail-index-sync.c +index 6322ee1869..c847f1cc01 100644 +--- a/src/lib-index/mail-index-sync.c ++++ b/src/lib-index/mail-index-sync.c +@@ -544,6 +544,12 @@ static bool mail_index_sync_view_have_any(struct mail_index_view *view, + return TRUE; + + mail_transaction_log_get_head(view->index->log, &log_seq, &log_offset); ++ if (log_seq < view->map->hdr.log_file_seq || ++ ((log_seq == view->map->hdr.log_file_seq && ++ log_offset < view->map->hdr.log_file_tail_offset))) { ++ /* invalid offsets - let the syncing handle the error */ ++ return TRUE; ++ } + if (mail_transaction_log_view_set(view->log_view, + view->map->hdr.log_file_seq, + view->map->hdr.log_file_tail_offset, diff --git a/SPECS/dovecot.spec b/SPECS/dovecot.spec index e200b85..c9983f2 100644 --- a/SPECS/dovecot.spec +++ b/SPECS/dovecot.spec @@ -6,7 +6,7 @@ Name: dovecot Epoch: 1 Version: 2.3.16 %global prever %{nil} -Release: 10%{?dist} +Release: 11%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT and LGPLv2 @@ -55,6 +55,9 @@ Patch21: dovecot-2.3.19.1-7bad6a24.patch Patch22: dovecot-2.3.18-bdf447e4.patch Patch23: dovecot-2.3.18-9f300239..4596d399.patch +# from upstream, for < 2.3.21, RHEL-25434 +Patch24: dovecot-2.3.16-d7705bc6.patch + BuildRequires: gcc, gcc-c++, openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel BuildRequires: libtool, autoconf, automake, pkgconfig BuildRequires: sqlite-devel @@ -152,6 +155,7 @@ This package provides the development files for dovecot. %patch -P 20 -p1 -b .ftbfsbigend %patch -P 21 -p1 -b .7bad6a24 %patch -P 22 -p1 -b .bdf447e4 +%patch -P 24 -p1 -b .d7705bc6 cp run-test-valgrind.supp dovecot-2.3-pigeonhole-%{pigeonholever}/ # valgrind would fail with shell wrapper echo "testsuite" >dovecot-2.3-pigeonhole-%{pigeonholever}/run-test-valgrind.exclude @@ -490,6 +494,9 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Fri Feb 16 2024 Michal Hlavinka - 1:2.3.16-11 +- fixes assert-crash when IMAP client uses QRESYNC (#RHEL-25434) + * Tue Aug 15 2023 Michal Hlavinka - 1:2.3.16-10 - fix leaking mailboxes if virtual mailbox can't be opened (#2231408)