[pkg-kolab] r172 - trunk/kolab-cyrus-imapd/debian/patches

[Steffen Joeris]

Author: white-guest
Date: 2006-01-18 10:59:43 +0000 (Wed, 18 Jan 2006)
New Revision: 172

Added:
   trunk/kolab-cyrus-imapd/debian/patches/130-kolab-imapd-goodchars.dpatch
Removed:
   trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in
Modified:
   trunk/kolab-cyrus-imapd/debian/patches/00list
Log:
* remove obsolete patch
* add kolab-imapd-goodchars patch


Modified: trunk/kolab-cyrus-imapd/debian/patches/00list
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/00list	2006-01-18 10:18:16 UTC (rev 171)
+++ trunk/kolab-cyrus-imapd/debian/patches/00list	2006-01-18 10:59:43 UTC (rev 172)
@@ -36,5 +36,4 @@
 105-cyradm.sh.dpatch
 110-Admin.pm.dpatch
 120-kolab-Shell.pm.dpatch
-130-kolab-imapd.c.dpatch
-140-kolab-mbox.dpatch
+130-kolab-imapd-goodchars.dpatch

Added: trunk/kolab-cyrus-imapd/debian/patches/130-kolab-imapd-goodchars.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/130-kolab-imapd-goodchars.dpatch	2006-01-18 10:18:16 UTC (rev 171)
+++ trunk/kolab-cyrus-imapd/debian/patches/130-kolab-imapd-goodchars.dpatch	2006-01-18 10:59:43 UTC (rev 172)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 140-kolab-mbox.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add imapd-goodchars patch
+
+ at DPATCH@
+--- kolab-cyrus-imapd-2.2.12/imap/mboxlist.c.orig	2006-01-02 14:09:58.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/imap/mboxlist.c	2006-01-02 14:10:49.000000000 +0100
+@@ -476,10 +476,12 @@
+ 		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),
+--- kolab-cyrus-imapd-2.2.12/imap/mboxname.c.orig	2006-01-02 14:22:32.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/imap/mboxname.c	2006-01-02 14:24:02.000000000 +0100
+@@ -649,8 +649,13 @@
+ /*
+  * 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;
+--- kolab-cyrus-imapd-2.2.12/imap/imapd.c.orig	2006-01-02 14:00:49.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/imap/imapd.c	2006-01-02 14:01:36.000000000 +0100
+@@ -3923,10 +3923,12 @@
+ 	}
+     }
+ 
++  #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) {


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/130-kolab-imapd-goodchars.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in	2006-01-18 10:18:16 UTC (rev 171)
+++ trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in	2006-01-18 10:59:43 UTC (rev 172)
@@ -1,12 +0,0 @@
---- kolab-cyrus-imapd-2.2.12.orig/lib/Makefile.in.orig	2005-12-16 13:40:47.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/Makefile.in	2005-12-16 13:41:02.000000000 +0100
-@@ -153,8 +153,7 @@
- 	$(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
- 
- clean:
--	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
--	$(BUILTSOURCES)
-+	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log
- 
- distclean: clean
- 	rm -f Makefile