The package rpms/cyrus-imapd.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cyrus-imapd.git/commit/?id=cdeac9....
Change:
+%ifarch i686 armv7hl
Thanks.
Full change:
============
commit cbf887e2291e16905b875af44240b4098ff394ca
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu Jun 29 17:18:13 2017 -0500
Remove old cassandane release from sources.
diff --git a/sources b/sources
index fd09790..cbc048c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
SHA512 (cassandane-testdata-20170523.tar.gz) =
705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
-SHA512 (cassandane-2f8f3f4.tar.gz) =
b949155b85e30a9cabd5992806fafe78a462662297398e8a74856f345c063769e5e419d01777e08c1f326622244181667ead47a057e38b1974ec121e7913a955
SHA512 (cyrus-imapd-3.0.2.tar.gz) =
95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d
SHA512 (cassandane-6d33978.tar.gz) =
aafc2a98d49f86b00f5b1af649ce63157c8d0652502248271ca14e6f000aebf6eca8931a6e33cc068e37fdd086e9dc4cdc90cf7eccfdda63dfd73c733d75fc40
commit a52db490734add094b968fec194218d3c437da30
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Wed Jun 28 15:56:07 2017 -0500
Set specialusealways: 1 in the default config.
Upstream will be changing the default for this soon. Making this
explicit in our configuration may save confusion down the line.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index d4b82de..3a9ba8e 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -649,6 +649,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Wed Jun 28 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-4
+- Explicitly set specialusealways: 1 in the default config.
+
* Tue Jun 27 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-3
- Patch the provided imapd.conf and cyrus.conf to more closely match previous
Fedora defaults and directories included in this package and to enable
diff --git a/patch-cyrus-default-configs b/patch-cyrus-default-configs
index 6a7be9e..a4edf10 100644
--- a/patch-cyrus-default-configs
+++ b/patch-cyrus-default-configs
@@ -23,7 +23,7 @@ index 4ce2c0f..3b1e6d7 100644
EVENTS {
diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf
-index 95b54e9..0eaae55 100644
+index 95b54e9..3935b77 100644
--- a/doc/examples/imapd_conf/normal.conf
+++ b/doc/examples/imapd_conf/normal.conf
@@ -10,7 +10,7 @@ admins: cyrus
@@ -84,7 +84,7 @@ index 95b54e9..0eaae55 100644
###################################################################
## User experience settings
-@@ -72,6 +69,10 @@ defaultdomain: localhost
+@@ -72,6 +69,14 @@ defaultdomain: localhost
# Minimum time between POP mail fetches in minutes
popminpoll: 1
@@ -92,10 +92,14 @@ index 95b54e9..0eaae55 100644
+conversations: 1
+conversations_db: twoskip
+
++# This will default to on in 3.1, and improves compatibility with some Apple
++# devices. Upstream
https://github.com/cyrusimap/cyrus-imapd/issues/1556
++specialusealways: 1
++
###################################################################
## User Authentication settings
###################################################################
-@@ -99,6 +100,12 @@ sasl_auto_transition: no
+@@ -99,6 +104,12 @@ sasl_auto_transition: no
## SSL/TLS Options
###################################################################
commit 31ed5b96078e0a4ac18b68313d4e083993fd6971
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jun 27 20:24:56 2017 -0500
Actually commit the tempfiles.conf file.
diff --git a/cyrus-imapd.tmpfiles.conf b/cyrus-imapd.tmpfiles.conf
new file mode 100644
index 0000000..14a2791
--- /dev/null
+++ b/cyrus-imapd.tmpfiles.conf
@@ -0,0 +1,5 @@
+d /run/cyrus 0750 cyrus mail -
+d /run/cyrus/db 0700 cyrus mail -
+d /run/cyrus/lock 0700 cyrus mail -
+d /run/cyrus/proc 0700 cyrus mail -
+d /run/cyrus/socket 0750 cyrus mail -
commit 3a7252404461eb05f91372275dae31a2ce6f49a8
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jun 27 20:20:43 2017 -0500
Patch default configs; add tmpfiles.d config.
Patch the default configuration file to enable the full supported
functionality of the build, and to more closely match the defaults from
older Fedora packages.
Add a tmpfiles.d configuration file to properly create the directories
under /run which upstream is now using. Also create and own those
directories properly.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 3e628ba..d4b82de 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -35,6 +35,8 @@ Patch1: patch-cyrus-managesieve-linking
# Upstream
https://github.com/cyrusimap/cyrus-imapd/issues/2039
Patch2: patch-cyrus-pkgconfig-file
+# Fedora-specific patch for the default configuration file
+Patch3: patch-cyrus-default-configs
Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config
@@ -46,6 +48,7 @@ Source15: cyrus-imapd.cron-daily
Source16: README.rpm
Source17: cyrus-imapd.service
Source18: cyrus-imapd-init.service
+Source19: cyrus-imapd.tmpfiles.conf
# Source files for running the Cassandane test suite at build time.
Source80:
https://github.com/cyrusimap/cassandane/archive/%cmt1.tar.gz#/cassandane-...
%cmt1}.tar.gz
@@ -310,6 +313,15 @@ install -d \
%buildroot/%cyrexecdir \
%buildroot/etc/pki/%name
+install -d -m 0750 \
+ %buildroot/run/cyrus \
+ %buildroot/run/cyrus/socket
+
+install -d -m 0700 \
+ %buildroot/run/cyrus/db \
+ %buildroot/run/cyrus/lock \
+ %buildroot/run/cyrus/proc
+
# Some tools which aren't installed by the makefile which we have always installed
install -m 755 notifyd/notifytest %buildroot%_bindir/
install -m 755 perl/imap/cyradm %buildroot%_bindir/
@@ -338,15 +350,7 @@ install -p -m 644 doc/examples/cyrus_conf/prefork.conf
%buildroot/etc/cyrus.conf
install -p -m 644 doc/examples/imapd_conf/normal.conf %buildroot/etc/imapd.conf
install -p -D -m 644 %SOURCE17 %buildroot/%_unitdir/cyrus-imapd.service
install -p -D -m 644 %SOURCE18 %buildroot/%_unitdir/cyrus-imapd-init.service
-
-cat >> %buildroot/etc/imapd.conf <<END
-
-# These three files will automatically be generated by the systemd unit when
-# the service starts for the first time.
-tls_cert_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_key_file: /etc/pki/cyrus-imapd/cyrus-imapd-key.pem
-tls_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
-END
+install -p -D -m 644 %SOURCE19 %buildroot/%_tmpfilesdir/cyrus-imapd.conf
# Cleanup of doc dir
find doc perl -name CVS -type d -prune -exec rm -rf {} \;
@@ -397,7 +401,7 @@ mv %buildroot/%_mandir/man8/pop3d.8
%buildroot/%_mandir/man8/pop3d.8cyrus
mv %buildroot/%_mandir/man8/master.8 %buildroot/%_mandir/man8/master.8cyrus
# Rename 'httpd' manpage to avoid clash with Apache
-mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/cyr_httpd.8
+mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/httpd.8cyrus
# Old cyrus packages used to keep some executables in /usr/lib/cyrus-imapd
# RF hardcoded-library-path in %%buildroot/usr/lib/cyrus-imapd
@@ -569,6 +573,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%dir /etc/pki/cyrus-imapd
%attr(0640,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size
mtime) %ssl_pem_file
+
%config(noreplace) /etc/cyrus.conf
%config(noreplace) /etc/imapd.conf
%config(noreplace) /etc/logrotate.d/cyrus-imapd
@@ -578,11 +583,16 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c
"Cyrus IMAP Server" -d /v
/etc/cron.daily/cyrus-imapd
%_unitdir/cyrus-imapd.service
%_unitdir/cyrus-imapd-init.service
+%_tmpfilesdir/cyrus-imapd.conf
%dir %cyrexecdir/
%cyrexecdir/[a-uw-z]*
-%attr(0750,%cyrususer,%cyrusgroup) %dir /var/lib/imap
+# This creates some directories which in the default configuration cyrus will
+# never use because they are placed under /run instead. However, old
+# configurations or setup advice from the 'net might reference them, and so
+# it's simpler to just leave them in the package.
+%attr(0750,%cyrususer,%cyrusgroup) %dir /var/lib/imap/
%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/backup/
%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/db/
%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/log/
@@ -599,6 +609,13 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/user/
%attr(0700,%cyrususer,%cyrusgroup) /var/spool/imap/
+# The new locations
+%attr(0750,%cyrususer,%cyrusgroup) %dir /run/cyrus/
+%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/db/
+%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/lock/
+%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/proc/
+%attr(0750,%cyrususer,%cyrusgroup) /run/cyrus/socket/
+
%files devel
%_includedir/cyrus/
@@ -632,6 +649,12 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Tue Jun 27 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-3
+- Patch the provided imapd.conf and cyrus.conf to more closely match previous
+ Fedora defaults and directories included in this package and to enable
+ features which are supported by the Fedora build.
+- Add tmpfiles.d configuration file for directories in /run.
+
* Tue Jun 27 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-2
- Exclude one more test from 32-bit arches. Looks like this failure crept in
with the Cassandane update.
diff --git a/patch-cyrus-default-configs b/patch-cyrus-default-configs
new file mode 100644
index 0000000..6a7be9e
--- /dev/null
+++ b/patch-cyrus-default-configs
@@ -0,0 +1,110 @@
+diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
+index 4ce2c0f..3b1e6d7 100644
+--- a/doc/examples/cyrus_conf/prefork.conf
++++ b/doc/examples/cyrus_conf/prefork.conf
+@@ -19,15 +19,15 @@ SERVICES {
+ # nntps cmd="nntpd -s" listen="nntps" prefork=1
+
+ # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
+-# http cmd="httpd" listen="http" prefork=3
+-# https cmd="httpd -s" listen="https" prefork=1
++ http cmd="httpd" listen="http" prefork=3
++ https cmd="httpd -s" listen="https" prefork=1
+
+ # at least one LMTP is required for delivery
+ # lmtp cmd="lmtpd" listen="lmtp" prefork=0
+- lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp"
prefork=1
++ lmtpunix cmd="lmtpd" listen="/run/cyrus/socket/lmtp"
prefork=1
+
+ # this is only necessary if using notifications
+-# notify cmd="notifyd" listen="/var/imap/socket/notify"
proto="udp" prefork=1
++# notify cmd="notifyd" listen="/run/cyrus/socket/notify"
proto="udp" prefork=1
+ }
+
+ EVENTS {
+diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf
+index 95b54e9..0eaae55 100644
+--- a/doc/examples/imapd_conf/normal.conf
++++ b/doc/examples/imapd_conf/normal.conf
+@@ -10,7 +10,7 @@ admins: cyrus
+ ###################################################################
+
+ # Configuration directory
+-configdirectory: /var/lib/cyrus
++configdirectory: /var/lib/imap
+
+ # Directories for proc and lock files
+ proc_path: /run/cyrus/proc
+@@ -19,18 +19,18 @@ mboxname_lockpath: /run/cyrus/lock
+ # Locations for DB files
+ # The following DB are recreated upon initialization, so should live in
+ # ephemeral storage for best performance.
+-duplicate_db_path: /run/cyrus/deliver.db
+-ptscache_db_path: /run/cyrus/ptscache.db
+-statuscache_db_path: /run/cyrus/statuscache.db
+-tls_sessions_db_path: /run/cyrus/tls_sessions.db
++duplicate_db_path: /run/cyrus/db/deliver.db
++ptscache_db_path: /run/cyrus/db/ptscache.db
++statuscache_db_path: /run/cyrus/db/statuscache.db
++tls_sessions_db_path: /run/cyrus/db/tls_sessions.db
+
+ # Which partition to use for default mailboxes
+ defaultpartition: default
+-partition-default: /var/spool/cyrus/mail
++partition-default: /var/spool/imap
+
+ # If sieveusehomedir is false (the default), this directory is searched
+ # for Sieve scripts.
+-sievedir: /var/spool/sieve
++sievedir: /var/lib/imap/sieve
+
+ ###################################################################
+ ## Important: KEEP THESE IN SYNC WITH cyrus.conf
+@@ -51,19 +51,16 @@ syslog_prefix: cyrus
+ # Space-separated list of HTTP modules that will be enabled in
+ # httpd(8). This option has no effect on modules that are disabled at
+ # compile time due to missing dependencies (e.g. libical).
+-#
+-# Allowed values: caldav, carddav, domainkey, ischedule, rss
+-httpmodules: caldav carddav
++# Fedora default: enable all modules besides admin
++httpmodules: caldav carddav domainkey freebusy isschedule jmap rss tzdist webdav
+
+ # If enabled, the partitions will also be hashed, in addition to the
+ # hashing done on configuration directories. This is recommended if one
+ # partition has a very bushy mailbox tree.
+ hashimapspool: true
+
+-# Enable virtual domains
+-# and set default domain to localhost
+-virtdomains: yes
+-defaultdomain: localhost
++# Disable virtual domains by default
++virtdomains: off
+
+ ###################################################################
+ ## User experience settings
+@@ -72,6 +69,10 @@ defaultdomain: localhost
+ # Minimum time between POP mail fetches in minutes
+ popminpoll: 1
+
++# Conversation support is required for jmap
++conversations: 1
++conversations_db: twoskip
++
+ ###################################################################
+ ## User Authentication settings
+ ###################################################################
+@@ -99,6 +100,12 @@ sasl_auto_transition: no
+ ## SSL/TLS Options
+ ###################################################################
+
++# These three files will automatically be generated by the systemd unit when
++# the service starts for the first time.
++tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
++tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd-key.pem
++tls_client_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
++
+ # File containing the global certificate used for ALL services (imap,
+ # pop3, lmtp, sieve)
+ #tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
commit cdeac93ae70af323579fc28462567423af3dc3f7
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jun 27 14:39:38 2017 -0500
Disable one test on 32-bit machines.
I failed to notice that the Cassandane update had caused an additional
failure on 32-bit, reported upstream as
https://github.com/cyrusimap/cyrus-imapd/issues/2042
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index c8402cf..3e628ba 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -478,6 +478,15 @@ tests=(
)
for i in ${tests[@]}; do exclude+=("!$i"); done
+%ifarch i686 armv7hl
+# Just this one test is now failing on 32-bit machines. I'm not sure why.
+#
https://github.com/cyrusimap/cyrus-imapd/issues/2042
+tests=(
+ JMAPCalendars.setcalendarevents_recurrence
+)
+for i in ${tests[@]}; do exclude+=("!$i"); done
+%endif
+
%ifarch ppc64 s390x
# Some failures only on big-endian machines for some reason
# Reported upstream at
https://github.com/cyrusimap/cyrus-imapd/issues/2040
@@ -623,6 +632,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Tue Jun 27 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-2
+- Exclude one more test from 32-bit arches. Looks like this failure crept in
+ with the Cassandane update.
+
* Thu Jun 22 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-1
- Update to 3.0.2.
- New Cassandane snapshot, with more tests (all of which are passing).
commit a1d17f04c3340d3ad0bcc4d55fc5306648db3406
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jun 27 10:31:15 2017 -0500
Update Cassandane and test lists
Pull in a newer Cassandane snapshot and clean up the test lists. Down
to just five tests to figure out, plus nine that only fail on big-endian
machines which I've asked upstream to look into.
diff --git a/.gitignore b/.gitignore
index b170ba4..56fc631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/cassandane-b97ba9c.tar.gz
/cassandane-0a6c13e.tar.gz
/cassandane-2f8f3f4.tar.gz
+/cassandane-6d33978.tar.gz
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index f1d2d70..c8402cf 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,8 +1,8 @@
%define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}})
# Cassandane doesn't have releases often, but it receives constant development.
-# This was fetched on 20170530.
-%global cmt1 2f8f3f4949e58bf20362c3cd8b1720f49002660d
+# This was fetched on 20170622
+%global cmt1 6d33978ebb0055be41a5cb8e52958e100401bf26
# Cassandane run by default. '--without cassandane' disables.
%bcond_without cassandane
@@ -431,11 +431,10 @@ exit 0
%ifarch s390x
# Unfortunately s390x is simply too slow to reliably run the test suite right
# now. The suite brings up and tears down a complete cyrus environment for
-# each test, and the builders are simply unable to handle this reliably right
-# now. Tests will simply fail randomly, and playing whack-a-mole with every
-# potential failure when a build takes seven hours is just too much.
-# s390x-specific test information is still present below in case situation
-# improves.
+# each test, and the builders are simply unable to handle this reliably. Tests
+# will simply fail randomly, and playing whack-a-mole with every potential
+# failure when a build takes seven hours is just too much. s390x-specific test
+# information is still present below in case situation improves.
exit 0
%endif
@@ -444,10 +443,10 @@ exit 0
# Sadly Cassandane simply can't run on a 32-bit host at the moment. It needs
# Perl to be compiled with support for 64-bit types, and due to an unfortunate
# typo in the Perl specfile, that's not the case currently.
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1268828
-# There may be other Cassandane issues, so occasional testing on 32-bit
-# architectures is needed until this is all resolved.
-# Tracked upstream as
https://github.com/cyrusimap/cassandane/issues/21
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1268828 There may be other
+# Cassandane issues, so occasional testing on 32-bit architectures is needed
+# until this is all resolved. Tracked upstream as
+#
https://github.com/cyrusimap/cassandane/issues/21
pushd cassandane
mkdir -p imaptest/src
@@ -468,61 +467,28 @@ export CYRUS_USER=$USER
# and are more for testing system performance than for testing Cyrus itself.
exclude=('!Cassandane::Test::Core' '!Metronome')
-# The below non-arch-specific excluded tests are expected to fail n 3.0.1 and
+# The below non-arch-specific excluded tests are expected to fail in 3.0.2 and
# should be removed and re-checked at each release.
tests=(
- Admin.imap_admins Fetch.fetch_flags_before_exists Quota.num_folders_rename
- SearchFuzzy.cjk_words SearchFuzzy.xattachmentname
+ Admin.imap_admins
+ SearchFuzzy.cjk_words
+ JMAPCalendars.setcalendarevents_alerts
+ JMAPCalendars.setcalendarevents_locations
+ JMAPCalendars.setcalendarevents_recurrenceoverrides
)
for i in ${tests[@]}; do exclude+=("!$i"); done
-tests=(
- creationids
- getcalendareventlist
- getcalendareventlist_date
- getcalendareventlist_datetime
- getcalendareventlist_text
- getcalendarevents_privacy
- getcalendarevents_properties
- getcalendarevents_relatedto
- getcalendarevents_simple
- getcalendareventupdates
- setcalendarevents_alerts
- setcalendarevents_caldav
- setcalendarevents_endtimezone
- setcalendarevents_endtimezone_recurrence
- setcalendarevents_isallday
- setcalendarevents_links
- setcalendarevents_localizations
- setcalendarevents_locations
- setcalendarevents_move
- setcalendarevents_participantid
- setcalendarevents_participants
- setcalendarevents_prodid
- setcalendarevents_recurrenceoverrides
- setcalendarevents_relatedto
- setcalendarevents_recurrence
- setcalendarevents_schedule_cancel
- setcalendarevents_schedule_reply
- setcalendarevents_schedule_request
- setcalendarevents_simple
-)
-for i in ${tests[@]}; do exclude+=("!JMAPCalendars.$i"); done
-tests=(
- getmessagelist_attachments
- getmessagelist_window
- getmessages_attachment_name
- getmessages_body_nontext
- setmailboxes_destroy_empty
- setmessages_attachments
-)
-for i in ${tests[@]}; do exclude+=("!JMAPMail.$i"); done
%ifarch ppc64 s390x
-# Some failures only on little-endian machines for some reason
+# Some failures only on big-endian machines for some reason
+# Reported upstream at
https://github.com/cyrusimap/cyrus-imapd/issues/2040
tests=(
+ JMAPCalendars.getcalendareventlist
+ JMAPCalendars.getcalendareventupdates
+ JMAPCalendars.setcalendarevents_recurrence
JMAPContacts.getcontactgroupupdates
JMAPContacts.getcontactupdates
JMAPMail.getmailboxupdates
+ JMAPMail.getmessagelist_window
JMAPMail.getmessageupdates
JMAPMail.getthreadupdates
)
@@ -659,6 +625,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
* Thu Jun 22 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-1
- Update to 3.0.2.
+- New Cassandane snapshot, with more tests (all of which are passing).
* Tue Jun 20 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.1-7
- Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink
diff --git a/sources b/sources
index b73eb74..fd09790 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (cassandane-testdata-20170523.tar.gz) =
705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
SHA512 (cassandane-2f8f3f4.tar.gz) =
b949155b85e30a9cabd5992806fafe78a462662297398e8a74856f345c063769e5e419d01777e08c1f326622244181667ead47a057e38b1974ec121e7913a955
SHA512 (cyrus-imapd-3.0.2.tar.gz) =
95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d
+SHA512 (cassandane-6d33978.tar.gz) =
aafc2a98d49f86b00f5b1af649ce63157c8d0652502248271ca14e6f000aebf6eca8931a6e33cc068e37fdd086e9dc4cdc90cf7eccfdda63dfd73c733d75fc40
commit eef1e2a1c55b77184b6a4e76a441e985b18bf92e
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu Jun 22 10:46:13 2017 -0500
Add new patch file.
diff --git a/patch-cyrus-pkgconfig-file b/patch-cyrus-pkgconfig-file
new file mode 100644
index 0000000..ff98849
--- /dev/null
+++ b/patch-cyrus-pkgconfig-file
@@ -0,0 +1,10 @@
+diff --git a/libcyrus.pc.in b/libcyrus.pc.in
+index 572436b..81cc640 100644
+--- a/libcyrus.pc.in
++++ b/libcyrus.pc.in
+@@ -5,4 +5,4 @@ Cflags: @SSL_CPPFLAGS@ @SASLFLAGS@
+ Version: @PACKAGE_VERSION@
+ Requires.private: libcyrus_min = @PACKAGE_VERSION@
+ Libs: -lcyrus
+-Libs.private: @LIB_RT@ @LIB_SASL@ @SSL_LIBS@
++Libs.private: @LIB_SASL@ @SSL_LIBS@
commit 8662054558685d2cddc3ba7365310ee15f6ed311
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu Jun 22 10:44:44 2017 -0500
Initial update to 3.0.2.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 91f936a..f1d2d70 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -8,8 +8,8 @@
%bcond_without cassandane
Name: cyrus-imapd
-Version: 3.0.1
-Release: 7%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -26,25 +26,15 @@ License: BSD
URL:
http://www.cyrusimap.org/
Source0:
http://www.cyrusimap.org/releases/%name-%version.tar.gz
-# Patches to fix some test suite issues
-# Upstream ticket
https://github.com/cyrusimap/cyrus-imapd/issues/1993
-Patch0: patch-cyrus-testsuite-endianness
-Patch1: patch-cyrus-testsuite-endianness2
-Patch2: patch-cyrus-testsuite-endianness3
-Patch3: patch-cyrus-testsuite-endianness4
-Patch4: patch-cyrus-fix-endianness-checks
-
# Adapt a timeout to handle our slower builders
-Patch5: patch-cyrus-testsuite-timeout
-
-# Upstream
https://github.com/cyrusimap/cyrus-imapd/issues/1994
-Patch6: patch-cyrus-autoreconf-keep-version
+Patch0: patch-cyrus-testsuite-timeout
# Upstream
https://github.com/cyrusimap/cyrus-imapd/issues/2026
-Patch7: patch-cyrus-managesieve-linking
+Patch1: patch-cyrus-managesieve-linking
+
+# Upstream
https://github.com/cyrusimap/cyrus-imapd/issues/2039
+Patch2: patch-cyrus-pkgconfig-file
-# Upstream
https://github.com/cyrusimap/cassandane/issues/21
-Patch8: patch-cyrus-32bit-reconstruct
Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config
@@ -261,8 +251,7 @@ popd
# --with-cyrus-prefix and --with-service-path went away; use --with-libexecdir=
# instead.
-# Running autoreconf will confuse the program about what version it is.
-autoreconf -vi
+#autoreconf -vi
%configure \
--disable-silent-rules \
@@ -321,12 +310,10 @@ install -d \
%buildroot/%cyrexecdir \
%buildroot/etc/pki/%name
-# Some tools which aren't installed by the makefile which we want
+# Some tools which aren't installed by the makefile which we have always installed
install -m 755 notifyd/notifytest %buildroot%_bindir/
install -m 755 perl/imap/cyradm %buildroot%_bindir/
-for i in arbitronsort.pl convert-sieve.pl dohash masssievec \
- migrate-metadata mkimap mknewsgroups mupdate-loadgen.pl \
- rehash translatesieve undohash upgradesieve; do
+for i in arbitronsort.pl masssievec mkimap mknewsgroups rehash translatesieve; do
install -m 755 tools/$i %buildroot/%cyrexecdir/
done
@@ -670,6 +657,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Thu Jun 22 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.2-1
+- Update to 3.0.2.
+
* Tue Jun 20 2017 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.1-7
- Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink
there to the deliver binary. This should help a bit with migrations.
diff --git a/patch-cyrus-32bit-reconstruct b/patch-cyrus-32bit-reconstruct
deleted file mode 100644
index d7497ab..0000000
--- a/patch-cyrus-32bit-reconstruct
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/imap/mailbox.c b/imap/mailbox.c
-index e7498c0..8b6f406 100644
---- a/imap/mailbox.c
-+++ b/imap/mailbox.c
-@@ -5425,7 +5425,7 @@ static int find_files(struct mailbox *mailbox, struct found_uids
*files,
- }
-
- /* make sure UIDs are sorted for comparison */
-- qsort(files->found, files->nused, sizeof(unsigned long), sort_found);
-+ qsort(files->found, files->nused, sizeof(files->found[0]), sort_found);
-
- strarray_fini(&paths);
-
-@@ -6206,7 +6206,7 @@ static int find_annots(struct mailbox *mailbox, struct found_uids
*annots)
- if (r) return r;
-
- /* make sure UIDs are sorted for comparison */
-- qsort(annots->found, annots->nused, sizeof(unsigned long), sort_found);
-+ qsort(annots->found, annots->nused, sizeof(annots->found[0]), sort_found);
-
- return 0;
- }
diff --git a/patch-cyrus-autoreconf-keep-version b/patch-cyrus-autoreconf-keep-version
deleted file mode 100644
index a515915..0000000
--- a/patch-cyrus-autoreconf-keep-version
+++ /dev/null
@@ -1,53 +0,0 @@
-From 216934c3f4884999206715db3499fc0162e1d65c Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie(a)fastmail.com>
-Date: Tue, 30 May 2017 17:52:04 +1000
-Subject: [PATCH] build: preserve release version across autoreconf
-
-Administrators building from a release tarball can safely run
-autoreconf without the source tree forgetting its version (or
-worse, scavenging an unrelated version string from some git
-repository in an ancestor directory).
----
- Makefile.am | 6 +++++-
- tools/git-version.sh | 4 ++++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 9a4fa49be..e37822aac 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -116,7 +116,8 @@ noinst_HEADERS =
- noinst_LTLIBRARIES =
- noinst_PROGRAMS =
- EXTRA_DIST = \
-- $(wildcard tools/vzic/*)
-+ $(wildcard tools/vzic/*) \
-+ VERSION
-
- if COM_ERR
- COMPILE_ET_DEP = com_err/et/compile_et
-@@ -1910,6 +1911,9 @@ dist-hook:
- find $(top_distdir) -type f -name .sphinx-build.stamp -delete
- rm -rf $(top_distdir)/$(SPHINX_CACHE)
-
-+VERSION: tools/git-version.sh
-+ $(AM_V_GEN)$< > $@.NEW && mv $@.NEW $@
-+
- install-data-hook:
- if CMULOCAL
- $(INSTALL) -m 644 $(top_srcdir)/depot/depot.conf $(DESTDIR)/
-diff --git a/tools/git-version.sh b/tools/git-version.sh
-index 66563c162..c728769db 100755
---- a/tools/git-version.sh
-+++ b/tools/git-version.sh
-@@ -41,6 +41,10 @@
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-
-+# if we've come from a release package, ignore git entirely
-+test -s VERSION &&
-+ exec head -1 VERSION
-+
- # first try: based on annotated git tags (real releases)
- version=$(git describe --dirty=-dirty 2>/dev/null)
- test -n "$version" &&
diff --git a/patch-cyrus-fix-endianness-checks b/patch-cyrus-fix-endianness-checks
deleted file mode 100644
index 7d518b2..0000000
--- a/patch-cyrus-fix-endianness-checks
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/lib/crc32.c b/lib/crc32.c
-index c42e7d6..4193f0f 100644
---- a/lib/crc32.c
-+++ b/lib/crc32.c
-@@ -611,7 +611,7 @@ static const uint32_t crc32_lookup[16][256] =
- }
- };
-
--#ifndef LITTLE_ENDIAN
-+#if BYTE_ORDER != LITTLE_ENDIAN
- /* swap endianness */
- static uint32_t swap(uint32_t x)
- {
-@@ -634,7 +634,7 @@ static uint32_t crc32_slice8(uint32_t prev, const void *data, size_t
length)
-
- /* process eight bytes at once (Slicing-by-8) */
- while (length >= 8) {
--#ifdef LITTLE_ENDIAN
-+#if BYTE_ORDER == LITTLE_ENDIAN
- uint32_t one = *current++ ^ crc;
- uint32_t two = *current++;
- crc = crc32_lookup[0][(two>>24) & 0xFF] ^
-@@ -682,7 +682,7 @@ static uint32_t crc32_slice16(uint32_t prev, const void *data, size_t
length)
- while (length >= bytes_at_once) {
- size_t unrolling;
- for (unrolling = 0; unrolling < unroll; unrolling++) {
--#ifdef LITTLE_ENDIAN
-+#if BYTE_ORDER == LITTLE_ENDIAN
- uint32_t one = *current++ ^ crc;
- uint32_t two = *current++;
- uint32_t three = *current++;
-diff --git a/lib/crc32c.c b/lib/crc32c.c
-index e33e793..66fc16e 100644
---- a/lib/crc32c.c
-+++ b/lib/crc32c.c
-@@ -591,7 +591,7 @@ static const uint32_t crc32c_lookup[4][256] = {
- },
- };
-
--#ifndef LITTLE_ENDIAN
-+#if BYTE_ORDER != LITTLE_ENDIAN
- /* swap endianness */
- static uint32_t swap(uint32_t x)
- {
-@@ -615,7 +615,7 @@ static uint32_t crc32c_sw(uint32_t crc, const void *buf, size_t len)
{
-
- /* process four bytes at once (slicing-by-4) */
- while (len >= 4) {
--#ifdef LITTLE_ENDIAN
-+#if BYTE_ORDER == LITTLE_ENDIAN
- crc1 = *cur++ ^ crc0;
- crc0 = crc32c_lookup[0][(crc1>>24) & 0xff] ^
- crc32c_lookup[1][(crc1>>16) & 0xff] ^
-diff --git a/lib/xsha1.c b/lib/xsha1.c
-index 1c4547e..6e41eee 100644
---- a/lib/xsha1.c
-+++ b/lib/xsha1.c
-@@ -89,7 +89,7 @@ struct _SHA_CTX {
- /* blk0() and blk() perform the initial expand. */
- /* I got the idea of expanding during the round function from SSLeay */
-
--#ifdef LITTLE_ENDIAN
-+#if BYTE_ORDER == LITTLE_ENDIAN
- #define blk0(i) (block->l[i] = (rol(block->l[i],24)&(sha1_quadbyte)0xFF00FF00)
\
- |(rol(block->l[i],8)&(sha1_quadbyte)0x00FF00FF))
- #else
diff --git a/patch-cyrus-managesieve-linking b/patch-cyrus-managesieve-linking
index 1b1b8e0..26aa92b 100644
--- a/patch-cyrus-managesieve-linking
+++ b/patch-cyrus-managesieve-linking
@@ -1,18 +1,5 @@
-diff --git a/perl/sieve/managesieve/Makefile.PL b/perl/sieve/managesieve/Makefile.PL
-index d817ce3..870cb7e 100644
---- a/perl/sieve/managesieve/Makefile.PL
-+++ b/perl/sieve/managesieve/Makefile.PL
-@@ -69,7 +69,7 @@ WriteMakefile(
- 'ABSTRACT' => 'Cyrus Sieve management interface',
- 'VERSION_FROM' =>
"../../../perl/sieve/managesieve/managesieve.pm", # finds $VERSION
- 'MYEXTLIB' => '../lib/.libs/libisieve.a
../../../perl/.libs/libcyrus.a ../../../perl/.libs/libcyrus_min.a',
-- 'LIBS' => ["$LIB_SASL -lssl -lcrypto -lssl -lcrypto -luuid
-lz"],
-+ 'LIBS' => ["$LIB_SASL -lssl -lcrypto -lssl -lcrypto -luuid -lz
-lsqlite3 -lpq"],
- 'CCFLAGS' => '',
- 'DEFINE' => '-DPERL_POLLUTE', # e.g.,
'-DHAVE_SOMETHING'
- 'INC' => "-I../../../lib -I../../../perl/sieve
-I../../../perl/sieve/lib ",
diff --git a/perl/sieve/managesieve/Makefile.PL.in
b/perl/sieve/managesieve/Makefile.PL.in
-index 45ae8ea..9fd0b12 100644
+index 45ae8ea..14d5327 100644
--- a/perl/sieve/managesieve/Makefile.PL.in
+++ b/perl/sieve/managesieve/Makefile.PL.in
@@ -69,7 +69,7 @@ WriteMakefile(
diff --git a/patch-cyrus-testsuite-endianness b/patch-cyrus-testsuite-endianness
deleted file mode 100644
index 2f54012..0000000
--- a/patch-cyrus-testsuite-endianness
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cunit/timeout.c b/cunit/timeout.c
-index f02c9ac..a444ac8 100644
---- a/cunit/timeout.c
-+++ b/cunit/timeout.c
-@@ -197,7 +197,7 @@ int timeout_init(void (*cb)(void))
-
- int timeout_begin(int millisec)
- {
-- int c;
-+ char c;
- int r;
-
- // fprintf(stderr, "timeout_begin\n");
-@@ -220,7 +220,7 @@ int timeout_begin(int millisec)
-
- int timeout_end(void)
- {
-- int c;
-+ char c;
- int r;
-
- // fprintf(stderr, "timeout_end\n");
diff --git a/patch-cyrus-testsuite-endianness2 b/patch-cyrus-testsuite-endianness2
deleted file mode 100644
index 01dc84b..0000000
--- a/patch-cyrus-testsuite-endianness2
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/imap/conversations.c b/imap/conversations.c
-index 504c5db..2b151dc 100644
---- a/imap/conversations.c
-+++ b/imap/conversations.c
-@@ -560,11 +560,14 @@ EXPORTED int conversations_get_msgid(struct conversations_state
*state,
- &data, &datalen,
- &state->txn);
-
-+ if (r == CYRUSDB_NOTFOUND)
-+ return 0; /* not an error, but nothing more to do */
-+
- if (!r) r = _conversations_parse(data, datalen, cids, NULL);
-
- if (r) arrayu64_truncate(cids, 0);
-
-- return 0;
-+ return r;
- }
-
- /*
diff --git a/patch-cyrus-testsuite-endianness3 b/patch-cyrus-testsuite-endianness3
deleted file mode 100644
index 5ba6c26..0000000
--- a/patch-cyrus-testsuite-endianness3
+++ /dev/null
@@ -1,58 +0,0 @@
-From e3ee582fcf74e0754d2a850fbabe270125e334e8 Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie(a)fastmail.com>
-Date: Wed, 31 May 2017 10:56:27 +1000
-Subject: [PATCH] cunit: run cyrusdb tests first
-
-Other suites depend on cyrusdb functionality so if it's broken, it
-would be good to know that before they start complaining.
----
- Makefile.am | 2 +-
- cunit/{db.testc => aaa-db.testc} | 0
- doc/internal/unit-tests.html | 2 +-
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename cunit/{db.testc => aaa-db.testc} (100%)
-
-diff --git a/Makefile.am b/Makefile.am
-index e37822aac..c2c82d15d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -618,6 +618,7 @@ cunit_FRAMEWORK = \
- cunit/timeofday.h
-
- cunit_TESTS = \
-+ cunit/aaa-db.testc \
- cunit/annotate.testc \
- cunit/backend.testc \
- cunit/binhex.testc \
-@@ -628,7 +629,6 @@ cunit_TESTS = \
- cunit/command.testc \
- cunit/conversations.testc \
- cunit/crc32.testc \
-- cunit/db.testc \
- cunit/dlist.testc \
- cunit/duplicate.testc \
- cunit/getxstring.testc \
-diff --git a/cunit/db.testc b/cunit/aaa-db.testc
-similarity index 100%
-rename from cunit/db.testc
-rename to cunit/aaa-db.testc
-diff --git a/doc/internal/unit-tests.html b/doc/internal/unit-tests.html
-index a2c490dfb..75a945853 100644
---- a/doc/internal/unit-tests.html
-+++ b/doc/internal/unit-tests.html
-@@ -452,6 +452,7 @@
- of the <tt>cunit_TESTS</tt> variable.</p>
-
- <blockquote class="src">cunit_TESTS = \
-+ cunit/aaa-db.testc \
- cunit/annotate.testc \
- cunit/backend.testc \
- cunit/binhex.testc \
-@@ -460,7 +461,6 @@
- cunit/byteorder64.testc \
- cunit/charset.testc \
- cunit/<b>crc32</b>.testc \
-- cunit/db.testc \
- cunit/dlist.testc \
- cunit/duplicate.testc \
- </blockquote>
diff --git a/patch-cyrus-testsuite-endianness4 b/patch-cyrus-testsuite-endianness4
deleted file mode 100644
index 2d2544e..0000000
--- a/patch-cyrus-testsuite-endianness4
+++ /dev/null
@@ -1,218 +0,0 @@
-From 443e54646bc529654bc4bb2d58ddde9751f43fe2 Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie(a)fastmail.com>
-Date: Mon, 29 May 2017 15:35:38 +1000
-Subject: [PATCH] cunit/conversations: conversations_open_path failures are
- fatal
-
----
- cunit/conversations.testc | 48 +++++++++++++++++++++++------------------------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/cunit/conversations.testc b/cunit/conversations.testc
-index 026d271c9..85562cbed 100644
---- a/cunit/conversations.testc
-+++ b/cunit/conversations.testc
-@@ -22,7 +22,7 @@ static void test_open(void)
- struct conversations_state *state = NULL;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- r = conversations_abort(&state);
- CU_ASSERT_EQUAL(r, 0);
-@@ -38,7 +38,7 @@ static void test_getset(void)
- arrayu64_t cids = ARRAYU64_INITIALIZER;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* Database is empty, so get should succeed and report no results */
- memset(&cid, 0x45, sizeof(cid));
-@@ -62,7 +62,7 @@ static void test_getset(void)
- CU_ASSERT_EQUAL(r, 0);
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* get should still succeed after the db is closed & reopened */
- memset(&cid, 0x45, sizeof(cid));
-@@ -87,7 +87,7 @@ static void test_abort(void)
- arrayu64_t cids = ARRAYU64_INITIALIZER;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* Database is empty, so get should succeed and report no results */
- memset(&cid, 0x45, sizeof(cid));
-@@ -113,7 +113,7 @@ static void test_abort(void)
-
- /* open the db again */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* the set vanished with the txn abort, so get should
- * succeed and report no results */
-@@ -147,7 +147,7 @@ static void test_prune(void)
- unsigned int nseen = 0, ndeleted = 0;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* Add keys, with delays in between */
- /* TODO: CUnit needs a time warping system */
-@@ -174,7 +174,7 @@ static void test_prune(void)
- /* Should be able to get all 3 msgids */
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- memset(&cid, 0x45, sizeof(cid));
- arrayu64_truncate(&cids, 0);
-@@ -247,10 +247,10 @@ static void test_two(void)
- arrayu64_t cids = ARRAYU64_INITIALIZER;
-
- r = conversations_open_path(DBNAME, &state1);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- r = conversations_open_path(DBNAME2, &state2);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* Databases are empty, so gets of either msgid from either db
- * should succeed and report no results */
-@@ -385,8 +385,8 @@ static void test_folder_rename(void)
- conv_folder_t *folder;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-- CU_ASSERT_PTR_NOT_NULL(state);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-+ CU_ASSERT_PTR_NOT_NULL_FATAL(state);
-
- /* setup the records we expect */
- r = conversations_add_msgid(state, C_MSGID1, C_CID);
-@@ -420,7 +420,7 @@ static void test_folder_rename(void)
-
- /* open the db again */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* do a rename */
- r = conversations_rename_folder(state, FOLDER2, FOLDER3);
-@@ -432,7 +432,7 @@ static void test_folder_rename(void)
-
- /* open the db again */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- conv = NULL;
- r = conversation_load(state, C_CID, &conv);
-@@ -475,7 +475,7 @@ static void test_folders(void)
- imapopts[IMAPOPT_CONVERSATIONS_COUNTED_FLAGS].val.s = "\\Draft
$HasRandom";
-
- r = conversations_open_path(DBNAME3, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- imapopts[IMAPOPT_CONVERSATIONS_COUNTED_FLAGS].val.s = NULL;
-
-@@ -672,7 +672,7 @@ static void test_folders(void)
-
- /* open the db again */
- r = conversations_open_path(DBNAME3, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* get should still succeed and report all values we gave it */
- conv = NULL;
-@@ -805,7 +805,7 @@ static void test_folder_ordering(void)
- int *counts = 0;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* Database is empty, so get should succeed and report no results */
- conv = NULL;
-@@ -903,7 +903,7 @@ static void test_folder_ordering(void)
-
- /* open the db again */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* get should still succeed and report all values we gave it */
- conv = NULL;
-@@ -956,7 +956,7 @@ static void __test_senders(void)
- int *counts = 0;
-
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* Database is empty, so get should succeed and report no results */
- conv = NULL;
-@@ -1045,7 +1045,7 @@ static void __test_senders(void)
-
- /* open the db again */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- /* get should still succeed and report all values we gave it */
- conv = NULL;
-@@ -1150,7 +1150,7 @@ static void test_dump(void)
-
- /* generate some data in the database */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- for (i = 0 ; i < N_MSGID_TO_CID ; i++) {
- gen_msgid_cid(i, msgid, sizeof(msgid), &cid);
-@@ -1179,7 +1179,7 @@ static void test_dump(void)
-
- /* open and dump the database */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- conversations_dump(state, fp);
-
-@@ -1198,7 +1198,7 @@ static void test_dump(void)
-
- /* open and truncate the database */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- r = conversations_truncate(state);
- CU_ASSERT_EQUAL(r, 0);
-@@ -1208,7 +1208,7 @@ static void test_dump(void)
-
- /* check we can no longer find any of the data */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- for (i = 0 ; i < N_MSGID_TO_CID ; i++) {
- gen_msgid_cid(i, msgid, sizeof(msgid), &cid);
-@@ -1234,7 +1234,7 @@ static void test_dump(void)
-
- /* finally check that we got all the data back */
- r = conversations_open_path(DBNAME, &state);
-- CU_ASSERT_EQUAL(r, 0);
-+ CU_ASSERT_EQUAL_FATAL(r, 0);
-
- for (i = 0 ; i < N_MSGID_TO_CID ; i++) {
- gen_msgid_cid(i, msgid, sizeof(msgid), &cid);
diff --git a/sources b/sources
index ab5590a..b73eb74 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (cassandane-testdata-20170523.tar.gz) =
705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
-SHA512 (cyrus-imapd-3.0.1.tar.gz) =
0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337
SHA512 (cassandane-2f8f3f4.tar.gz) =
b949155b85e30a9cabd5992806fafe78a462662297398e8a74856f345c063769e5e419d01777e08c1f326622244181667ead47a057e38b1974ec121e7913a955
+SHA512 (cyrus-imapd-3.0.2.tar.gz) =
95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d