Kolab Groupware OBS

cyrus-imapd.spec Changed

@@ -38,13 +38,13 @@
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 Version:            2.5
-Release:            0.1.dev20141003.git44e8e7f7%{?dist}
+Release:            0.1.dev20141007.gitd8beae4e%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
 
 # Upstream sources
-# From 44e8e7f7d0e16cc6005441709fc7c02e7032d6b3
+# From d8beae4e3a9490b0435caee22ddae313b8f4b17b
 Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{_name}-%{real_version}%{?dot_snapshot_version}.tar.gz
 Source1:            cyrus-imapd.imap-2.3.x-conf
 Source2:            cyrus-imapd.cvt_cyrusdb_all
@@ -78,7 +78,10 @@
 BuildRequires:      autoconf
 BuildRequires:      automake
 BuildRequires:      bison
+BuildRequires:      CUnit-devel
 BuildRequires:      cyrus-sasl-devel
+BuildRequires:      cyrus-sasl-md5
+BuildRequires:      cyrus-sasl-plain
 
 %if 0%{?with_bdb}
 %if 0%{?suse_version}
@@ -112,7 +115,7 @@
 BuildRequires:      libical-devel
 %endif
 
-%if 0%{?suse_version} || 0%{?rhel} > 5
+%if 0%{?suse_version} || 0%{?rhel} > 5 || 0%{?fedora}
 BuildRequires:      libtool
 %endif
 
@@ -262,6 +265,10 @@
 #%patch0001 -p1
 %patch0002 -p1
 
+%if 0%{?with_bdb} < 1
+sed -i -e 's/,berkeley//g' cunit/db.testc
+%endif
+
 # only to update config.* files
 aclocal -I cmulocal
 libtoolize --install
@@ -307,6 +314,7 @@
     --enable-netscapehack \
     --enable-nntp \
     --enable-replication \
+    --enable-unit-tests \
 %if 0
     --enable-xapian \
 %endif
@@ -462,6 +470,9 @@
 %{__rm} -f %{buildroot}%{_mandir}/man8/syncnews.8*
 find %{buildroot}%{perl_vendorarch} -type f -name "*.bs" -exec %{__rm} -vf {} \;
 
+%check
+make check
+
 %clean
 %{__rm} -rf %{buildroot}

cyrus-imapd-2.5.tar.gz/imap/mboxevent.c Changed

@@ -128,9 +128,10 @@
     /* 21 */ { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
     /* 22 */ { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
     /* 23 */ { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
-    /* 24 */ { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
+    /* 24 */ { EVENT_SESSIONID, "vnd.cmu.sessionId", EVENT_PARAM_STRING, 0, 0 },
+    /* 25 */ { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
     /* always at end to let the parser to easily truncate this part */
-    /* 25 */ { EVENT_MESSAGE_CONTENT, "messageContent", EVENT_PARAM_STRING, 0, 0 }
+    /* 26 */ { EVENT_MESSAGE_CONTENT, "messageContent", EVENT_PARAM_STRING, 0, 0 }
   },
   STRARRAY_INITIALIZER, { 0, 0 }, NULL, STRARRAY_INITIALIZER, NULL, NULL, NULL
 };
@@ -257,6 +258,9 @@
 
     FILL_UNSIGNED_PARAM(mboxevent, EVENT_PID, getpid());
 
+    if (mboxevent_expected_param(type, EVENT_SESSIONID))
+	FILL_STRING_PARAM(mboxevent, EVENT_SESSIONID, xstrdup(session_id()));
+
     return mboxevent;
 }
 
@@ -401,12 +405,19 @@
     case EVENT_PID:
 	return 1;
     case EVENT_USER:
-	return type & (EVENT_MAILBOX_SUBSCRIBE|EVENT_MAILBOX_UNSUBSCRIBE|\
-		       EVENT_LOGIN|EVENT_LOGOUT);
+	return (
+		type & MESSAGE_EVENTS ||
+		type & FLAGS_EVENTS ||
+		type & MAILBOX_EVENTS ||
+		type & SUBS_EVENTS ||
+		type & (EVENT_LOGIN|EVENT_LOGOUT|EVENT_QUOTA_CHANGE)
+	    );
     case EVENT_MIDSET:
 	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_MIDSET))
 	    return 0;
 	break;
+    case EVENT_SESSIONID:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_SESSIONID;
     case EVENT_UNSEEN_MESSAGES:
 	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_UNSEENMESSAGES))
 	    return 0;

cyrus-imapd-2.5.tar.gz/imap/mboxevent.h Changed

cyrus-imapd-2.5.tar.gz/lib/imapoptions Changed

cyrus-imapd.dsc Changed

debian.changelog Changed

Changes of Revision 99