From 75681df8ebe7ae22a13997dcc5aa452fc0c8ecdc Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Tue, 5 Sep 2017 16:34:36 +0200
Subject: [PATCH] New version 3.0.4

---
 cyrus-imapd.imap-2.5.x-conf        | 24 ------------------------
 cyrus-imapd.spec                   |  9 ++++++++-
 patch-cassandane-unknown_calendars | 13 +++++++++++++
 rpmlint.cf                         |  1 -
 sources                            |  4 ++--
 5 files changed, 23 insertions(+), 28 deletions(-)
 delete mode 100644 cyrus-imapd.imap-2.5.x-conf
 create mode 100644 patch-cassandane-unknown_calendars
 delete mode 100644 rpmlint.cf

diff --git a/cyrus-imapd.imap-2.5.x-conf b/cyrus-imapd.imap-2.5.x-conf
deleted file mode 100644
index 1c4137d..0000000
--- a/cyrus-imapd.imap-2.5.x-conf
+++ /dev/null
@@ -1,24 +0,0 @@
-configdirectory: /var/lib/imap
-partition-default: /var/spool/imap
-admins: cyrus
-sievedir: /var/lib/imap/sieve
-sendmail: /usr/sbin/sendmail
-hashimapspool: true
-sasl_pwcheck_method: saslauthd
-sasl_mech_list: PLAIN LOGIN
-allowplaintext: no
-defaultdomain: mail
-
-# These three files will automatically be generated by sustemd
-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
-
-# Support system-wide crypto policy
-# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
-# https://bugzilla.redhat.com/show_bug.cgi?id=1179212
-# Comment out the below line to revert to the compiled-in default of "DEFAULT".
-tls_ciphers: PROFILE=SYSTEM
-
-# uncomment this if you're operating in a DSCP environment (RFC-4594)
-# qosmarking: af13
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 77e80cc..7c6eccf 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -8,7 +8,7 @@
 %bcond_without cassandane
 
 Name: cyrus-imapd
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
@@ -70,6 +70,7 @@ Source91: patch-cassandane-no-syslog
 # Tell the annotator script to run as the current user/group
 # Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
 Source92: patch-cassandane-fix-annotator
+Source93: patch-cassandane-unknown_calendars
 
 # Dependency notes:
 # * clamav-devel and mariadb-devel removed because they both depend on
@@ -211,6 +212,8 @@ tar xf %SOURCE81
 
 patch -p1 < %SOURCE91
 patch -p1 < %SOURCE92
+patch -p1 < %SOURCE93
+
 cp %SOURCE82 cassandane.ini
 # RF rpm-buildroot-usage
 sed -i \
@@ -606,6 +609,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Tue Sep 05 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 3.0.4-1
+- Update to 3.0.4
+- Patched cassandane for new behaviour. It should be updated idealy.
+
 * Fri Aug 11 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.3-1
 - Update to 3.0.3, which contains an important security fix.  The fix is not
   embargoed but no CVE has been assigned yet.
diff --git a/patch-cassandane-unknown_calendars b/patch-cassandane-unknown_calendars
new file mode 100644
index 0000000..676ef68
--- /dev/null
+++ b/patch-cassandane-unknown_calendars
@@ -0,0 +1,13 @@
+diff --git a/Cassandane/Cyrus/JMAPCalendars.pm b/Cassandane/Cyrus/JMAPCalendars.pm
+index 2179a26..2cf6fa6 100644
+--- a/Cassandane/Cyrus/JMAPCalendars.pm
++++ b/Cassandane/Cyrus/JMAPCalendars.pm
+@@ -1811,7 +1811,7 @@ sub test_setcalendarevents_move
+                             "calendarId" => "nope",
+                         }
+                     }}, "R1"]]);
+-    $self->assert_str_equals($res->[0][1]{notUpdated}{$id}{type}, "calendarNotFound");
++    $self->assert_str_equals($res->[0][1]{notUpdated}{$id}{type}, "invalidProperties");
+     $self->assert_str_equals($res->[0][1]{newState}, $state);
+ 
+     xlog "get calendar $id from untouched calendar $calidA";
diff --git a/rpmlint.cf b/rpmlint.cf
deleted file mode 100644
index f974735..0000000
--- a/rpmlint.cf
+++ /dev/null
@@ -1 +0,0 @@
-addFilter('hardcoded-library-path in %_prefix/lib/%name')
diff --git a/sources b/sources
index a62d6ea..704048a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
 SHA512 (cassandane-6d33978.tar.gz) = aafc2a98d49f86b00f5b1af649ce63157c8d0652502248271ca14e6f000aebf6eca8931a6e33cc068e37fdd086e9dc4cdc90cf7eccfdda63dfd73c733d75fc40
-SHA512 (cyrus-imapd-3.0.3.tar.gz) = 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df
+SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
+SHA512 (cyrus-imapd-3.0.4.tar.gz) = 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a