From f516fc3f6650390fe73a6ff21abbf7f011e8f998 Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Wed, 4 Jun 2008 18:40:35 +0000 Subject: move kolab patches to 2.3.12_p2 subdir svn path=/; revision=40 --- net-mail/cyrus-imapd/Manifest | 14 +- .../files/kolab/2.3.12/annotations2.patch | 356 --------------------- .../files/kolab/2.3.12/cyradm_annotations.patch | 83 ----- .../files/kolab/2.3.12/folder-names.patch | 20 -- .../cyrus-imapd/files/kolab/2.3.12/groups.patch | 220 ------------- .../cyrus-imapd/files/kolab/2.3.12/logging.patch | 58 ---- .../kolab/2.3.12/timsieved_starttls-sendcaps.patch | 19 -- net-mail/cyrus-imapd/files/kolab/2.3.12/uid.patch | 115 ------- .../files/kolab/2.3.12_p2/annotations2.patch | 356 +++++++++++++++++++++ .../files/kolab/2.3.12_p2/cyradm_annotations.patch | 83 +++++ .../files/kolab/2.3.12_p2/folder-names.patch | 20 ++ .../cyrus-imapd/files/kolab/2.3.12_p2/groups.patch | 220 +++++++++++++ .../files/kolab/2.3.12_p2/logging.patch | 58 ++++ .../2.3.12_p2/timsieved_starttls-sendcaps.patch | 19 ++ .../cyrus-imapd/files/kolab/2.3.12_p2/uid.patch | 115 +++++++ 15 files changed, 878 insertions(+), 878 deletions(-) delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/annotations2.patch delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/cyradm_annotations.patch delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/folder-names.patch delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/groups.patch delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/logging.patch delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch delete mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12/uid.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/annotations2.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/cyradm_annotations.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/folder-names.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/groups.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/logging.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/timsieved_starttls-sendcaps.patch create mode 100644 net-mail/cyrus-imapd/files/kolab/2.3.12_p2/uid.patch diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index af07fe1..5002ea3 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -9,13 +9,13 @@ AUX cyrus.pam-include 109 RMD160 24f82d0496f0ff94f9c1ee4cef14124909d361e5 SHA1 1 AUX cyrus.rc6 568 RMD160 0494dc278b3c93f49018392694a809f1ec395459 SHA1 22e6f03d9365d0fef4af9236d9cd01ae0b94a67f SHA256 f2f796f1ab208bcd5641a1610b07673f92069e6f5b2370f453e3a24014ab2c6c AUX imap.pam 195 RMD160 18585b20cc2568a000ecb381f3299dedcc737d27 SHA1 0e64fbb8fb8da0cdae6fb0820ee3048f1e30bbf6 SHA256 e8068af6f4141fe2b7d7afbaf241be779ad6edb7e03d4dfdcf7ca8e991a8a5e0 AUX imapd.conf 1587 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b SHA1 e4f189cb59fe499a42adffe3ffe382dcb9d7c546 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f -AUX kolab/2.3.12/annotations2.patch 11178 RMD160 80b327392731fa0fd06ef8fcf34985489582e334 SHA1 b7f9f1d89b5a14efb1cae6a29f2b81bbea4aa81a SHA256 befae23d2873fa8fc0f42817e12d451dee884c4431b45ef0cdd25dfe474eed87 -AUX kolab/2.3.12/cyradm_annotations.patch 3107 RMD160 a0ad90fa8f779c6e671fa1bc0de1933fa0030f55 SHA1 204f83f03c39e400e65939648101195213f153a5 SHA256 00fb61b5f201193aa1d4a26cdb3d77380afdf05e975c8e171ff1643992692711 -AUX kolab/2.3.12/folder-names.patch 705 RMD160 e1ae9477464e0fb7a9e22a362008771792bc659b SHA1 f30649fe5f3ed2cbc8d803b8ab76c5bde56f90c5 SHA256 9e9404695adc32c3042c490409e1494167421dbbfd726b98e90e0013ac6084cf -AUX kolab/2.3.12/groups.patch 6561 RMD160 fc3d6cc483b39f7bc3c35916f7c75c92fb7aa27d SHA1 2d09dd07bd6ee6b37f71f56c11a1a51c61778822 SHA256 ffde107a869e1cc6935fff82872dbc6997bd8bc286d369f348f561d3ebbd0c24 -AUX kolab/2.3.12/logging.patch 1880 RMD160 a69ccc5fba3e200c5cf4bd91c22b5a7e9713038e SHA1 79ddbb6b9af2f0c93b8f9ee732ca2639c9567943 SHA256 76a4eb6cd59564f55bb541a35b4e7f5fbd8beabf8072580c0bc514d710c3879b -AUX kolab/2.3.12/timsieved_starttls-sendcaps.patch 824 RMD160 c07359f3c3c4b922bbddc9e717a1ec9b0de10c03 SHA1 05de31018a0ac1a7fce78d3a63b0c6c2e3adc9f1 SHA256 3249a502fe49df37f89133effd0f6a125d826ae425faa7e32e09a3279a1ad4b6 -AUX kolab/2.3.12/uid.patch 4255 RMD160 94e8a37bb7631d1a7ea53d7575df3898065cfcd4 SHA1 3a3a5e190c67bf4618031ff5bff4d395cf324532 SHA256 ad33f589898d166b15292ca7adf9d6b60cf4af57f9ec33428e03616ccdf70c17 +AUX kolab/2.3.12_p2/annotations2.patch 11178 RMD160 80b327392731fa0fd06ef8fcf34985489582e334 SHA1 b7f9f1d89b5a14efb1cae6a29f2b81bbea4aa81a SHA256 befae23d2873fa8fc0f42817e12d451dee884c4431b45ef0cdd25dfe474eed87 +AUX kolab/2.3.12_p2/cyradm_annotations.patch 3107 RMD160 a0ad90fa8f779c6e671fa1bc0de1933fa0030f55 SHA1 204f83f03c39e400e65939648101195213f153a5 SHA256 00fb61b5f201193aa1d4a26cdb3d77380afdf05e975c8e171ff1643992692711 +AUX kolab/2.3.12_p2/folder-names.patch 705 RMD160 e1ae9477464e0fb7a9e22a362008771792bc659b SHA1 f30649fe5f3ed2cbc8d803b8ab76c5bde56f90c5 SHA256 9e9404695adc32c3042c490409e1494167421dbbfd726b98e90e0013ac6084cf +AUX kolab/2.3.12_p2/groups.patch 6561 RMD160 fc3d6cc483b39f7bc3c35916f7c75c92fb7aa27d SHA1 2d09dd07bd6ee6b37f71f56c11a1a51c61778822 SHA256 ffde107a869e1cc6935fff82872dbc6997bd8bc286d369f348f561d3ebbd0c24 +AUX kolab/2.3.12_p2/logging.patch 1880 RMD160 a69ccc5fba3e200c5cf4bd91c22b5a7e9713038e SHA1 79ddbb6b9af2f0c93b8f9ee732ca2639c9567943 SHA256 76a4eb6cd59564f55bb541a35b4e7f5fbd8beabf8072580c0bc514d710c3879b +AUX kolab/2.3.12_p2/timsieved_starttls-sendcaps.patch 824 RMD160 c07359f3c3c4b922bbddc9e717a1ec9b0de10c03 SHA1 05de31018a0ac1a7fce78d3a63b0c6c2e3adc9f1 SHA256 3249a502fe49df37f89133effd0f6a125d826ae425faa7e32e09a3279a1ad4b6 +AUX kolab/2.3.12_p2/uid.patch 4255 RMD160 94e8a37bb7631d1a7ea53d7575df3898065cfcd4 SHA1 3a3a5e190c67bf4618031ff5bff4d395cf324532 SHA256 ad33f589898d166b15292ca7adf9d6b60cf4af57f9ec33428e03616ccdf70c17 DIST cyrus-imapd-2.3.11-uoa.tbz2 18045 RMD160 8f35b2399b47669d99fd301be1e14aaaab903234 SHA1 827b279e47dbe56ee4969a3ecd8d21a83b31fd44 SHA256 c67f97274c328c80f1cbaab7514fdd0de05c032e57b526e4e13e8f63d212aa9d DIST cyrus-imapd-2.3.11.tar.gz 2275173 RMD160 34727e08cc25f3cb6e0ea0195b96de942de10f48 SHA1 6218f0dc4f1792e786677362b8b3965e4593122e SHA256 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842 DIST cyrus-imapd-2.3.12p2.tar.gz 2305996 RMD160 35225526aaf67bf99855750debd03a85949de424 SHA1 d72064b426feb0d7d6ea60456c8ebbf6fe72a2a2 SHA256 c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4 diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/annotations2.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/annotations2.patch deleted file mode 100644 index 87fa920..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/annotations2.patch +++ /dev/null @@ -1,356 +0,0 @@ -Provides a new version of annotation support for the cyrus imapd server [Version: 2.3.9] - -diff -r 321cda1d6136 imap/annotate.c ---- a/imap/annotate.c Tue Apr 22 10:44:56 2008 +0200 -+++ b/imap/annotate.c Tue Apr 22 10:47:04 2008 +0200 -@@ -90,6 +90,8 @@ int (*proxy_fetch_func)(const char *serv - struct strlist *attribute_pat) = NULL; - int (*proxy_store_func)(const char *server, const char *mbox_pat, - struct entryattlist *entryatts) = NULL; -+ -+void init_annotation_definitions(); - - /* String List Management */ - /* -@@ -237,6 +239,8 @@ void annotatemore_init(int myflags, - if (store_func) { - proxy_store_func = store_func; - } -+ -+ init_annotation_definitions(); - } - - void annotatemore_open(char *fname) -@@ -1832,6 +1836,224 @@ const struct annotate_st_entry mailbox_r - { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL } - }; - -+struct annotate_st_entry_list *server_entries_list = NULL; -+struct annotate_st_entry_list *mailbox_rw_entries_list = NULL; -+ -+enum { -+ ANNOTATION_SCOPE_SERVER = 1, -+ ANNOTATION_SCOPE_MAILBOX = 2 -+}; -+ -+const struct annotate_attrib annotation_scope_names[] = -+{ -+ { "server", ANNOTATION_SCOPE_SERVER }, -+ { "mailbox", ANNOTATION_SCOPE_MAILBOX }, -+ { NULL, 0 } -+}; -+ -+const struct annotate_attrib annotation_proxy_type_names[] = -+{ -+ { "proxy", PROXY_ONLY }, -+ { "backend", BACKEND_ONLY }, -+ { "proxy_and_backend", PROXY_AND_BACKEND }, -+ { NULL, 0 } -+}; -+ -+const struct annotate_attrib attribute_type_names[] = -+{ -+ { "content-type", ATTRIB_TYPE_CONTENTTYPE }, -+ { "string", ATTRIB_TYPE_STRING }, -+ { "boolean", ATTRIB_TYPE_BOOLEAN }, -+ { "uint", ATTRIB_TYPE_UINT }, -+ { "int", ATTRIB_TYPE_INT }, -+ { NULL, 0 } -+}; -+ -+#define ANNOT_DEF_MAXLINELEN 1024 -+ -+int table_lookup(const struct annotate_attrib *table, -+ char* name, -+ size_t namelen, -+ char* errmsg) -+/* search in table for the value given by name and namelen (name is null-terminated, -+ but possibly more than just the key). errmsg is used to hint the user where we failed */ -+{ -+ char errbuf[ANNOT_DEF_MAXLINELEN*2]; -+ int entry; -+ -+ for (entry = 0; table[entry].name && -+ (strncasecmp(table[entry].name, name, namelen) -+ || table[entry].name[namelen] != '\0'); entry++); -+ -+ if (! table[entry].name) { -+ sprintf(errbuf, "invalid %s at '%s'", errmsg, name); -+ fatal(errbuf, EC_CONFIG); -+ } -+ return table[entry].entry; -+} -+ -+char *consume_comma(char* p) -+ /* advance beyond the next ',', skipping whitespace, fail if next non-space is no comma */ -+{ -+ char errbuf[ANNOT_DEF_MAXLINELEN*2]; -+ -+ for (; *p && isspace(*p); p++); -+ if (*p != ',') { -+ sprintf(errbuf, "',' expected, '%s' found parsing annotation definition", -+ p); -+ fatal(errbuf, EC_CONFIG); -+ } -+ p++; -+ for (; *p && isspace(*p); p++); -+ -+ return p; -+} -+ -+int parse_table_lookup_bitmask(const struct annotate_attrib *table, -+ char** s, -+ char* errmsg) -+ /* parses strings of the form value1 [ value2 [ ... ]] -+ value1 is mapped via table to ints and the result ored -+ whitespace is allowed between value names and punctuation -+ the field must end in '\0' or ',' -+ s is advanced to '\0' or ',' -+ on error errmsg is used to identify item to be parsed -+ */ -+{ -+ char errbuf[ANNOT_DEF_MAXLINELEN*2]; -+ int result = 0; -+ char *p, *p2; -+ -+ p = *s; -+ do { -+ p2 = p; -+ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); -+ result |= table_lookup(table, p2, p-p2, errmsg); -+ for (; *p && isspace(*p); p++); -+ } while (*p && *p != ','); -+ -+ *s = p; -+ return result; -+} -+ -+void init_annotation_definitions() -+{ -+ char *p, *p2, *tmp; -+ const char *filename; -+ char aline[ANNOT_DEF_MAXLINELEN]; -+ char errbuf[ANNOT_DEF_MAXLINELEN*2]; -+ struct annotate_st_entry_list *se, *me; -+ struct annotate_st_entry *ae; -+ int i; -+ FILE* f; -+ -+ /* NOTE: we assume # static entries > 0 */ -+ server_entries_list = xmalloc(sizeof(struct annotate_st_entry_list)); -+ mailbox_rw_entries_list = xmalloc(sizeof(struct annotate_st_entry_list)); -+ se = server_entries_list; -+ me = mailbox_rw_entries_list; -+ /* copy static entries into list */ -+ for (i = 0; server_entries[i].name;i++) { -+ se->entry = &server_entries[i]; -+ if (server_entries[i+1].name) { -+ se->next = xmalloc(sizeof(struct annotate_st_entry_list)); -+ se = se->next; -+ } -+ } -+ /* copy static entries into list */ -+ for (i = 0; mailbox_rw_entries[i].name;i++) { -+ me->entry = &mailbox_rw_entries[i]; -+ if (mailbox_rw_entries[i+1].name) { -+ me->next = xmalloc(sizeof(struct annotate_st_entry_list)); -+ me = me->next; -+ } -+ } -+ -+ /* parse config file */ -+ filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS); -+ -+ if (! filename) { -+ se->next = NULL; -+ me->next = NULL; -+ return; -+ } -+ -+ f = fopen(filename,"r"); -+ if (! f) { -+ sprintf(errbuf, "could not open annotation definiton %s", filename); -+ fatal(errbuf, EC_CONFIG); -+ } -+ -+ while (fgets(aline, sizeof(aline), f)) { -+ // remove leading space, skip blank lines and comments -+ for (p = aline; *p && isspace(*p); p++); -+ if (!*p || *p == '#') continue; -+ -+ // note, we only do the most basic validity checking and may -+ // be more restrictive than neccessary -+ -+ ae = xmalloc(sizeof(struct annotate_st_entry)); -+ -+ p2 = p; -+ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); -+ // TV-TODO: should test for empty -+ ae->name = xstrndup(p2, p-p2); -+ -+ p = consume_comma(p); -+ -+ p2 = p; -+ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); -+ -+ if (table_lookup(annotation_scope_names, p2, p-p2, -+ "annotation scope")==ANNOTATION_SCOPE_SERVER) { -+ se->next = xmalloc(sizeof(struct annotate_st_entry_list)); -+ se = se->next; -+ se->entry = ae; -+ } -+ else { -+ me->next = xmalloc(sizeof(struct annotate_st_entry_list)); -+ me = me->next; -+ me->entry = ae; -+ } -+ -+ p = consume_comma(p); -+ p2 = p; -+ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); -+ ae->type = table_lookup(attribute_type_names, p2, p-p2, -+ "attribute type"); -+ -+ p = consume_comma(p); -+ ae->proxytype = parse_table_lookup_bitmask(annotation_proxy_type_names, -+ &p, -+ "annotation proxy type"); -+ -+ p = consume_comma(p); -+ ae->attribs = parse_table_lookup_bitmask(annotation_attributes, -+ &p, -+ "annotation attributes"); -+ -+ p = consume_comma(p); -+ p2 = p; -+ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); -+ tmp = xstrndup(p2, p-p2); -+ ae->acl = cyrus_acl_strtomask(tmp); -+ free(tmp); -+ -+ for (; *p && isspace(*p); p++); -+ if (*p) { -+ sprintf(errbuf, "junk at end of line: '%s'", p); -+ fatal(errbuf, EC_CONFIG); -+ } -+ -+ ae->set = annotation_set_todb; -+ ae->rock = NULL; -+ } -+ -+ fclose(f); -+ se->next = NULL; -+ me->next = NULL; -+} -+ - int annotatemore_store(char *mailbox, - struct entryattlist *l, - struct namespace *namespace, -@@ -1843,7 +2065,7 @@ int annotatemore_store(char *mailbox, - struct entryattlist *e = l; - struct attvaluelist *av; - struct storedata sdata; -- const struct annotate_st_entry *entries; -+ const struct annotate_st_entry_list *entries, *currententry; - time_t now = time(0); - - memset(&sdata, 0, sizeof(struct storedata)); -@@ -1854,45 +2076,45 @@ int annotatemore_store(char *mailbox, - - if (!mailbox[0]) { - /* server annotations */ -- entries = server_entries; -+ entries = server_entries_list; - } - else { - /* mailbox annotation(s) */ -- entries = mailbox_rw_entries; -+ entries = mailbox_rw_entries_list; - } - - /* Build a list of callbacks for storing the annotations */ - while (e) { -- int entrycount, attribs; -+ int attribs; - struct annotate_st_entry_list *nentry = NULL; - - /* See if we support this entry */ -- for (entrycount = 0; -- entries[entrycount].name; -- entrycount++) { -- if (!strcmp(e->entry, entries[entrycount].name)) { -+ for (currententry = entries; -+ currententry; -+ currententry = currententry->next) { -+ if (!strcmp(e->entry, currententry->entry->name)) { - break; - } - } -- if (!entries[entrycount].name) { -+ if (!currententry) { - /* unknown annotation */ - return IMAP_PERMISSION_DENIED; - } - - /* Add this entry to our list only if it - applies to our particular server type */ -- if ((entries[entrycount].proxytype != PROXY_ONLY) -+ if ((currententry->entry->proxytype != PROXY_ONLY) - || proxy_store_func) { - nentry = xzmalloc(sizeof(struct annotate_st_entry_list)); - nentry->next = sdata.entry_list; -- nentry->entry = &(entries[entrycount]); -+ nentry->entry = currententry->entry; - nentry->shared.modifiedsince = now; - nentry->priv.modifiedsince = now; - sdata.entry_list = nentry; - } - - /* See if we are allowed to set the given attributes. */ -- attribs = entries[entrycount].attribs; -+ attribs = currententry->entry->attribs; - av = e->attvalues; - while (av) { - const char *value; -@@ -1902,7 +2124,7 @@ int annotatemore_store(char *mailbox, - goto cleanup; - } - value = annotate_canon_value(av->value, -- entries[entrycount].type); -+ currententry->entry->type); - if (!value) { - r = IMAP_ANNOTATION_BADVALUE; - goto cleanup; -@@ -1928,7 +2150,7 @@ int annotatemore_store(char *mailbox, - goto cleanup; - } - value = annotate_canon_value(av->value, -- entries[entrycount].type); -+ currententry->entry->type); - if (!value) { - r = IMAP_ANNOTATION_BADVALUE; - goto cleanup; -@@ -2110,3 +2332,10 @@ int annotatemore_delete(const char *mbox - - return annotatemore_rename(mboxname, NULL, NULL, NULL); - } -+ -+/* This file contains code Copyright (c) 2006 by Thomas Viehmann. -+ * You may distribute source code or binaries under the conditions -+ * conditions given in the CMU license, provided this note stays intact -+ * in the distributed source. If you want to distribute my code without -+ * this notice, do contact me at . -+ */ -diff -r 321cda1d6136 lib/imapoptions ---- a/lib/imapoptions Tue Apr 22 10:44:56 2008 +0200 -+++ b/lib/imapoptions Tue Apr 22 10:47:04 2008 +0200 -@@ -172,6 +172,9 @@ are listed with ``''. - /* Should non-admin users be allowed to set ACLs for the 'anyone' - user on their mailboxes? In a large organization this can cause - support problems, but it's enabled by default. */ -+ -+{ "annotation_definitions", NULL, STRING } -+/* File containing annotation definitions. */ - - { "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")} - /* The authorization mechanism to use. */ diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/cyradm_annotations.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/cyradm_annotations.patch deleted file mode 100644 index 2167f7f..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/cyradm_annotations.patch +++ /dev/null @@ -1,83 +0,0 @@ -Allows to use arbitrary annotations with the cyradm tool. - -diff -r a07884e259c3 doc/man/cyradm.1.html ---- a/doc/man/cyradm.1.html Thu Oct 25 08:24:39 2007 +0200 -+++ b/doc/man/cyradm.1.html Thu Oct 25 08:29:40 2007 +0200 -@@ -241,6 +241,13 @@ The currently supported attributes are:< -
-

Sets an email address to which messages injected into the server via NNTP - will be sent.

-+
-+ -+
/explicit/annotation -+ -+
-+

Sets the annotation /explicit/annotation -+on mailbox to value.

-
- -
sharedseen -diff -r a07884e259c3 perl/imap/IMAP/Admin.pm ---- a/perl/imap/IMAP/Admin.pm Thu Oct 25 08:24:39 2007 +0200 -+++ b/perl/imap/IMAP/Admin.pm Thu Oct 25 08:29:40 2007 +0200 -@@ -796,11 +796,11 @@ sub mboxconfig { - return undef; - } - -- if(!exists($values{$entry})) { -- $self->{error} = "Unknown parameter $entry"; -- } -- -- $entry = $values{$entry}; -+ if(exists($values{$entry})) { -+ $entry = $values{$entry}; -+ } else { -+ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/"; -+ } - - my ($rc, $msg); - -diff -r a07884e259c3 perl/imap/IMAP/Shell.pm ---- a/perl/imap/IMAP/Shell.pm Thu Oct 25 08:24:39 2007 +0200 -+++ b/perl/imap/IMAP/Shell.pm Thu Oct 25 08:29:40 2007 +0200 -@@ -126,7 +126,7 @@ my %builtins = (exit => - [\&_sc_info, '[mailbox]', - 'display mailbox/server metadata'], - mboxcfg => -- [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value', -+ [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/] value', - 'configure mailbox'], - mboxconfig => 'mboxcfg', - reconstruct => -@@ -1436,7 +1436,7 @@ sub _sc_mboxcfg { - while (defined ($opt = shift(@argv))) { - last if $opt eq '--'; - if ($opt =~ /^-/) { -- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; -+ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; - } - else { - push(@nargv, $opt); -@@ -1445,7 +1445,7 @@ sub _sc_mboxcfg { - } - push(@nargv, @argv); - if (@nargv < 2) { -- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; -+ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; - } - if (!$cyrref || !$$cyrref) { - die "mboxconfig: no connection to server\n"; -diff -r a07884e259c3 perl/imap/cyradm.sh ---- a/perl/imap/cyradm.sh Thu Oct 25 08:24:39 2007 +0200 -+++ b/perl/imap/cyradm.sh Thu Oct 25 08:29:40 2007 +0200 -@@ -241,6 +241,10 @@ mailboxes). - - Indicates that the mailbox should have a squat index created for it. - -+=item C -+ -+Sets the annotation I on I to I. -+ - =back - - =item C [C<--partition> I] I I diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/folder-names.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/folder-names.patch deleted file mode 100644 index df55a3c..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/folder-names.patch +++ /dev/null @@ -1,20 +0,0 @@ -Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9] - -diff -r a83b43bb79a3 imap/mboxname.c ---- a/imap/mboxname.c Tue Dec 11 11:22:14 2007 +0100 -+++ b/imap/mboxname.c Tue Dec 11 11:22:22 2007 +0100 -@@ -712,8 +712,13 @@ int mboxname_netnewscheck(char *name) - /* - * Apply site policy restrictions on mailbox names. - * Restrictions are hardwired for now. -- */ -+ -+ * original definition - #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~" -+ */ -+ -+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~" -+ - int mboxname_policycheck(char *name) - { - unsigned i; diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/groups.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/groups.patch deleted file mode 100644 index 9e987f5..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/groups.patch +++ /dev/null @@ -1,220 +0,0 @@ -Allows to use a file other than /etc/groups for group definitions within the cyrus imapd server [Version: 2.3.9] - -diff -r 5f6f7a246f32 lib/auth_unix.c ---- a/lib/auth_unix.c Tue Dec 11 11:20:37 2007 +0100 -+++ b/lib/auth_unix.c Tue Dec 11 11:22:01 2007 +0100 -@@ -48,12 +48,133 @@ - #include - #include - #include -+#include - #include - #include - - #include "auth.h" - #include "libcyr_cfg.h" - #include "xmalloc.h" -+ -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+/* -+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS, -+ * Copyright (C) 1995, 1996 Nat Friedman . -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the Free -+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+ -+static struct group *__getgrent(int grp_fd, char *line_buff, char **members) -+{ -+ short line_index; -+ short buff_size; -+ static struct group group; -+ register char *ptr; -+ char *field_begin; -+ short member_num; -+ char *endptr; -+ int line_len; -+ -+ /* We use the restart label to handle malformatted lines */ -+ restart: -+ line_index = 0; -+ buff_size = 256; -+ -+ line_buff = realloc(line_buff, buff_size); -+ while (1) { -+ if ((line_len = read(grp_fd, line_buff + line_index, -+ buff_size - line_index)) <= 0) { -+ return NULL; -+ } -+ field_begin = strchr(line_buff, '\n'); -+ if (field_begin != NULL) { -+ lseek(grp_fd, -+ (long) (1 + field_begin - -+ (line_len + line_index + line_buff)), SEEK_CUR); -+ *field_begin = '\0'; -+ if (*line_buff == '#' || *line_buff == ' ' -+ || *line_buff == '\n' || *line_buff == '\t') -+ goto restart; -+ break; -+ } else { -+ /* Allocate some more space */ -+ line_index = buff_size; -+ buff_size += 256; -+ line_buff = realloc(line_buff, buff_size); -+ } -+ } -+ -+ /* Now parse the line */ -+ group.gr_name = line_buff; -+ ptr = strchr(line_buff, ':'); -+ if (ptr == NULL) -+ goto restart; -+ *ptr++ = '\0'; -+ -+ group.gr_passwd = ptr; -+ ptr = strchr(ptr, ':'); -+ if (ptr == NULL) -+ goto restart; -+ *ptr++ = '\0'; -+ -+ field_begin = ptr; -+ ptr = strchr(ptr, ':'); -+ if (ptr == NULL) -+ goto restart; -+ *ptr++ = '\0'; -+ -+ group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10); -+ if (*endptr != '\0') -+ goto restart; -+ -+ member_num = 0; -+ field_begin = ptr; -+ -+ if (members != NULL) -+ free(members); -+ members = (char **) malloc((member_num + 1) * sizeof(char *)); -+ for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) { -+ if ((ptr = strchr(field_begin, ',')) != NULL) -+ *ptr++ = '\0'; -+ members[member_num++] = field_begin; -+ members = (char **) realloc(members, -+ (member_num + 1) * sizeof(char *)); -+ } -+ members[member_num] = NULL; -+ -+ group.gr_mem = members; -+ return &group; -+} -+ -+static char *line_buff = NULL; -+static char **members = NULL; -+ -+struct group *fgetgrent(FILE *file) -+{ -+ if (file == NULL) { -+ errno = EINTR; -+ return NULL; -+ } -+ return __getgrent(fileno(file), line_buff, members); -+} -+#endif /* __FreeBSD__ */ - - struct auth_state { - char userid[81]; -@@ -142,6 +263,25 @@ static char allowedchars[256] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - -+static struct group* fgetgrnam(const char* name) -+{ -+ struct group *grp; -+ FILE *groupfile; -+ -+ groupfile = fopen("/etc/imapd.group", "r"); -+ if (!groupfile) groupfile = fopen("/etc/group", "r"); -+ if (groupfile) { -+ while ((grp = fgetgrent(groupfile))) { -+ if (strcasecmp(grp->gr_name, name) == 0) { -+ fclose(groupfile); -+ return grp; -+ } -+ } -+ } -+ if (groupfile) fclose(groupfile); -+ return NULL; -+} -+ - /* - * Convert 'identifier' into canonical form. - * Returns a pointer to a static buffer containing the canonical form -@@ -177,7 +317,7 @@ size_t len; - */ - - if (!strncmp(retbuf, "group:", 6)) { -- grp = getgrnam(retbuf+6); -+ grp = fgetgrnam(retbuf+6); - if (!grp) return 0; - strcpy(retbuf+6, grp->gr_name); - return retbuf; -@@ -228,6 +368,7 @@ static struct auth_state *mynewstate(con - int ret, ngroups = 10; - #else - char **mem; -+ FILE *groupfile; - #endif - - identifier = mycanonifyid(identifier, 0); -@@ -283,20 +424,23 @@ err: - if (groupids) free(groupids); - - #else /* !HAVE_GETGROUPLIST */ -- setgrent(); -- while ((grp = getgrent())) { -- for (mem = grp->gr_mem; *mem; mem++) { -- if (!strcmp(*mem, identifier)) break; -- } -- -- if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) { -- newstate->ngroups++; -- newstate->group = (char **)xrealloc((char *)newstate->group, -- newstate->ngroups * sizeof(char *)); -- newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name); -- } -- } -- endgrent(); -+ groupfile = fopen("/etc/imapd.group", "r"); -+ if (!groupfile) groupfile = fopen("/etc/group", "r"); -+ if (groupfile) { -+ while ((grp = fgetgrent(groupfile))) { -+ for (mem = grp->gr_mem; *mem; mem++) { -+ if (!strcasecmp(*mem, identifier)) break; -+ } -+ -+ if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) { -+ newstate->ngroups++; -+ newstate->group = (char **)xrealloc((char *)newstate->group, -+ newstate->ngroups * sizeof(char *)); -+ newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name); -+ } -+ } -+ fclose(groupfile); -+ } - #endif /* HAVE_GETGROUPLIST */ - - return newstate; diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/logging.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/logging.patch deleted file mode 100644 index c0bd2fa..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/logging.patch +++ /dev/null @@ -1,58 +0,0 @@ -Provides improved logging for the cyrus imapd server [Version: 2.3.9] - -diff -r 6162fc947b22 imap/append.c ---- a/imap/append.c Tue Dec 11 11:22:03 2007 +0100 -+++ b/imap/append.c Tue Dec 11 11:22:13 2007 +0100 -@@ -648,6 +648,9 @@ int append_fromstage(struct appendstate - - /* ok, we've successfully added a message */ - as->quota_used += message_index.size; -+ -+ syslog(LOG_DEBUG, "append_fromstage: message %d added to %s", -+ message_index.uid, mailbox->name ); - - return 0; - } -diff -r 6162fc947b22 imap/imapd.c ---- a/imap/imapd.c Tue Dec 11 11:22:03 2007 +0100 -+++ b/imap/imapd.c Tue Dec 11 11:22:13 2007 +0100 -@@ -3509,17 +3509,19 @@ void cmd_close(char *tag) - if (!r) sync_log_mailbox(imapd_mailbox->name); - } - -+ if (r) { -+ prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r)); -+ } -+ else { -+ prot_printf(imapd_out, "%s OK %s\r\n", tag, -+ error_message(IMAP_OK_COMPLETED)); -+ syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s", -+ imapd_userid, imapd_mailbox->name, "''"); -+ } -+ - index_closemailbox(imapd_mailbox); - mailbox_close(imapd_mailbox); - imapd_mailbox = 0; -- -- if (r) { -- prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r)); -- } -- else { -- prot_printf(imapd_out, "%s OK %s\r\n", tag, -- error_message(IMAP_OK_COMPLETED)); -- } - } - - /* -diff -r 6162fc947b22 imap/mailbox.c ---- a/imap/mailbox.c Tue Dec 11 11:22:03 2007 +0100 -+++ b/imap/mailbox.c Tue Dec 11 11:22:13 2007 +0100 -@@ -2520,6 +2520,8 @@ int mailbox_expunge(struct mailbox *mail - *(fname->tail)++ = '/'; - fname->len++; - for (msgno = 0; msgno < numdeleted; msgno++) { -+ syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d", -+ mailbox->name, deleted[msgno]); - mailbox_message_get_fname(mailbox, deleted[msgno], - fname->tail, - sizeof(fname->buf) - fname->len); diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch deleted file mode 100644 index 48524e9..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45 -(minus the CVS keywords) - -It should be reverse-applied with patch -p2 -R to work around the kontact -behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends -capabilities after starttls) and can be dropped as soon as kontact has a way -to work with old and new cyrus imapd servers. - ---- a/timsieved/parser.c 2007/11/26 20:23:06 1.44 -+++ b/timsieved/parser.c 2007/12/10 14:47:08 1.45 -@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea - - starttls_done = 1; - -- return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated); -+ return result; - } - #else - static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in) diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/uid.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/uid.patch deleted file mode 100644 index a044463..0000000 --- a/net-mail/cyrus-imapd/files/kolab/2.3.12/uid.patch +++ /dev/null @@ -1,115 +0,0 @@ -Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9] - -diff -r d62bf3b0902d configure ---- a/configure Thu Oct 25 08:30:57 2007 +0200 -+++ b/configure Thu Oct 25 08:31:06 2007 +0200 -@@ -18119,7 +18119,7 @@ done - done - - IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}" --IMAP_LIBS="${LIB_SASL} ${LIBS}" -+IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS}" - - - -diff -r d62bf3b0902d imap/global.c ---- a/imap/global.c Thu Oct 25 08:30:57 2007 +0200 -+++ b/imap/global.c Thu Oct 25 08:31:06 2007 +0200 -@@ -52,6 +52,9 @@ - #include - #include - -+#include -+#include -+ - #if HAVE_UNISTD_H - # include - #endif -@@ -362,6 +365,18 @@ char *canonify_userid(char *user, char * - char *domain = NULL; - int len = strlen(user); - char buf[81]; -+ const char *uri; -+ const char *base; -+ const char *binddn; -+ const char *bindpw; -+ struct timeval timeout; -+ char filter[255]; -+ LDAP *handle; -+ LDAPMessage *res; -+ LDAPMessage *entry; -+ char ** vals; -+ -+ int rc; - - /* check for domain */ - if (config_virtdomains && -@@ -380,6 +395,47 @@ char *canonify_userid(char *user, char * - } - - if (config_virtdomains) { -+ if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) { -+ uri = config_getstring(IMAPOPT_LDAP_URI); -+ base = config_getstring(IMAPOPT_LDAP_BASE); -+ binddn = config_getstring(IMAPOPT_LDAP_BIND_DN); -+ bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD); -+ timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT); -+ timeout.tv_usec = 0; -+ sprintf(filter, "(uid=%s)", user); -+ rc = ldap_initialize(&handle, uri); -+ if (rc != LDAP_SUCCESS) { -+ syslog(LOG_ERR, "ldap_initialize failed (%s)", uri); -+ } else { -+ rc = ldap_simple_bind_s(handle, binddn, bindpw); -+ if (rc != LDAP_SUCCESS) { -+ syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc)); -+ } else { -+ rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res); -+ if (rc != LDAP_SUCCESS) { -+ syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc)); -+ } else { -+ if ( (entry = ldap_first_entry(handle, res)) != NULL ) { -+ // read mail attribute from entry -+ if ( (vals = ldap_get_values(handle, entry, "mail")) ) { -+ if (strchr(vals[0], '@')) { -+ static char buf[81]; /* same size as in auth_canonifyid */ -+ strncpy( buf, vals[0], sizeof(buf) ); -+ buf[80] = '\0'; /* make sure it's null-terminated */ -+ ldap_value_free( vals ); -+ ldap_msgfree( res ); -+ ldap_unbind_s(handle); /* also frees handle */ -+ return auth_canonifyid( buf, 0) ; -+ } -+ ldap_value_free( vals ); -+ } -+ } -+ ldap_msgfree( res ); -+ } -+ } -+ ldap_unbind_s(handle); /* also frees handle */ -+ } -+ } - if (domain) { - if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) { - *domain = '\0'; /* trim the default domain */ -@@ -392,7 +448,7 @@ char *canonify_userid(char *user, char * - user = buf; - } - } -- else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) { -+ else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) { - socklen_t salen; - int error; - struct sockaddr_storage localaddr; -diff -r d62bf3b0902d lib/imapoptions ---- a/lib/imapoptions Thu Oct 25 08:30:57 2007 +0200 -+++ b/lib/imapoptions Thu Oct 25 08:31:06 2007 +0200 -@@ -1034,7 +1034,7 @@ are listed with ``''. - mailbox hierarchy. The default is to use the netnews separator - character '.'. */ - --{ "virtdomains", "off", ENUM("off", "userid", "on") } -+{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") } - /* Enable virtual domain support. If enabled, the user's domain will - be determined by splitting a fully qualified userid at the last '@' - or '%' symbol. If the userid is unqualified, and the virtdomains diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/annotations2.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/annotations2.patch new file mode 100644 index 0000000..87fa920 --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/annotations2.patch @@ -0,0 +1,356 @@ +Provides a new version of annotation support for the cyrus imapd server [Version: 2.3.9] + +diff -r 321cda1d6136 imap/annotate.c +--- a/imap/annotate.c Tue Apr 22 10:44:56 2008 +0200 ++++ b/imap/annotate.c Tue Apr 22 10:47:04 2008 +0200 +@@ -90,6 +90,8 @@ int (*proxy_fetch_func)(const char *serv + struct strlist *attribute_pat) = NULL; + int (*proxy_store_func)(const char *server, const char *mbox_pat, + struct entryattlist *entryatts) = NULL; ++ ++void init_annotation_definitions(); + + /* String List Management */ + /* +@@ -237,6 +239,8 @@ void annotatemore_init(int myflags, + if (store_func) { + proxy_store_func = store_func; + } ++ ++ init_annotation_definitions(); + } + + void annotatemore_open(char *fname) +@@ -1832,6 +1836,224 @@ const struct annotate_st_entry mailbox_r + { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL } + }; + ++struct annotate_st_entry_list *server_entries_list = NULL; ++struct annotate_st_entry_list *mailbox_rw_entries_list = NULL; ++ ++enum { ++ ANNOTATION_SCOPE_SERVER = 1, ++ ANNOTATION_SCOPE_MAILBOX = 2 ++}; ++ ++const struct annotate_attrib annotation_scope_names[] = ++{ ++ { "server", ANNOTATION_SCOPE_SERVER }, ++ { "mailbox", ANNOTATION_SCOPE_MAILBOX }, ++ { NULL, 0 } ++}; ++ ++const struct annotate_attrib annotation_proxy_type_names[] = ++{ ++ { "proxy", PROXY_ONLY }, ++ { "backend", BACKEND_ONLY }, ++ { "proxy_and_backend", PROXY_AND_BACKEND }, ++ { NULL, 0 } ++}; ++ ++const struct annotate_attrib attribute_type_names[] = ++{ ++ { "content-type", ATTRIB_TYPE_CONTENTTYPE }, ++ { "string", ATTRIB_TYPE_STRING }, ++ { "boolean", ATTRIB_TYPE_BOOLEAN }, ++ { "uint", ATTRIB_TYPE_UINT }, ++ { "int", ATTRIB_TYPE_INT }, ++ { NULL, 0 } ++}; ++ ++#define ANNOT_DEF_MAXLINELEN 1024 ++ ++int table_lookup(const struct annotate_attrib *table, ++ char* name, ++ size_t namelen, ++ char* errmsg) ++/* search in table for the value given by name and namelen (name is null-terminated, ++ but possibly more than just the key). errmsg is used to hint the user where we failed */ ++{ ++ char errbuf[ANNOT_DEF_MAXLINELEN*2]; ++ int entry; ++ ++ for (entry = 0; table[entry].name && ++ (strncasecmp(table[entry].name, name, namelen) ++ || table[entry].name[namelen] != '\0'); entry++); ++ ++ if (! table[entry].name) { ++ sprintf(errbuf, "invalid %s at '%s'", errmsg, name); ++ fatal(errbuf, EC_CONFIG); ++ } ++ return table[entry].entry; ++} ++ ++char *consume_comma(char* p) ++ /* advance beyond the next ',', skipping whitespace, fail if next non-space is no comma */ ++{ ++ char errbuf[ANNOT_DEF_MAXLINELEN*2]; ++ ++ for (; *p && isspace(*p); p++); ++ if (*p != ',') { ++ sprintf(errbuf, "',' expected, '%s' found parsing annotation definition", ++ p); ++ fatal(errbuf, EC_CONFIG); ++ } ++ p++; ++ for (; *p && isspace(*p); p++); ++ ++ return p; ++} ++ ++int parse_table_lookup_bitmask(const struct annotate_attrib *table, ++ char** s, ++ char* errmsg) ++ /* parses strings of the form value1 [ value2 [ ... ]] ++ value1 is mapped via table to ints and the result ored ++ whitespace is allowed between value names and punctuation ++ the field must end in '\0' or ',' ++ s is advanced to '\0' or ',' ++ on error errmsg is used to identify item to be parsed ++ */ ++{ ++ char errbuf[ANNOT_DEF_MAXLINELEN*2]; ++ int result = 0; ++ char *p, *p2; ++ ++ p = *s; ++ do { ++ p2 = p; ++ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); ++ result |= table_lookup(table, p2, p-p2, errmsg); ++ for (; *p && isspace(*p); p++); ++ } while (*p && *p != ','); ++ ++ *s = p; ++ return result; ++} ++ ++void init_annotation_definitions() ++{ ++ char *p, *p2, *tmp; ++ const char *filename; ++ char aline[ANNOT_DEF_MAXLINELEN]; ++ char errbuf[ANNOT_DEF_MAXLINELEN*2]; ++ struct annotate_st_entry_list *se, *me; ++ struct annotate_st_entry *ae; ++ int i; ++ FILE* f; ++ ++ /* NOTE: we assume # static entries > 0 */ ++ server_entries_list = xmalloc(sizeof(struct annotate_st_entry_list)); ++ mailbox_rw_entries_list = xmalloc(sizeof(struct annotate_st_entry_list)); ++ se = server_entries_list; ++ me = mailbox_rw_entries_list; ++ /* copy static entries into list */ ++ for (i = 0; server_entries[i].name;i++) { ++ se->entry = &server_entries[i]; ++ if (server_entries[i+1].name) { ++ se->next = xmalloc(sizeof(struct annotate_st_entry_list)); ++ se = se->next; ++ } ++ } ++ /* copy static entries into list */ ++ for (i = 0; mailbox_rw_entries[i].name;i++) { ++ me->entry = &mailbox_rw_entries[i]; ++ if (mailbox_rw_entries[i+1].name) { ++ me->next = xmalloc(sizeof(struct annotate_st_entry_list)); ++ me = me->next; ++ } ++ } ++ ++ /* parse config file */ ++ filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS); ++ ++ if (! filename) { ++ se->next = NULL; ++ me->next = NULL; ++ return; ++ } ++ ++ f = fopen(filename,"r"); ++ if (! f) { ++ sprintf(errbuf, "could not open annotation definiton %s", filename); ++ fatal(errbuf, EC_CONFIG); ++ } ++ ++ while (fgets(aline, sizeof(aline), f)) { ++ // remove leading space, skip blank lines and comments ++ for (p = aline; *p && isspace(*p); p++); ++ if (!*p || *p == '#') continue; ++ ++ // note, we only do the most basic validity checking and may ++ // be more restrictive than neccessary ++ ++ ae = xmalloc(sizeof(struct annotate_st_entry)); ++ ++ p2 = p; ++ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); ++ // TV-TODO: should test for empty ++ ae->name = xstrndup(p2, p-p2); ++ ++ p = consume_comma(p); ++ ++ p2 = p; ++ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); ++ ++ if (table_lookup(annotation_scope_names, p2, p-p2, ++ "annotation scope")==ANNOTATION_SCOPE_SERVER) { ++ se->next = xmalloc(sizeof(struct annotate_st_entry_list)); ++ se = se->next; ++ se->entry = ae; ++ } ++ else { ++ me->next = xmalloc(sizeof(struct annotate_st_entry_list)); ++ me = me->next; ++ me->entry = ae; ++ } ++ ++ p = consume_comma(p); ++ p2 = p; ++ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); ++ ae->type = table_lookup(attribute_type_names, p2, p-p2, ++ "attribute type"); ++ ++ p = consume_comma(p); ++ ae->proxytype = parse_table_lookup_bitmask(annotation_proxy_type_names, ++ &p, ++ "annotation proxy type"); ++ ++ p = consume_comma(p); ++ ae->attribs = parse_table_lookup_bitmask(annotation_attributes, ++ &p, ++ "annotation attributes"); ++ ++ p = consume_comma(p); ++ p2 = p; ++ for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); ++ tmp = xstrndup(p2, p-p2); ++ ae->acl = cyrus_acl_strtomask(tmp); ++ free(tmp); ++ ++ for (; *p && isspace(*p); p++); ++ if (*p) { ++ sprintf(errbuf, "junk at end of line: '%s'", p); ++ fatal(errbuf, EC_CONFIG); ++ } ++ ++ ae->set = annotation_set_todb; ++ ae->rock = NULL; ++ } ++ ++ fclose(f); ++ se->next = NULL; ++ me->next = NULL; ++} ++ + int annotatemore_store(char *mailbox, + struct entryattlist *l, + struct namespace *namespace, +@@ -1843,7 +2065,7 @@ int annotatemore_store(char *mailbox, + struct entryattlist *e = l; + struct attvaluelist *av; + struct storedata sdata; +- const struct annotate_st_entry *entries; ++ const struct annotate_st_entry_list *entries, *currententry; + time_t now = time(0); + + memset(&sdata, 0, sizeof(struct storedata)); +@@ -1854,45 +2076,45 @@ int annotatemore_store(char *mailbox, + + if (!mailbox[0]) { + /* server annotations */ +- entries = server_entries; ++ entries = server_entries_list; + } + else { + /* mailbox annotation(s) */ +- entries = mailbox_rw_entries; ++ entries = mailbox_rw_entries_list; + } + + /* Build a list of callbacks for storing the annotations */ + while (e) { +- int entrycount, attribs; ++ int attribs; + struct annotate_st_entry_list *nentry = NULL; + + /* See if we support this entry */ +- for (entrycount = 0; +- entries[entrycount].name; +- entrycount++) { +- if (!strcmp(e->entry, entries[entrycount].name)) { ++ for (currententry = entries; ++ currententry; ++ currententry = currententry->next) { ++ if (!strcmp(e->entry, currententry->entry->name)) { + break; + } + } +- if (!entries[entrycount].name) { ++ if (!currententry) { + /* unknown annotation */ + return IMAP_PERMISSION_DENIED; + } + + /* Add this entry to our list only if it + applies to our particular server type */ +- if ((entries[entrycount].proxytype != PROXY_ONLY) ++ if ((currententry->entry->proxytype != PROXY_ONLY) + || proxy_store_func) { + nentry = xzmalloc(sizeof(struct annotate_st_entry_list)); + nentry->next = sdata.entry_list; +- nentry->entry = &(entries[entrycount]); ++ nentry->entry = currententry->entry; + nentry->shared.modifiedsince = now; + nentry->priv.modifiedsince = now; + sdata.entry_list = nentry; + } + + /* See if we are allowed to set the given attributes. */ +- attribs = entries[entrycount].attribs; ++ attribs = currententry->entry->attribs; + av = e->attvalues; + while (av) { + const char *value; +@@ -1902,7 +2124,7 @@ int annotatemore_store(char *mailbox, + goto cleanup; + } + value = annotate_canon_value(av->value, +- entries[entrycount].type); ++ currententry->entry->type); + if (!value) { + r = IMAP_ANNOTATION_BADVALUE; + goto cleanup; +@@ -1928,7 +2150,7 @@ int annotatemore_store(char *mailbox, + goto cleanup; + } + value = annotate_canon_value(av->value, +- entries[entrycount].type); ++ currententry->entry->type); + if (!value) { + r = IMAP_ANNOTATION_BADVALUE; + goto cleanup; +@@ -2110,3 +2332,10 @@ int annotatemore_delete(const char *mbox + + return annotatemore_rename(mboxname, NULL, NULL, NULL); + } ++ ++/* This file contains code Copyright (c) 2006 by Thomas Viehmann. ++ * You may distribute source code or binaries under the conditions ++ * conditions given in the CMU license, provided this note stays intact ++ * in the distributed source. If you want to distribute my code without ++ * this notice, do contact me at . ++ */ +diff -r 321cda1d6136 lib/imapoptions +--- a/lib/imapoptions Tue Apr 22 10:44:56 2008 +0200 ++++ b/lib/imapoptions Tue Apr 22 10:47:04 2008 +0200 +@@ -172,6 +172,9 @@ are listed with ``''. + /* Should non-admin users be allowed to set ACLs for the 'anyone' + user on their mailboxes? In a large organization this can cause + support problems, but it's enabled by default. */ ++ ++{ "annotation_definitions", NULL, STRING } ++/* File containing annotation definitions. */ + + { "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")} + /* The authorization mechanism to use. */ diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/cyradm_annotations.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/cyradm_annotations.patch new file mode 100644 index 0000000..2167f7f --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/cyradm_annotations.patch @@ -0,0 +1,83 @@ +Allows to use arbitrary annotations with the cyradm tool. + +diff -r a07884e259c3 doc/man/cyradm.1.html +--- a/doc/man/cyradm.1.html Thu Oct 25 08:24:39 2007 +0200 ++++ b/doc/man/cyradm.1.html Thu Oct 25 08:29:40 2007 +0200 +@@ -241,6 +241,13 @@ The currently supported attributes are:< +
+

Sets an email address to which messages injected into the server via NNTP + will be sent.

++
++ ++
/explicit/annotation ++ ++
++

Sets the annotation /explicit/annotation ++on mailbox to value.

+
+ +
sharedseen +diff -r a07884e259c3 perl/imap/IMAP/Admin.pm +--- a/perl/imap/IMAP/Admin.pm Thu Oct 25 08:24:39 2007 +0200 ++++ b/perl/imap/IMAP/Admin.pm Thu Oct 25 08:29:40 2007 +0200 +@@ -796,11 +796,11 @@ sub mboxconfig { + return undef; + } + +- if(!exists($values{$entry})) { +- $self->{error} = "Unknown parameter $entry"; +- } +- +- $entry = $values{$entry}; ++ if(exists($values{$entry})) { ++ $entry = $values{$entry}; ++ } else { ++ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/"; ++ } + + my ($rc, $msg); + +diff -r a07884e259c3 perl/imap/IMAP/Shell.pm +--- a/perl/imap/IMAP/Shell.pm Thu Oct 25 08:24:39 2007 +0200 ++++ b/perl/imap/IMAP/Shell.pm Thu Oct 25 08:29:40 2007 +0200 +@@ -126,7 +126,7 @@ my %builtins = (exit => + [\&_sc_info, '[mailbox]', + 'display mailbox/server metadata'], + mboxcfg => +- [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value', ++ [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/] value', + 'configure mailbox'], + mboxconfig => 'mboxcfg', + reconstruct => +@@ -1436,7 +1436,7 @@ sub _sc_mboxcfg { + while (defined ($opt = shift(@argv))) { + last if $opt eq '--'; + if ($opt =~ /^-/) { +- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; + } + else { + push(@nargv, $opt); +@@ -1445,7 +1445,7 @@ sub _sc_mboxcfg { + } + push(@nargv, @argv); + if (@nargv < 2) { +- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; + } + if (!$cyrref || !$$cyrref) { + die "mboxconfig: no connection to server\n"; +diff -r a07884e259c3 perl/imap/cyradm.sh +--- a/perl/imap/cyradm.sh Thu Oct 25 08:24:39 2007 +0200 ++++ b/perl/imap/cyradm.sh Thu Oct 25 08:29:40 2007 +0200 +@@ -241,6 +241,10 @@ mailboxes). + + Indicates that the mailbox should have a squat index created for it. + ++=item C ++ ++Sets the annotation I on I to I. ++ + =back + + =item C [C<--partition> I] I I diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/folder-names.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/folder-names.patch new file mode 100644 index 0000000..df55a3c --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/folder-names.patch @@ -0,0 +1,20 @@ +Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9] + +diff -r a83b43bb79a3 imap/mboxname.c +--- a/imap/mboxname.c Tue Dec 11 11:22:14 2007 +0100 ++++ b/imap/mboxname.c Tue Dec 11 11:22:22 2007 +0100 +@@ -712,8 +712,13 @@ int mboxname_netnewscheck(char *name) + /* + * Apply site policy restrictions on mailbox names. + * Restrictions are hardwired for now. +- */ ++ ++ * original definition + #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~" ++ */ ++ ++#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~" ++ + int mboxname_policycheck(char *name) + { + unsigned i; diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/groups.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/groups.patch new file mode 100644 index 0000000..9e987f5 --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/groups.patch @@ -0,0 +1,220 @@ +Allows to use a file other than /etc/groups for group definitions within the cyrus imapd server [Version: 2.3.9] + +diff -r 5f6f7a246f32 lib/auth_unix.c +--- a/lib/auth_unix.c Tue Dec 11 11:20:37 2007 +0100 ++++ b/lib/auth_unix.c Tue Dec 11 11:22:01 2007 +0100 +@@ -48,12 +48,133 @@ + #include + #include + #include ++#include + #include + #include + + #include "auth.h" + #include "libcyr_cfg.h" + #include "xmalloc.h" ++ ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++/* ++ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++static struct group *__getgrent(int grp_fd, char *line_buff, char **members) ++{ ++ short line_index; ++ short buff_size; ++ static struct group group; ++ register char *ptr; ++ char *field_begin; ++ short member_num; ++ char *endptr; ++ int line_len; ++ ++ /* We use the restart label to handle malformatted lines */ ++ restart: ++ line_index = 0; ++ buff_size = 256; ++ ++ line_buff = realloc(line_buff, buff_size); ++ while (1) { ++ if ((line_len = read(grp_fd, line_buff + line_index, ++ buff_size - line_index)) <= 0) { ++ return NULL; ++ } ++ field_begin = strchr(line_buff, '\n'); ++ if (field_begin != NULL) { ++ lseek(grp_fd, ++ (long) (1 + field_begin - ++ (line_len + line_index + line_buff)), SEEK_CUR); ++ *field_begin = '\0'; ++ if (*line_buff == '#' || *line_buff == ' ' ++ || *line_buff == '\n' || *line_buff == '\t') ++ goto restart; ++ break; ++ } else { ++ /* Allocate some more space */ ++ line_index = buff_size; ++ buff_size += 256; ++ line_buff = realloc(line_buff, buff_size); ++ } ++ } ++ ++ /* Now parse the line */ ++ group.gr_name = line_buff; ++ ptr = strchr(line_buff, ':'); ++ if (ptr == NULL) ++ goto restart; ++ *ptr++ = '\0'; ++ ++ group.gr_passwd = ptr; ++ ptr = strchr(ptr, ':'); ++ if (ptr == NULL) ++ goto restart; ++ *ptr++ = '\0'; ++ ++ field_begin = ptr; ++ ptr = strchr(ptr, ':'); ++ if (ptr == NULL) ++ goto restart; ++ *ptr++ = '\0'; ++ ++ group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10); ++ if (*endptr != '\0') ++ goto restart; ++ ++ member_num = 0; ++ field_begin = ptr; ++ ++ if (members != NULL) ++ free(members); ++ members = (char **) malloc((member_num + 1) * sizeof(char *)); ++ for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) { ++ if ((ptr = strchr(field_begin, ',')) != NULL) ++ *ptr++ = '\0'; ++ members[member_num++] = field_begin; ++ members = (char **) realloc(members, ++ (member_num + 1) * sizeof(char *)); ++ } ++ members[member_num] = NULL; ++ ++ group.gr_mem = members; ++ return &group; ++} ++ ++static char *line_buff = NULL; ++static char **members = NULL; ++ ++struct group *fgetgrent(FILE *file) ++{ ++ if (file == NULL) { ++ errno = EINTR; ++ return NULL; ++ } ++ return __getgrent(fileno(file), line_buff, members); ++} ++#endif /* __FreeBSD__ */ + + struct auth_state { + char userid[81]; +@@ -142,6 +263,25 @@ static char allowedchars[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + ++static struct group* fgetgrnam(const char* name) ++{ ++ struct group *grp; ++ FILE *groupfile; ++ ++ groupfile = fopen("/etc/imapd.group", "r"); ++ if (!groupfile) groupfile = fopen("/etc/group", "r"); ++ if (groupfile) { ++ while ((grp = fgetgrent(groupfile))) { ++ if (strcasecmp(grp->gr_name, name) == 0) { ++ fclose(groupfile); ++ return grp; ++ } ++ } ++ } ++ if (groupfile) fclose(groupfile); ++ return NULL; ++} ++ + /* + * Convert 'identifier' into canonical form. + * Returns a pointer to a static buffer containing the canonical form +@@ -177,7 +317,7 @@ size_t len; + */ + + if (!strncmp(retbuf, "group:", 6)) { +- grp = getgrnam(retbuf+6); ++ grp = fgetgrnam(retbuf+6); + if (!grp) return 0; + strcpy(retbuf+6, grp->gr_name); + return retbuf; +@@ -228,6 +368,7 @@ static struct auth_state *mynewstate(con + int ret, ngroups = 10; + #else + char **mem; ++ FILE *groupfile; + #endif + + identifier = mycanonifyid(identifier, 0); +@@ -283,20 +424,23 @@ err: + if (groupids) free(groupids); + + #else /* !HAVE_GETGROUPLIST */ +- setgrent(); +- while ((grp = getgrent())) { +- for (mem = grp->gr_mem; *mem; mem++) { +- if (!strcmp(*mem, identifier)) break; +- } +- +- if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) { +- newstate->ngroups++; +- newstate->group = (char **)xrealloc((char *)newstate->group, +- newstate->ngroups * sizeof(char *)); +- newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name); +- } +- } +- endgrent(); ++ groupfile = fopen("/etc/imapd.group", "r"); ++ if (!groupfile) groupfile = fopen("/etc/group", "r"); ++ if (groupfile) { ++ while ((grp = fgetgrent(groupfile))) { ++ for (mem = grp->gr_mem; *mem; mem++) { ++ if (!strcasecmp(*mem, identifier)) break; ++ } ++ ++ if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) { ++ newstate->ngroups++; ++ newstate->group = (char **)xrealloc((char *)newstate->group, ++ newstate->ngroups * sizeof(char *)); ++ newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name); ++ } ++ } ++ fclose(groupfile); ++ } + #endif /* HAVE_GETGROUPLIST */ + + return newstate; diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/logging.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/logging.patch new file mode 100644 index 0000000..c0bd2fa --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/logging.patch @@ -0,0 +1,58 @@ +Provides improved logging for the cyrus imapd server [Version: 2.3.9] + +diff -r 6162fc947b22 imap/append.c +--- a/imap/append.c Tue Dec 11 11:22:03 2007 +0100 ++++ b/imap/append.c Tue Dec 11 11:22:13 2007 +0100 +@@ -648,6 +648,9 @@ int append_fromstage(struct appendstate + + /* ok, we've successfully added a message */ + as->quota_used += message_index.size; ++ ++ syslog(LOG_DEBUG, "append_fromstage: message %d added to %s", ++ message_index.uid, mailbox->name ); + + return 0; + } +diff -r 6162fc947b22 imap/imapd.c +--- a/imap/imapd.c Tue Dec 11 11:22:03 2007 +0100 ++++ b/imap/imapd.c Tue Dec 11 11:22:13 2007 +0100 +@@ -3509,17 +3509,19 @@ void cmd_close(char *tag) + if (!r) sync_log_mailbox(imapd_mailbox->name); + } + ++ if (r) { ++ prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r)); ++ } ++ else { ++ prot_printf(imapd_out, "%s OK %s\r\n", tag, ++ error_message(IMAP_OK_COMPLETED)); ++ syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s", ++ imapd_userid, imapd_mailbox->name, "''"); ++ } ++ + index_closemailbox(imapd_mailbox); + mailbox_close(imapd_mailbox); + imapd_mailbox = 0; +- +- if (r) { +- prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r)); +- } +- else { +- prot_printf(imapd_out, "%s OK %s\r\n", tag, +- error_message(IMAP_OK_COMPLETED)); +- } + } + + /* +diff -r 6162fc947b22 imap/mailbox.c +--- a/imap/mailbox.c Tue Dec 11 11:22:03 2007 +0100 ++++ b/imap/mailbox.c Tue Dec 11 11:22:13 2007 +0100 +@@ -2520,6 +2520,8 @@ int mailbox_expunge(struct mailbox *mail + *(fname->tail)++ = '/'; + fname->len++; + for (msgno = 0; msgno < numdeleted; msgno++) { ++ syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d", ++ mailbox->name, deleted[msgno]); + mailbox_message_get_fname(mailbox, deleted[msgno], + fname->tail, + sizeof(fname->buf) - fname->len); diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/timsieved_starttls-sendcaps.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/timsieved_starttls-sendcaps.patch new file mode 100644 index 0000000..48524e9 --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/timsieved_starttls-sendcaps.patch @@ -0,0 +1,19 @@ +This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45 +(minus the CVS keywords) + +It should be reverse-applied with patch -p2 -R to work around the kontact +behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends +capabilities after starttls) and can be dropped as soon as kontact has a way +to work with old and new cyrus imapd servers. + +--- a/timsieved/parser.c 2007/11/26 20:23:06 1.44 ++++ b/timsieved/parser.c 2007/12/10 14:47:08 1.45 +@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea + + starttls_done = 1; + +- return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated); ++ return result; + } + #else + static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in) diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/uid.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/uid.patch new file mode 100644 index 0000000..a044463 --- /dev/null +++ b/net-mail/cyrus-imapd/files/kolab/2.3.12_p2/uid.patch @@ -0,0 +1,115 @@ +Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9] + +diff -r d62bf3b0902d configure +--- a/configure Thu Oct 25 08:30:57 2007 +0200 ++++ b/configure Thu Oct 25 08:31:06 2007 +0200 +@@ -18119,7 +18119,7 @@ done + done + + IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}" +-IMAP_LIBS="${LIB_SASL} ${LIBS}" ++IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS}" + + + +diff -r d62bf3b0902d imap/global.c +--- a/imap/global.c Thu Oct 25 08:30:57 2007 +0200 ++++ b/imap/global.c Thu Oct 25 08:31:06 2007 +0200 +@@ -52,6 +52,9 @@ + #include + #include + ++#include ++#include ++ + #if HAVE_UNISTD_H + # include + #endif +@@ -362,6 +365,18 @@ char *canonify_userid(char *user, char * + char *domain = NULL; + int len = strlen(user); + char buf[81]; ++ const char *uri; ++ const char *base; ++ const char *binddn; ++ const char *bindpw; ++ struct timeval timeout; ++ char filter[255]; ++ LDAP *handle; ++ LDAPMessage *res; ++ LDAPMessage *entry; ++ char ** vals; ++ ++ int rc; + + /* check for domain */ + if (config_virtdomains && +@@ -380,6 +395,47 @@ char *canonify_userid(char *user, char * + } + + if (config_virtdomains) { ++ if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) { ++ uri = config_getstring(IMAPOPT_LDAP_URI); ++ base = config_getstring(IMAPOPT_LDAP_BASE); ++ binddn = config_getstring(IMAPOPT_LDAP_BIND_DN); ++ bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD); ++ timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT); ++ timeout.tv_usec = 0; ++ sprintf(filter, "(uid=%s)", user); ++ rc = ldap_initialize(&handle, uri); ++ if (rc != LDAP_SUCCESS) { ++ syslog(LOG_ERR, "ldap_initialize failed (%s)", uri); ++ } else { ++ rc = ldap_simple_bind_s(handle, binddn, bindpw); ++ if (rc != LDAP_SUCCESS) { ++ syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc)); ++ } else { ++ rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res); ++ if (rc != LDAP_SUCCESS) { ++ syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc)); ++ } else { ++ if ( (entry = ldap_first_entry(handle, res)) != NULL ) { ++ // read mail attribute from entry ++ if ( (vals = ldap_get_values(handle, entry, "mail")) ) { ++ if (strchr(vals[0], '@')) { ++ static char buf[81]; /* same size as in auth_canonifyid */ ++ strncpy( buf, vals[0], sizeof(buf) ); ++ buf[80] = '\0'; /* make sure it's null-terminated */ ++ ldap_value_free( vals ); ++ ldap_msgfree( res ); ++ ldap_unbind_s(handle); /* also frees handle */ ++ return auth_canonifyid( buf, 0) ; ++ } ++ ldap_value_free( vals ); ++ } ++ } ++ ldap_msgfree( res ); ++ } ++ } ++ ldap_unbind_s(handle); /* also frees handle */ ++ } ++ } + if (domain) { + if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) { + *domain = '\0'; /* trim the default domain */ +@@ -392,7 +448,7 @@ char *canonify_userid(char *user, char * + user = buf; + } + } +- else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) { ++ else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) { + socklen_t salen; + int error; + struct sockaddr_storage localaddr; +diff -r d62bf3b0902d lib/imapoptions +--- a/lib/imapoptions Thu Oct 25 08:30:57 2007 +0200 ++++ b/lib/imapoptions Thu Oct 25 08:31:06 2007 +0200 +@@ -1034,7 +1034,7 @@ are listed with ``''. + mailbox hierarchy. The default is to use the netnews separator + character '.'. */ + +-{ "virtdomains", "off", ENUM("off", "userid", "on") } ++{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") } + /* Enable virtual domain support. If enabled, the user's domain will + be determined by splitting a fully qualified userid at the last '@' + or '%' symbol. If the userid is unqualified, and the virtdomains -- cgit v1.2.3-65-gdbad