From 86f7adef689375e00f140460343db222c26d6950 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Mon, 26 Feb 2018 16:14:52 -0600
Subject: [PATCH] Fix squatter segfaults seen in rawhide.

Add patch to fix segfaults in squatter.
Exclude one test on all releases instead of just F28+.
Remove --cleanup from cassandane invocation.
---
 cyrus-imapd.spec | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 73d5e10..7446826 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
 
 Name: cyrus-imapd
 Version: 3.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
 
@@ -42,6 +42,9 @@ Patch4: https://github.com/cyrusimap/cyrus-imapd/commit/1966c22fc4249a1157a4d4c1
 # gcc8 detects a strcpy overflow in master.
 Patch5: https://github.com/elliefm/cyrus-imapd/commit/79244173353d95149ad1944f61cc6bd2e43bd7d4.patch
 
+# Fix squatter segfaults seen on rawhide.
+Patch6: https://github.com/cyrusimap/cyrus-imapd/commit/24af24aa77144e0c1ab976657833b470502be7a8.patch
+
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
 Source12: cyrus-imapd.sysconfig
@@ -478,14 +481,16 @@ tests=(
 
     # Not sure why this one is failing.
     Caldav.changes_remove
+
+    # This fails because of some libical issues
+    JMAPCalendars.getcalendareventlist_datetime
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 
 %if 0%{?fedora} >= 28
-# The update to libical3 caused two additional failures, reported upstream as
+# The update to libical3 caused an additional failure, reported upstream as
 # https://github.com/cyrusimap/cyrus-imapd/issues/2200
 tests=(
-    JMAPCalendars.getcalendareventlist_datetime
     JMAPCalendars.setcalendarevents_recurrenceoverrides
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
@@ -493,7 +498,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
 
 %if 0%{?fedora} <= 27
 tests=(
-    # Without libcal3 or a patch to libical2, the following test will fail
+    # Without libical3 or a patch to libical2, the following test will fail
     # https://github.com/cyrusimap/cyrus-imapd/issues/2048
     JMAPCalendars.setcalendarevents_alerts
     JMAPCalendars.setcalendarevents_endtimezone_recurrence
@@ -530,7 +535,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
 %endif
 
 # Add -vvv for too much output
-./testrunner.pl %{?_smp_mflags} --cleanup -v -f pretty ${exclude[@]} 2>&1
+./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
 
 
 %pre
@@ -639,6 +644,11 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Mon Feb 26 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-5
+- Add patch to fix segfaults in squatter.
+- Exclude one test on all releases instead of just F28+.
+- Remove --cleanup from cassandane invocation.
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild