Projects
Kolab:3.4
cyrus-imapd
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 53
View file
cyrus-imapd-2.5-acl-change-notifications.patch
Deleted
@@ -1,140 +0,0 @@ -diff -ur cyrus-imapd-2.5.orig/imap/mboxevent.c cyrus-imapd-2.5/imap/mboxevent.c ---- cyrus-imapd-2.5.orig/imap/mboxevent.c 2014-01-17 15:43:56.000000000 +0100 -+++ cyrus-imapd-2.5/imap/mboxevent.c 2014-03-06 12:41:39.024681874 +0100 -@@ -77,7 +77,7 @@ - - #define MAILBOX_EVENTS (EVENT_MAILBOX_CREATE|EVENT_MAILBOX_DELETE|\ - EVENT_MAILBOX_RENAME|EVENT_MAILBOX_SUBSCRIBE|\ -- EVENT_MAILBOX_UNSUBSCRIBE) -+ EVENT_MAILBOX_UNSUBSCRIBE|EVENT_ACL_CHANGE) - - #define QUOTA_EVENTS (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN|EVENT_QUOTA_CHANGE) - -@@ -124,6 +124,8 @@ - { EVENT_CONVEXISTS, "vnd.fastmail.convExists", EVENT_PARAM_INT, 0, 0 }, - { EVENT_CONVUNSEEN, "vnd.fastmail.convUnseen", EVENT_PARAM_INT, 0, 0 }, - { EVENT_UIDNEXT, "uidnext", EVENT_PARAM_INT, 0, 0 }, -+ { EVENT_ACL_SUBJECT, "aclSubject", EVENT_PARAM_STRING, 0, 0 }, -+ { EVENT_ACL_RIGHTS, "aclRights", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_UIDSET, "uidset", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_MIDSET, "vnd.cmu.midset", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_FLAG_NAMES, "flagNames", EVENT_PARAM_STRING, 0, 0 }, -@@ -186,7 +188,7 @@ - enabled_events |= FLAGS_EVENTS; - - if (groups & IMAP_ENUM_EVENT_GROUPS_ACCESS) -- enabled_events |= (EVENT_LOGIN|EVENT_LOGOUT); -+ enabled_events |= (EVENT_LOGIN|EVENT_LOGOUT|EVENT_ACL_CHANGE); - - if (groups & IMAP_ENUM_EVENT_GROUPS_MAILBOX) - enabled_events |= MAILBOX_EVENTS; -@@ -411,6 +413,10 @@ - return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_SERVICE; - case EVENT_TIMESTAMP: - return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_TIMESTAMP; -+ case EVENT_ACL_SUBJECT: -+ return type & EVENT_ACL_CHANGE; -+ case EVENT_ACL_RIGHTS: -+ return type & EVENT_ACL_CHANGE; - case EVENT_UIDNEXT: - if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_UIDNEXT)) - return 0; -@@ -941,6 +947,16 @@ - } - } - -+EXPORTED void mboxevent_set_acl(struct mboxevent *event, const char *identifier, -+ const char *rights) -+{ -+ if (!event) -+ return; -+ -+ FILL_STRING_PARAM(event, EVENT_ACL_SUBJECT, xstrdup(identifier)); -+ FILL_STRING_PARAM(event, EVENT_ACL_RIGHTS, xstrdup(rights)); -+} -+ - EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event, - struct mailbox *mailbox) - { -@@ -1119,6 +1135,8 @@ - return "MailboxSubscribe"; - case EVENT_MAILBOX_UNSUBSCRIBE: - return "MailboxUnSubscribe"; -+ case EVENT_ACL_CHANGE: -+ return "AclChange"; - default: - fatal("Unknown message event", EC_SOFTWARE); - } -@@ -1322,6 +1340,12 @@ - { - } - -+EXPORTED void mboxevent_set_acl(struct mboxevent *event __attribute__((unused)), -+ const char *identifier __attribute__((unused)), -+>.......>.......>.......>.......const char *rights __attribute__((unused))) -+{ -+} -+ - EXPORTED void mboxevent_extract_record(struct mboxevent *event __attribute__((unused)), - struct mailbox *mailbox __attribute__((unused)), - struct index_record *record __attribute__((unused))) -Only in cyrus-imapd-2.5/imap: mboxevent.c.orig -Only in cyrus-imapd-2.5/imap: mboxevent.c.rej -diff -ur cyrus-imapd-2.5.orig/imap/mboxevent.h cyrus-imapd-2.5/imap/mboxevent.h ---- cyrus-imapd-2.5.orig/imap/mboxevent.h 2014-01-17 15:43:56.000000000 +0100 -+++ cyrus-imapd-2.5/imap/mboxevent.h 2014-03-06 12:38:43.101620707 +0100 -@@ -80,7 +80,8 @@ - EVENT_MAILBOX_RENAME = (1<<17), - EVENT_MAILBOX_SUBSCRIBE = (1<<18), - EVENT_MAILBOX_UNSUBSCRIBE = (1<<19), -- EVENT_CALENDAR = (1<<20) -+ EVENT_CALENDAR = (1<<20), -+ EVENT_ACL_CHANGE = (1<<21) - }; - - /* -@@ -108,6 +109,8 @@ - EVENT_UIDNEXT, - EVENT_UIDSET, - EVENT_MIDSET, -+ EVENT_ACL_SUBJECT, -+ EVENT_ACL_RIGHTS, - EVENT_FLAG_NAMES, - EVENT_PID, - EVENT_USER, -@@ -219,6 +222,13 @@ - void mboxevent_set_access(struct mboxevent *event, - const char *serveraddr, const char *clientaddr, - const char *userid, const char *mailboxname); -+ -+/* -+ * Shortcut to setting event notification parameters -+ */ -+void mboxevent_set_acl(struct mboxevent *event, const char *identifier, -+ const char *rights); -+ - /* - * Extract data from the given record to fill these event parameters : - * - uidset from UID -Only in cyrus-imapd-2.5/imap: mboxevent.h.orig -Only in cyrus-imapd-2.5/imap: mboxevent.h.rej -diff -ur cyrus-imapd-2.5.orig/imap/mboxlist.c cyrus-imapd-2.5/imap/mboxlist.c ---- cyrus-imapd-2.5.orig/imap/mboxlist.c 2014-01-17 15:43:56.000000000 +0100 -+++ cyrus-imapd-2.5/imap/mboxlist.c 2014-03-06 12:35:43.266620528 +0100 -@@ -1841,6 +1841,15 @@ - name, cyrusdb_strerror(r)); - r = IMAP_IOERROR; - } -+ -+ /* send a AclChange event notification */ -+ struct mboxevent *mboxevent = mboxevent_new(EVENT_ACL_CHANGE); -+ mboxevent_extract_mailbox(mboxevent, mailbox); -+ mboxevent_set_acl(mboxevent, identifier, rights); -+ -+ mboxevent_notify(mboxevent); -+ mboxevent_free(&mboxevent); -+ - } - - /* 4. Change backup copy (cyrus.header) */ -Only in cyrus-imapd-2.5/imap: mboxlist.c.orig
View file
cyrus-imapd-2.5-autoconf-2.63.patch
Deleted
@@ -1,12 +0,0 @@ -diff -ur cyrus-imapd-2.5.orig/configure.ac cyrus-imapd-2.5/configure.ac ---- cyrus-imapd-2.5.orig/configure.ac 2013-02-25 07:03:18.000000000 +0000 -+++ cyrus-imapd-2.5/configure.ac 2013-02-26 13:03:36.091893406 +0000 -@@ -47,7 +47,7 @@ - - - AC_INIT([cyrus-imapd], [2.5], [http://bugzilla.cyrusimap.org],,[http://www.cyrusimap.org]) --AC_PREREQ([2.67]) -+AC_PREREQ([2.63]) - AC_CONFIG_SRCDIR([imap/imapd.c]) - AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([cmulocal])
View file
cyrus-imapd-2.5-disable-user-parameter-notifyd.patch
Deleted
@@ -1,26 +0,0 @@ -diff --git a/notifyd/notify_external.c b/notifyd/notify_external.c -index 250375c..5f71071 100644 ---- a/notifyd/notify_external.c -+++ b/notifyd/notify_external.c -@@ -71,15 +71,15 @@ char* notify_external(const char *class, const char *priority, - - /* check/parse options */ - if (!(notify = config_getstring(IMAPOPT_NOTIFY_EXTERNAL))) { -- syslog(LOG_ERR, "ERROR: recipient not specified"); -- return strdup("NO external recipient not specified"); -+ syslog(LOG_ERR, "ERROR: external recipient (program) not specified"); -+ return strdup("NO external recipient (program) not specified"); - } - -- if (!*user) { -- syslog(LOG_ERR, "ERROR: recipient not specified"); -- return strdup("NO external recipient not specified"); -+/* if (!*user) { -+ syslog(LOG_ERR, "ERROR: external recipient user not specified"); -+ return strdup("NO external recipient user not specified"); - } -- -+*/ - buf[0] = notify; - buf[1] = "-c"; - buf[2] = class;
View file
cyrus-imapd-2.5-lt-prereq.patch
Deleted
@@ -1,11 +0,0 @@ -diff -ur cyrus-imapd-2.5.0001-autoconf-2.63/configure.ac cyrus-imapd-2.5/configure.ac ---- cyrus-imapd-2.5.0001-autoconf-2.63/configure.ac 2013-02-26 13:03:36.091893406 +0000 -+++ cyrus-imapd-2.5/configure.ac 2013-02-26 13:12:41.502351167 +0000 -@@ -126,7 +126,6 @@ - #define HIDDEN - #endif]) - --LT_PREREQ([2.2.6]) - LT_INIT([disable-static]) - AC_SUBST([LIBTOOL_DEPS]) -
View file
cyrus-imapd-2.5-return-0-to-make-function-nonvoid.patch
Deleted
@@ -1,11 +0,0 @@ -diff -ur cyrus-imapd-2.5.orig/imap/xapian_wrap.cpp cyrus-imapd-2.5/imap/xapian_wrap.cpp ---- cyrus-imapd-2.5.orig/imap/xapian_wrap.cpp 2014-01-17 15:43:56.000000000 +0100 -+++ cyrus-imapd-2.5/imap/xapian_wrap.cpp 2014-02-14 15:30:20.465490493 +0100 -@@ -285,6 +285,7 @@ - catch (const Xapian::Error &err) { - syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s", - err.get_context().c_str(), err.get_description().c_str()); -+ return 0; - } - } -
View file
cyrus-imapd-2.5-shared-folder-deletion.patch
Deleted
@@ -1,20 +0,0 @@ -diff --git a/imap/mboxname.c b/imap/mboxname.c -index 5aeee6f..de8386f 100644 ---- a/imap/mboxname.c -+++ b/imap/mboxname.c -@@ -535,7 +535,15 @@ static int mboxname_toexternal(struct namespace *namespace, const char *mboxname - - if (mbparts.box) - strcat(result, "."); -+ } else { -+ /* shared mailbox */ -+ if (mbparts.is_deleted) { -+ const char *dp = config_getstring(IMAPOPT_DELETEDPREFIX); -+ sprintf(result, "%s.", dp); -+ } - } -+ -+ - if (mbparts.box) - strcat(result, mbparts.box); -
View file
cyrus-imapd-2.5-with-dav-ifdefs.patch
Deleted
@@ -1,262 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 8b227ea..204dfab 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1184,7 +1184,6 @@ dist_man_MANS = \ - man/deliver.8 \ - man/fetchnews.8 \ - man/fud.8 \ -- man/httpd.8 \ - man/idled.8 \ - man/imapd.8 \ - man/ipurge.8 \ -@@ -1200,17 +1199,27 @@ dist_man_MANS = \ - man/rmnews.8 \ - man/smmapd.8 \ - man/syncnews.8 \ -- man/sync_client.8 \ -- man/sync_reset.8 \ -- man/sync_server.8 \ - man/timsieved.8 \ - man/tls_prune.8 \ - man/unexpunge.8 --if USE_SQUAT -+ -+if SQUATTER - dist_man_MANS += \ - man/squatter.8 - endif - -+if HTTPD -+dist_man_MANS += \ -+ man/httpd.8 -+endif -+ -+if REPLICATION -+dist_man_MANS += \ -+ man/sync_client.8 \ -+ man/sync_reset.8 \ -+ man/sync_server.8 -+endif -+ - master_master_SOURCES = \ - master/cyrusMasterMIB.c \ - master/cyrusMasterMIB.h \ -diff --git a/imap/mailbox.c b/imap/mailbox.c -index f9ae70a..3baf44e 100644 ---- a/imap/mailbox.c -+++ b/imap/mailbox.c -@@ -51,7 +51,9 @@ - #elif defined(HAVE_STDINT_H) - # include <stdint.h> - #endif -+#ifdef WITH_DAV - #include <libical/vcc.h> -+#endif - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -@@ -81,8 +83,10 @@ - - #include "annotate.h" - #include "assert.h" -+#ifdef WITH_DAV - #include "caldav_db.h" - #include "carddav_db.h" -+#endif - #include "crc32.h" - #include "md5.h" - #include "exitcodes.h" -@@ -2666,6 +2670,7 @@ out: - return r; - } - -+#ifdef WITH_DAV - static int mailbox_update_carddav(struct mailbox *mailbox, - struct index_record *old, - struct index_record *new) -@@ -2886,6 +2891,7 @@ static int mailbox_update_dav(struct mailbox *mailbox, - return mailbox_update_caldav(mailbox, old, new); - return 0; - } -+#endif //WITH_DAV - - EXPORTED int mailbox_update_conversations(struct mailbox *mailbox, - struct index_record *old, -@@ -3112,8 +3118,10 @@ static int mailbox_update_indexes(struct mailbox *mailbox, - { - int r = 0; - -+#ifdef WITH_DAV - r = mailbox_update_dav(mailbox, old, new); - if (r) return r; -+#endif - - r = mailbox_update_conversations(mailbox, old, new); - -@@ -4238,6 +4246,7 @@ static int chkchildren(char *name, - return r; - } - -+#ifdef WITH_DAV - EXPORTED int mailbox_add_dav(struct mailbox *mailbox) - { - struct index_record record; -@@ -4257,6 +4266,7 @@ EXPORTED int mailbox_add_dav(struct mailbox *mailbox) - - return 0; - } -+#endif - - EXPORTED int mailbox_add_conversations(struct mailbox *mailbox) - { -diff --git a/imap/mailbox.h b/imap/mailbox.h -index 5d3ed01..fe0bf91 100644 ---- a/imap/mailbox.h -+++ b/imap/mailbox.h -@@ -587,6 +587,8 @@ extern int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *); - extern int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t, int force); - extern int mailbox_has_conversations(struct mailbox *mailbox); - -+#ifdef WITH_DAV - extern int mailbox_add_dav(struct mailbox *mailbox); -+#endif - - #endif /* INCLUDED_MAILBOX_H */ -diff --git a/imap/mboxevent.c b/imap/mboxevent.c -index eabc462..13f0945 100644 ---- a/imap/mboxevent.c -+++ b/imap/mboxevent.c -@@ -53,8 +53,10 @@ - - #include "annotate.h" - #include "assert.h" -+#ifdef WITH_DAV - #include "caldav_db.h" - #include "carddav_db.h" -+#endif - #include "exitcodes.h" - #include "imapurl.h" - #include "libconfig.h" -@@ -131,9 +133,11 @@ static struct mboxevent event_template = - { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 }, - { EVENT_MESSAGE_CID, "vnd.fastmail.cid", EVENT_PARAM_STRING, 0, 0 }, -+#ifdef WITH_DAV - { EVENT_MBTYPE, "vnd.cmu.mbtype", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_DAV_FILENAME, "vnd.cmu.davFilename", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_DAV_UID, "vnd.cmu.davUid", EVENT_PARAM_STRING, 0, 0 }, -+#endif - /* always at end to let the parser to easily truncate this part */ - { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 }, -@@ -374,8 +378,10 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param - return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_SESSIONID; - case EVENT_MAILBOX_ID: - return (type & MAILBOX_EVENTS); -+#ifdef WITH_DAV - case EVENT_MBTYPE: - return (type & MAILBOX_EVENTS); -+#endif - case EVENT_MAX_MESSAGES: - return type & QUOTA_EVENTS; - case EVENT_MESSAGE_CONTENT: -@@ -387,12 +393,14 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param - case EVENT_MESSAGE_CID: - return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CID) && - (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW)); -+#ifdef WITH_DAV - case EVENT_DAV_FILENAME: - return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVFILENAME) && - (type & EVENT_CALENDAR); - case EVENT_DAV_UID: - return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVUID) && - (type & EVENT_CALENDAR); -+#endif - case EVENT_MESSAGES: - if (type & (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN)) - return 1; -@@ -738,6 +746,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox * - cacheitem_size(record, CACHE_BODYSTRUCTURE))); - } - -+#ifdef WITH_DAV - /* add caldav items */ - if ((mailbox->mbtype & (MBTYPES_DAV)) && - (mboxevent_expected_param(event->type, EVENT_DAV_FILENAME) || -@@ -779,7 +788,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox * - } - } - } -- -+#endif //WITH_DAV - } - - void mboxevent_extract_copied_record(struct mboxevent *event, -@@ -991,8 +1000,10 @@ EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event, - imapurl_toURL(url, &imapurl); - FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url)); -
View file
debian.series
Changed
@@ -1,4 +1,9 @@ -cyrus-imapd-2.5-lt-prereq.patch -p1 -cyrus-imapd-2.5-with-dav-ifdefs.patch -p1 -cyrus-imapd-2.5-shared-folder-deletion.patch -p1 -cyrus-imapd-2.5-disable-user-parameter-notifyd.patch -p1 +0001-There-is-no-actual-prerequisite-for-libtool-of-2.2.6.patch +0002-A-non-void-function-should-return-something-so-retur.patch +0003-Disable-user-parameter-check-to-notify-external.patch +0004-Fix-display-of-deleted-shared-folders.patch +0005-Apply-ifdefs-for-building-without-DAV-and-without-re.patch +0006-Add-ACL-change-notifications.patch +0007-Correct-location-of-ifdef-endif.patch +0008-Extend-ifdefs-endifs-for-WITH_DAV.patch +0009-Keep-the-same-order-between-.c-and-.h-perhaps.patch
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.