Kolab Groupware OBS

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.

Changes of Revision 69

cyrus-imapd-2.5-apt-concat.patch Deleted

@@ -1,497 +0,0 @@
-diff -ur cyrus-imapd-2.5.orig/configure.ac cyrus-imapd-2.5/configure.ac
---- cyrus-imapd-2.5.orig/configure.ac	2014-02-19 23:07:27.000000000 +0100
-+++ cyrus-imapd-2.5/configure.ac	2014-06-24 23:03:32.949098756 +0200
-@@ -127,7 +127,6 @@
- #define HIDDEN
- #endif])
- 
--LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
- AC_SUBST([LIBTOOL_DEPS])
- 
-diff -ur cyrus-imapd-2.5.orig/imap/mailbox.c cyrus-imapd-2.5/imap/mailbox.c
---- cyrus-imapd-2.5.orig/imap/mailbox.c	2014-02-19 23:07:27.000000000 +0100
-+++ cyrus-imapd-2.5/imap/mailbox.c	2014-06-24 23:03:50.529016587 +0200
-@@ -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"
-@@ -2660,6 +2664,7 @@
-     return r;
- }
- 
-+#ifdef WITH_DAV
- static int mailbox_update_carddav(struct mailbox *mailbox,
- 				 struct index_record *old,
- 				 struct index_record *new)
-@@ -2880,6 +2885,7 @@
- 	return mailbox_update_caldav(mailbox, old, new);
-     return 0;
- }
-+#endif //WITH_DAV
- 
- EXPORTED int mailbox_update_conversations(struct mailbox *mailbox,
- 				 struct index_record *old,
-@@ -3106,8 +3112,10 @@
- {
-     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);
-     if (r) return r;
-@@ -4231,6 +4239,7 @@
-     return r;
- }
- 
-+#ifdef WITH_DAV
- EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
- {
-     struct index_record record;
-@@ -4250,6 +4259,7 @@
- 
-     return 0;
- }
-+#endif
- 
- EXPORTED int mailbox_add_conversations(struct mailbox *mailbox)
- {
-diff -ur cyrus-imapd-2.5.orig/imap/mailbox.h cyrus-imapd-2.5/imap/mailbox.h
---- cyrus-imapd-2.5.orig/imap/mailbox.h	2014-02-19 23:07:27.000000000 +0100
-+++ cyrus-imapd-2.5/imap/mailbox.h	2014-06-24 23:03:50.529016587 +0200
-@@ -577,7 +577,9 @@
- uint32_t mailbox_sync_crc(struct mailbox *mailbox, unsigned vers, int recalc);
- unsigned mailbox_best_crcvers(unsigned minvers, unsigned maxvers);
- 
-+#ifdef WITH_DAV
- extern int mailbox_add_dav(struct mailbox *mailbox);
-+#endif
- 
- /* Rename a CID.  Note - this is just one mailbox! */
- extern int mailbox_cid_rename(struct mailbox *mailbox,
-diff -ur cyrus-imapd-2.5.orig/imap/mbdump.c cyrus-imapd-2.5/imap/mbdump.c
---- cyrus-imapd-2.5.orig/imap/mbdump.c	2014-02-19 23:07:27.000000000 +0100
-+++ cyrus-imapd-2.5/imap/mbdump.c	2014-06-24 23:04:03.629955305 +0200
-@@ -630,6 +630,7 @@
- 		fname = mboxkey_getpath(userid);
- 		ftag = "MBOXKEY";
- 		break;
-+#ifdef WITH_DAV
- 	    case DAV_DB: {
- 		struct buf dav_file = BUF_INITIALIZER;
- 
-@@ -638,6 +639,7 @@
- 		ftag = "DAV";
- 		break;
- 	    }
-+#endif // WITH_DAV
- 	    default:
- 		fatal("unknown user data file", EC_OSFILE);
- 	    }
-@@ -1072,12 +1074,14 @@
- 	    char *s = user_hash_subs(userid);
- 	    strlcpy(fnamebuf, s, sizeof(fnamebuf));
- 	    free(s);
-+#ifdef WITHDAV
- 	} else if (userid && !strcmp(file.s, "DAV")) {
- 	    /* overwriting this outright is absolutely what we want to do */
- 	    struct buf dav_file = BUF_INITIALIZER;
- 	    dav_getpath_byuserid(&dav_file, userid);
- 	    strlcpy(fnamebuf, buf_cstring(&dav_file), sizeof(fnamebuf));
- 	    buf_free(&dav_file);
-+#endif // WITH_DAV
- 	} else if (userid && !strcmp(file.s, "SEEN")) {
- 	    seen_file = seen_getpath(userid);
- 
-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-02-19 23:07:27.000000000 +0100
-+++ cyrus-imapd-2.5/imap/mboxevent.c	2014-06-24 23:04:07.425937541 +0200
-@@ -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"
-@@ -76,7 +78,7 @@
- 			EVENT_MESSAGE_TRASH)
- 
- #define MAILBOX_EVENTS (EVENT_MAILBOX_CREATE|EVENT_MAILBOX_DELETE|\
--			EVENT_MAILBOX_RENAME)
-+			EVENT_MAILBOX_RENAME|EVENT_ACL_CHANGE)
- 
- #define SUBS_EVENTS    (EVENT_MAILBOX_SUBSCRIBE|EVENT_MAILBOX_UNSUBSCRIBE)
- 
-@@ -129,11 +131,15 @@
-     { EVENT_MIDSET, "vnd.cmu.midset", EVENT_PARAM_STRING, 0, 0 },
-     { EVENT_FLAG_NAMES, "flagNames", EVENT_PARAM_STRING, 0, 0 },
-     { EVENT_PID, "pid", EVENT_PARAM_INT, 0, 0 },
-+    { EVENT_ACL_SUBJECT, "aclSubject", EVENT_PARAM_STRING, 0, 0 },
-+    { EVENT_ACL_RIGHTS, "aclRights", EVENT_PARAM_STRING, 0, 0 },
-     { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
-     { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 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
-     { EVENT_MESSAGE_CID, "vnd.fastmail.cid", EVENT_PARAM_STRING, 0, 0 },
-     /* always at end to let the parser to easily truncate this part */
-     { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
-@@ -187,7 +193,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_SUBSCRIPTION)
- 	enabled_events |= SUBS_EVENTS;
-@@ -378,8 +384,10 @@
- 	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:
-@@ -388,12 +396,14 @@
-     case EVENT_MESSAGE_SIZE:
- 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_MESSAGESIZE) &&
- 	       (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_MESSAGE_CID:
- 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CID) &&
- 	       (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));

debian.series Changed