diff --git a/.gitignore b/.gitignore index ba52616..4b3cdf2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cassandane-2b355ec.tar.gz /cassandane-50a1ec2.tar.gz /cassandane-389601b.tar.gz +/cassandane-e4e97bb.tar.gz diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index c9792ee..af2d3cf 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,15 +1,17 @@ %define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}}) # Cassandane commit hash. Cassandane doesn't have releases often, but it -# receives constant development. This was fetched on 20180413. -%global cocas 389601b810a4e862ba68d73f46dfae95810caf6e +# receives constant development. This was fetched on 20180416. +# Note that this cannot be updated to a newer version without Mail::JMAPTalk +# 0.11 which as of 20180417 has not yet been released. +%global cocas e4e97bb3613a33d4c229d2843288515ad6d78305 # Cassandane run by default. '--without cassandane' disables. %bcond_without cassandane Name: cyrus-imapd Version: 3.0.5 -Release: 13%{?dist} +Release: 14%{?dist} %define ssl_pem_file /etc/pki/%name/%name.pem @@ -479,7 +481,6 @@ tests=( # These are newly (20180411) added tests which don't seem to work against # the 3.0.5 codebase. https://github.com/cyrusimap/cassandane/issues/54 Sieve.rfc5490_mailboxexists_variables # This one is actually a Cyrus bug - Objectid.uniqueid ) for i in ${tests[@]}; do exclude+=("!$i"); done @@ -630,6 +631,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog +* Tue Apr 17 2018 Jason L Tibbitts III - 3.0.5-14 +- Update Cassandane again, fixing a broken test. + * Fri Apr 13 2018 Jason L Tibbitts III - 3.0.5-13 - Update Cassandane, fixing a few tests and a class of weird random build failures. diff --git a/sources b/sources index 0116412..35e97ec 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420 SHA512 (cyrus-imapd-3.0.5.tar.gz) = 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410 -SHA512 (cassandane-389601b.tar.gz) = e7bfd8dd4b1cfccbf19f7ab26b5ba2a2ab6238f22646f36a4d2a82fe6c6e9ff78697e80f2da6e2a42fbeca754c8a3bf40353e7a53e4e635b198b6fd59567e483 +SHA512 (cassandane-e4e97bb.tar.gz) = d8ecedc9255caa327d4631f83b7f48fc13ab9a48803b0a793a44e294f128dc302e92da2d7623e83914591d86231492eedb5359954cbe84eee37d2f7ab4878677