Update Cassandane again, to fix a broken test.

This should be the last Cassandane update for a while, as later versions
need an unreleased version of Mail::JMAPTalk.
This commit is contained in:
Jason Tibbitts 2018-04-17 13:40:37 -05:00
parent 665fc283a5
commit 78c60e07a3
3 changed files with 10 additions and 5 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/cassandane-2b355ec.tar.gz /cassandane-2b355ec.tar.gz
/cassandane-50a1ec2.tar.gz /cassandane-50a1ec2.tar.gz
/cassandane-389601b.tar.gz /cassandane-389601b.tar.gz
/cassandane-e4e97bb.tar.gz

View File

@ -1,15 +1,17 @@
%define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}}) %define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}})
# Cassandane commit hash. Cassandane doesn't have releases often, but it # Cassandane commit hash. Cassandane doesn't have releases often, but it
# receives constant development. This was fetched on 20180413. # receives constant development. This was fetched on 20180416.
%global cocas 389601b810a4e862ba68d73f46dfae95810caf6e # 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. # Cassandane run by default. '--without cassandane' disables.
%bcond_without cassandane %bcond_without cassandane
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.0.5 Version: 3.0.5
Release: 13%{?dist} Release: 14%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem %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 # 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 # the 3.0.5 codebase. https://github.com/cyrusimap/cassandane/issues/54
Sieve.rfc5490_mailboxexists_variables # This one is actually a Cyrus bug Sieve.rfc5490_mailboxexists_variables # This one is actually a Cyrus bug
Objectid.uniqueid
) )
for i in ${tests[@]}; do exclude+=("!$i"); done 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 %changelog
* Tue Apr 17 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-14
- Update Cassandane again, fixing a broken test.
* Fri Apr 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-13 * Fri Apr 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-13
- Update Cassandane, fixing a few tests and a class of weird random build - Update Cassandane, fixing a few tests and a class of weird random build
failures. failures.

View File

@ -1,3 +1,3 @@
SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420 SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
SHA512 (cyrus-imapd-3.0.5.tar.gz) = 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410 SHA512 (cyrus-imapd-3.0.5.tar.gz) = 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
SHA512 (cassandane-389601b.tar.gz) = e7bfd8dd4b1cfccbf19f7ab26b5ba2a2ab6238f22646f36a4d2a82fe6c6e9ff78697e80f2da6e2a42fbeca754c8a3bf40353e7a53e4e635b198b6fd59567e483 SHA512 (cassandane-e4e97bb.tar.gz) = d8ecedc9255caa327d4631f83b7f48fc13ab9a48803b0a793a44e294f128dc302e92da2d7623e83914591d86231492eedb5359954cbe84eee37d2f7ab4878677