[pkg-kolab] r181 - trunk/kolab-cyrus-imapd/debian/patches
Steffen Joeris
white-guest at costa.debian.org
Mon Jan 23 12:02:24 UTC 2006
Author: white-guest
Date: 2006-01-23 12:02:23 +0000 (Mon, 23 Jan 2006)
New Revision: 181
Removed:
trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch
trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch
trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch
trunk/kolab-cyrus-imapd/debian/patches/imapd.patch
trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch
Log:
* remove obsolete patches, they are applied by others
Deleted: trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch 2006-01-18 15:35:21 UTC (rev 180)
+++ trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch 2006-01-23 12:02:23 UTC (rev 181)
@@ -1,75 +0,0 @@
-#diff -upr ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html ./doc/man/cyradm.1.html
-#--- ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html 2005-02-14 19:02:26.000000000 +0100
-#+++ ./doc/man/cyradm.1.html 2005-08-29 04:35:21.000000000 +0200
-#@@ -191,6 +191,10 @@ Indicates that the mailbox should have a
-# <DD>
-# Sets an email address to which messages injected into the server via NNTP
-# will be sent.
-#+<P></P>
-#+<DT><STRONG><A NAME="item__2fexplicit_2fannotation"><CODE>/explicit/annotation</CODE></A></STRONG><BR>
-#+<DD>
-#+Sets the annotation <EM>/explicit/annotation</EM> on <EM>mailbox</EM> to <EM>value</EM>.
-# <P></P></DL>
-# <DT><STRONG><A NAME="item_renamemailbox_%5B%2D%2Dpartition_partition%5D_oldn"><CODE>renamemailbox</CODE> [<CODE>--partition</CODE> <EM>partition</EM>] <EM>oldname</EM> <EM>newname</EM></A></STRONG><BR>
-# <DD>
---- kolab-cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh 2004-01-15 15:35:34.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/perl/imap/cyradm.sh 2005-08-29 04:28:51.000000000 +0200
-@@ -225,6 +225,10 @@ Indicates that the mailbox should have a
- Sets an email address to which messages injected into the server via NNTP
- will be sent.
-
-+=item C</explicit/annotation>
-+
-+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>.
-+
- =back
-
- =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>
---- kolab-cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm 2004-02-19 23:50:12.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2005-08-29 04:02:38.000000000 +0200
-@@ -789,12 +789,12 @@ sub mboxconfig {
- return undef;
- }
-
-- if(!exists($values{$entry})) {
-- $self->{error} = "Unknown parameter $entry";
-+ if(exists($values{$entry})) {
-+ $entry = $values{$entry};
-+ } else {
-+ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
- }
-
-- $entry = $values{$entry};
--
- my ($rc, $msg);
-
- $value = undef if($value eq "none");
---- kolab-cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm 2004-01-15 15:35:35.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2005-08-29 04:02:38.000000000 +0200
-@@ -126,7 +126,7 @@ my %builtins = (exit =>
- [\&_sc_info, '[mailbox]',
- 'display mailbox/server metadata'],
- mboxcfg =>
-- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
-+ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
- 'configure mailbox'],
- mboxconfig => 'mboxcfg',
- reconstruct =>
-@@ -1339,7 +1339,7 @@ sub _sc_mboxcfg {
- while (defined ($opt = shift(@argv))) {
- last if $opt eq '--';
- if ($opt =~ /^-/) {
-- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
-+ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
- }
- else {
- push(@nargv, $opt);
-@@ -1348,7 +1348,7 @@ sub _sc_mboxcfg {
- }
- push(@nargv, @argv);
- if (@nargv < 2) {
-- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
-+ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
- }
- if (!$cyrref || !$$cyrref) {
- die "mboxconfig: no connection to server\n";
Deleted: trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch 2006-01-18 15:35:21 UTC (rev 180)
+++ trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch 2006-01-23 12:02:23 UTC (rev 181)
@@ -1,51 +0,0 @@
---- kolab-cyrus-imapd-2.2.12.orig/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/imap/imapd.c 2005-04-21 00:59:50.865255448 +0200
-@@ -3923,10 +3923,12 @@ void cmd_rename(const char *tag,
- }
- }
-
-+#ifdef notdef
- /* verify that the mailbox doesn't have a wildcard in it */
- for (p = oldmailboxname; !r && *p; p++) {
- if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
- }
-+#endif
-
- /* attempt to rename the base mailbox */
- if (!r) {
-Kun i ./imap: imapd.c.orig
-diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c ./imap/mboxlist.c
---- kolab-cyrus-imapd-2.2.12.orig/imap/mboxlist.c 2004-07-26 20:08:03.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.12/imap/mboxlist.c 2005-04-21 00:59:50.874254080 +0200
-@@ -476,10 +476,12 @@ mboxlist_mycreatemailboxcheck(char *name
- free(acl);
- return IMAP_PERMISSION_DENIED;
- }
-+#ifdef notdef
- /* disallow wildcards in userids with inboxes. */
- if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
- return IMAP_MAILBOX_BADNAME;
- }
-+#endif
-
- /*
- * Users by default have all access to their personal mailbox(es),
-diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxname.c ./imap/mboxname.c
---- kolab-cyrus-imapd-2.2.12.orig/imap/mboxname.c 2005-02-14 07:39:57.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/imap/mboxname.c 2005-04-21 00:59:50.879253320 +0200
-@@ -649,8 +649,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;
-Kun i ./imap: mboxname.c.orig
Deleted: trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch 2006-01-18 15:35:21 UTC (rev 180)
+++ trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch 2006-01-23 12:02:23 UTC (rev 181)
@@ -1,117 +0,0 @@
---- kolab-cyrus-imapd-2.2.6.orig/imap/annotate.c 2004-05-22 05:45:48.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.6/imap/annotate.c 2004-07-05 11:59:13.000000000 +0200
-@@ -1598,6 +1598,11 @@ const struct annotate_st_entry mailbox_r
- { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
- };
-
-+const struct annotate_st_entry vendor_entry =
-+ { NULL, ATTRIB_TYPE_STRING, BACKEND_ONLY,
-+ ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
-+ ACL_ADMIN, annotation_set_todb, NULL };
-+
- int annotatemore_store(char *mailbox,
- struct entryattlist *l,
- struct namespace *namespace,
-@@ -1610,6 +1615,7 @@ int annotatemore_store(char *mailbox,
- struct attvaluelist *av;
- struct storedata sdata;
- const struct annotate_st_entry *entries;
-+ struct annotate_st_entry * working_entry;
- time_t now = time(0);
-
- memset(&sdata, 0, sizeof(struct storedata));
-@@ -1631,37 +1637,55 @@ int annotatemore_store(char *mailbox,
- while (e) {
- int entrycount, attribs;
- struct annotate_st_entry_list *nentry = NULL;
-+ struct annotate_st_entry *ientry = NULL;
-
- /* See if we support this entry */
-+ working_entry = NULL;
- for (entrycount = 0;
- entries[entrycount].name;
- entrycount++) {
- if (!strcmp(e->entry, entries[entrycount].name)) {
-+ working_entry = &(entries[entrycount]);
- break;
- }
- }
-- if (!entries[entrycount].name) {
-- /* unknown annotation */
-- return IMAP_PERMISSION_DENIED;
-+ if (working_entry==NULL) {
-+ /* test for generic vendor annotation */
-+ if ((strncmp("/vendor/", e->entry, strlen("/vendor/"))==0) &&
-+ (strlen(e->entry)>strlen("/vendor/"))) {
-+ working_entry = &(vendor_entry);
-+ }
-+ else {
-+ /* 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_AND_BACKEND
-+ if (working_entry->proxytype == PROXY_AND_BACKEND
- || (proxy_store_func &&
-- entries[entrycount].proxytype == PROXY_ONLY)
-+ working_entry->proxytype == PROXY_ONLY)
- || (!proxy_store_func &&
-- entries[entrycount].proxytype == BACKEND_ONLY)) {
-+ working_entry->proxytype == BACKEND_ONLY)) {
-+ ientry = xzmalloc(sizeof(struct annotate_st_entry));
-+ ientry->name = e->entry;
-+ ientry->type = working_entry->type;
-+ ientry->proxytype = working_entry->proxytype;
-+ ientry->attribs = working_entry->attribs;
-+ ientry->acl = working_entry->acl;
-+ ientry->set = working_entry->set;
-+ ientry->rock = working_entry->rock;
- nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
- nentry->next = sdata.entry_list;
-- nentry->entry = &(entries[entrycount]);
-+ nentry->entry = ientry;
- 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 = working_entry->attribs;
- av = e->attvalues;
- while (av) {
- const char *value;
-@@ -1671,7 +1695,7 @@ int annotatemore_store(char *mailbox,
- goto cleanup;
- }
- value = annotate_canon_value(av->value,
-- entries[entrycount].type);
-+ working_entry->type);
- if (!value) {
- r = IMAP_ANNOTATION_BADVALUE;
- goto cleanup;
-@@ -1697,7 +1721,7 @@ int annotatemore_store(char *mailbox,
- goto cleanup;
- }
- value = annotate_canon_value(av->value,
-- entries[entrycount].type);
-+ working_entry->type);
- if (!value) {
- r = IMAP_ANNOTATION_BADVALUE;
- goto cleanup;
-@@ -1797,6 +1821,12 @@ int annotatemore_store(char *mailbox,
- /* Free the entry list */
- while (sdata.entry_list) {
- struct annotate_st_entry_list *freeme = sdata.entry_list;
-+ if (freeme != NULL){
-+ struct annotate_st_entry *freeme2 = freeme->entry;
-+ if (freeme2 != NULL) {
-+ free( freeme2 );
-+ }
-+ }
- sdata.entry_list = sdata.entry_list->next;
- free(freeme);
- }
Deleted: trunk/kolab-cyrus-imapd/debian/patches/imapd.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/imapd.patch 2006-01-18 15:35:21 UTC (rev 180)
+++ trunk/kolab-cyrus-imapd/debian/patches/imapd.patch 2006-01-23 12:02:23 UTC (rev 181)
@@ -1,99 +0,0 @@
---- kolab-cyrus-imap-2.2.12.orig/et/com_err.c.orig 2003-06-04 05:27:50.000000000 +0200
-+++ kolab-cyrus-imap-2.2.12/et/com_err.c 2004-02-02 19:56:00.000000000 +0100
-@@ -50,7 +50,7 @@
- #include <string.h>
- #include "mit-sipb-copyright.h"
-
--#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
-+#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
- #include <stdarg.h>
- #else
- #include <varargs.h>
---- kolab-cyrus-imapd-2.2.12.orig/lib/cyrusdb_skiplist.c.orig 2003-12-15 17:04:35.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/cyrusdb_skiplist.c 2004-02-02 19:56:00.000000000 +0100
-@@ -71,6 +71,11 @@
-
- #define PROB (0.5)
-
-+#ifdef __FreeBSD__
-+/* #define fdatasync(fd) fsync(fd) */
-+#define O_DSYNC 0
-+#endif
-+
- /*
- *
- * disk format; all numbers in network byte order
---- kolab-cyrus-imapd-2.2.12.orig/lib/prot.h.orig 2003-10-22 20:50:12.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.12/lib/prot.h 2004-02-02 19:58:47.000000000 +0100
-@@ -49,6 +49,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/time.h>
-
- #include <sasl/sasl.h>
-
---- kolab-cyrus-imapd-2.2.12.orig/perl/sieve/lib/isieve.c.orig 2003-10-22 20:50:25.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.12/perl/sieve/lib/isieve.c 2004-02-02 20:01:21.000000000 +0100
-@@ -41,9 +41,7 @@
-
- /* $Id: imapd.patch,v 1.12 2004/11/13 14:53:34 rse Exp $ */
-
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
-+#include "../../../config.h"
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
---- kolab-cyrus-imapd-2.2.12.orig/perl/Makefile.in.orig 2003-10-22 20:50:17.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.12/perl/Makefile.in 2004-02-02 21:23:32.000000000 +0100
-@@ -82,7 +82,8 @@
- BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
- OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-- $(PERL) Makefile.PL PREFIX=$(prefix); \
-+ $(PERL) Makefile.PL PREFIX=$(prefix) \
-+ INSTALLDIRS="vendor" INSTALLMAN3DIR="none" INSTALLSITEMAN3DIR="none" INSTALLVENDORMAN3DIR="none"; \
- fi; \
- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- done
---- kolab-cyrus-imapd-2.2.12.orig/perl/sieve/Makefile.in.orig 2003-10-22 20:50:24.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.12/perl/sieve/Makefile.in 2004-02-02 21:41:22.000000000 +0100
-@@ -84,7 +84,8 @@
- BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
- OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-- $(PERL) Makefile.PL PREFIX=$(prefix); \
-+ $(PERL) Makefile.PL PREFIX=$(prefix) \
-+ INSTALLDIRS="vendor" INSTALLMAN3DIR="none" INSTALLSITEMAN3DIR="none" INSTALLVENDORMAN3DIR="none"; \
- fi; \
- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- done
---- kolab-cyrus-imapd-2.2.12.orig/imap/mboxname.c.orig 2004-03-17 10:03:40.000000000 +0200
-+++ kolab-cyrus-imapd-2.2.12/imap/mboxname.c 2004-03-17 10:03:40.000000000 +0200
-@@ -129,7 +129,11 @@
- domainlen = strlen(result);
- }
- }
-+#ifdef ATVDOM /* allow '@' being a regular character in mboxname even when using virtual domains */
-+ else if ((cp = strrchr(name, '@'))) {
-+#else
- if ((cp = strrchr(name, '@'))) {
-+#endif /* ATVDOM */
- /* mailbox specified as mbox at domain */
- namelen = cp - name;
-
-
-Index: lib/cyrusdb_berkeley.c
---- kolab-cyrus-imapd-2.2.12.orig/lib/cyrusdb_berkeley.c.orig 2004-03-11 19:36:44 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c 2004-11-13 13:48:28 +0100
-@@ -104,7 +104,7 @@
- exit(EC_TEMPFAIL);
- }
-
--static void db_err(const char *db_prfx, char *buffer)
-+static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer)
- {
- syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
- }
Deleted: trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch 2006-01-18 15:35:21 UTC (rev 180)
+++ trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch 2006-01-23 12:02:23 UTC (rev 181)
@@ -1,25 +0,0 @@
---- kolab-cyrus-imapd-2.2.12.orig/lib/imapopts.h.orig 2005-12-13 23:46:23.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/imapopts.h 2005-12-13 23:47:29.000000000 +0100
-@@ -178,7 +178,6 @@
-
- };
-
--extern struct imapopt_s imapopts[];
-
-
-
-@@ -188,6 +187,7 @@
-
- IMAP_ENUM_VIRTDOMAINS_ON,
- IMAP_ENUM_VIRTDOMAINS_USERID,
-+ IMAP_ENUM_VIRTDOMAINS_LDAP,
- IMAP_ENUM_VIRTDOMAINS_OFF = 0
-
- };
-@@ -236,5 +236,6 @@
-
- };
-
-+extern struct imapopt_s imapopts[];
- #endif /* INCLUDED_IMAPOPTIONS_H */
-
More information about the pkg-kolab-devel
mailing list