Update Cassandane and re-check tests.

This commit is contained in:
Jason Tibbitts 2018-05-30 14:30:15 -05:00
parent 90c5977457
commit 3fca7a6b6f
4 changed files with 5722 additions and 2 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/cassandane-389601b.tar.gz
/cassandane-e4e97bb.tar.gz
/cassandane-00bfe01.tar.gz
/cassandane-8776dd6.tar.gz

5711
57.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
# Cassandane commit hash. Cassandane doesn't have releases often, but it
# receives constant development. This was fetched on 20180518.
%global cocas 00bfe0109f80437ed09154aca9fbd53eef8f1b09
%global cocas 8776dd697fa78af69876a127f2d6a9ee12c13a2f
# Cassandane run by default. '--without cassandane' disables.
%bcond_without cassandane
@ -76,6 +76,8 @@ Source91: patch-cassandane-no-syslog
# Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
Source92: patch-cassandane-fix-annotator
Source93: https://patch-diff.githubusercontent.com/raw/cyrusimap/cassandane/pull/57.patch
BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool
BuildRequires: pkgconfig systemd transfig
@ -208,6 +210,7 @@ tar xf %SOURCE81
patch -p1 < %SOURCE91
patch -p1 < %SOURCE92
patch -p1 < %SOURCE93
cp %SOURCE82 cassandane.ini
# RF rpm-buildroot-usage
@ -432,6 +435,8 @@ export CYRUS_USER=$USER
# ---------------------------------------------------------
exclude=()
tests=(
# This exclusion list was verified on 2018-05-30.
# This is more a test of system performance and according to upstream won't
# be reliable on shared hardware like our builders.
Metronome
@ -597,6 +602,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
* Wed May 30 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-3
- Remove ldconfig scriptlets.
- Remove F26-specific test exclusions.
- Update Cassandane checkout.
- Add extra Cassandane patch from https://github.com/cyrusimap/cassandane/pull/57
- Revalidate the excluded test list.
* Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-2
- Really enable mysql and clamav support.

View File

@ -1,3 +1,3 @@
SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
SHA512 (cyrus-imapd-3.0.7.tar.gz) = 6f9af658df6ae6e4463bb52c672c7e8d49482c8e5542985825f099ea8b76291d1598a2a5c92711ae642b0d053c5168792f1832eeb15d1fdeb4b8d2efcfb4d9b9
SHA512 (cassandane-00bfe01.tar.gz) = 96f2ca6cbf36c8f9df2b4762ca572b5ba597ca305408f992d6671cba2845f990c8d3cf35ae91ea44da9ea825c9b4c6b1e5fb314b27c31cf4c63805699ab46ab6
SHA512 (cassandane-8776dd6.tar.gz) = 9dc7c2a05b70f16f875079ab510cf5af68f04f5237a7a56a9307797fdca97770c4317bba106bff149d19bb7deca9adc161bed3903502a73dc5587aa5b293d72a