From a67b6f4731e1404e3a2aabb658d1501a982f04c5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 9 Nov 2021 05:01:03 -0500 Subject: [PATCH] import cyrus-imapd-3.0.7-23.el8 --- SPECS/cyrus-imapd.spec | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/SPECS/cyrus-imapd.spec b/SPECS/cyrus-imapd.spec index e8a0f97..40a3718 100644 --- a/SPECS/cyrus-imapd.spec +++ b/SPECS/cyrus-imapd.spec @@ -9,7 +9,7 @@ Name: cyrus-imapd Version: 3.0.7 -Release: 20%{?dist}.1 +Release: 23%{?dist} %define ssl_pem_file_prefix /etc/pki/%name/%name @@ -91,21 +91,18 @@ Source92: patch-cassandane-fix-annotator Source93: cyrus-imapd-master_rename.patch - BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool BuildRequires: pkgconfig systemd transfig BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) BuildRequires: perl(Pod::Html) -%if 0%{?fedora} && 0%{?fedora} >= 0 -BuildRequires: clamav-devel xapian-core-devel shapelib-devel -%endif BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel BuildRequires: openldap-devel openssl-devel postgresql-devel BuildRequires: sqlite-devel +BuildRequires: xapian-core-devel # Miscellaneous modules needed for 'make check' to function: BuildRequires: cyrus-sasl-plain cyrus-sasl-md5 @@ -301,8 +298,8 @@ autoreconf -vi --enable-nntp \ --enable-replication \ --enable-unit-tests \ -%if 0%{?fedora} && 0%{?fedora} >= 0 --enable-xapian \ +%if 0%{?fedora} && 0%{?fedora} >= 0 --with-clamav \ %endif # @@ -475,6 +472,10 @@ find %buildroot -name ".packlist" -exec rm {} \; imaptest -h 2>&1 > /dev/null || (echo "Imaptest is not functional" && exit 1) make %{?_smp_mflags} check || exit 1 +%ifarch ppc64le %ix86 +exit 0 +%endif + %if %{without cassandane} exit 0 %endif @@ -530,6 +531,9 @@ tests=( # This one needs a patch to xapian. # https://github.com/cyrusimap/cyrus-imapd/issues/2348 SearchFuzzy.search_subjectsnippet + + # this one is not working on builder machines + Conversations.xconvfetch ) for i in ${tests[@]}; do exclude+=("!$i"); done @@ -681,8 +685,13 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog -* Sat Aug 28 2021 Pavel Zhukov - 3.0.7-20.1 -- Fix for CVE-2021-33582 +* Wed Sep 01 2021 Tomas Korbar - 3.0.7-23 +- Fix CVE-2021-33582 +- Also disable unstable test +- Resolves: CVE-2021-33582 + +* Thu May 27 2021 Pavel Zhukov - 3.0.7-22 +- rebuild with xapian support * Fri Nov 6 2020 Pavel Zhukov - 3.0.7-20 - Use PROFILE=SYSTEM as default configuration for tls_ciphers