- update to latest upstream

- updated all patches from uoa and reenabled rmquota+deletemailbox
2007-08-22 12:16:12 +00:00 · 2007-08-22 12:16:12 +00:00 · 741c78926d
commit 741c78926d
parent b23a1d2428
6 changed files with 142 additions and 156 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1,3 @@
 cyrus_sharedbackup-0.1.tar.gz
-cyrus-imapd-2.3.9rc2.tar.gz
+cyrus-imapd-2.3.9.tar.gz
+cyrus-imapd-2.3.9.tar.gz.sig
--- a/cyrus-imapd-2.3.9-autocreate-0.10-0.1.diff
+++ b/cyrus-imapd-2.3.9-autocreate-0.10-0.1.diff
@ -1,6 +1,6 @@
-diff -Naur cyrus-imapd-2.3.8/README.autocreate cyrus-imapd-2.3.8-autocreate.uncompiled/README.autocreate
--- cyrus-imapd-2.3.8/README.autocreate	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/README.autocreate	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/README.autocreate cyrus-imapd-2.3.9-autocreate.uncompiled/README.autocreate
+--- cyrus-imapd-2.3.9/README.autocreate	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/README.autocreate	2007-08-21 14:59:22.000000000 +0300
@@ -0,0 +1,211 @@
 +Cyrus IMAP autocreate Inbox patch
 +----------------------------------
@ -213,9 +213,9 @@ diff -Naur cyrus-imapd-2.3.8/README.autocreate cyrus-imapd-2.3.8-autocreate.unco
 +
 +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate
 +
-diff -Naur cyrus-imapd-2.3.8/imap/Makefile.in cyrus-imapd-2.3.8-autocreate.uncompiled/imap/Makefile.in
--- cyrus-imapd-2.3.8/imap/Makefile.in	2007-01-09 19:41:35.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/Makefile.in	2007-02-14 10:16:04.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/Makefile.in cyrus-imapd-2.3.9-autocreate.uncompiled/imap/Makefile.in
+--- cyrus-imapd-2.3.9/imap/Makefile.in	2007-01-09 19:41:35.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/Makefile.in	2007-08-21 14:59:22.000000000 +0300
@@ -101,7 +101,7 @@
 	convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
 	annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
@ -467,9 +467,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/Makefile.in cyrus-imapd-2.3.8-autocreate.uncom
 
 ### Other Misc Targets
 
-diff -Naur cyrus-imapd-2.3.8/imap/autosieve.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/autosieve.c
--- cyrus-imapd-2.3.8/imap/autosieve.c	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/autosieve.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/autosieve.c cyrus-imapd-2.3.9-autocreate.uncompiled/imap/autosieve.c
+--- cyrus-imapd-2.3.9/imap/autosieve.c	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/autosieve.c	2007-08-21 15:00:04.000000000 +0300
@@ -0,0 +1,587 @@
 +#include <stdio.h>
 +#include <stdlib.h>
@ -564,13 +564,13 @@ diff -Naur cyrus-imapd-2.3.8/imap/autosieve.c cyrus-imapd-2.3.8-autocreate.uncom
 +    /*  Find the dir path where the sieve scripts of the user will reside */   
 +    if (config_virtdomains && domain) {
 +         if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/",
-+              sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user, config_fulldirhash), user) >= buflen) {
+              sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) {
 +                 free(user);
 +                 return 1;
 + 	 }
 +    } else {
 +         if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", 
-+     	      sieve_dir, dir_hash_c(user, config_fulldirhash), user) >= buflen) 
+     	      sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen) 
 +                 return 1;
 +    }
 +
@ -1058,9 +1058,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/autosieve.c cyrus-imapd-2.3.8-autocreate.uncom
 + * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present
 + */
 +
-diff -Naur cyrus-imapd-2.3.8/imap/compile_sieve.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/compile_sieve.c
--- cyrus-imapd-2.3.8/imap/compile_sieve.c	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/compile_sieve.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/compile_sieve.c cyrus-imapd-2.3.9-autocreate.uncompiled/imap/compile_sieve.c
+--- cyrus-imapd-2.3.9/imap/compile_sieve.c	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/compile_sieve.c	2007-08-21 14:59:22.000000000 +0300
@@ -0,0 +1,364 @@
 +/* This tool compiles the sieve script from a command
 +line so that it can be used wby the autoadd patch */
@ -1426,9 +1426,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/compile_sieve.c cyrus-imapd-2.3.8-autocreate.u
 +
 +
 +
-diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/imapd.c
--- cyrus-imapd-2.3.8/imap/imapd.c	2007-02-05 20:49:55.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/imapd.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/imapd.c cyrus-imapd-2.3.9-autocreate.uncompiled/imap/imapd.c
+--- cyrus-imapd-2.3.9/imap/imapd.c	2007-08-02 17:18:51.000000000 +0300
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/imapd.c	2007-08-21 14:59:22.000000000 +0300
@@ -204,6 +204,7 @@
 void motd_file(int fd);
 void shut_down(int code);
@ -1481,7 +1481,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-autocreate.uncompile
  * Perform a LOGIN command
  */
 void cmd_login(char *tag, char *user)
-@@ -2077,6 +2115,9 @@
+@@ -2076,6 +2114,9 @@
 				strcspn(imapd_userid, "@") : 0);
 
     freebuf(&passwdbuf);
@ -1491,7 +1491,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-autocreate.uncompile
     return;
 }
 
-@@ -2233,6 +2274,8 @@
+@@ -2232,6 +2273,8 @@
 				config_virtdomains ?
 				strcspn(imapd_userid, "@") : 0);
 
@ -1500,9 +1500,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-autocreate.uncompile
     return;
 }
 
-diff -Naur cyrus-imapd-2.3.8/imap/lmtpd.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/lmtpd.c
--- cyrus-imapd-2.3.8/imap/lmtpd.c	2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/lmtpd.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/lmtpd.c cyrus-imapd-2.3.9-autocreate.uncompiled/imap/lmtpd.c
+--- cyrus-imapd-2.3.9/imap/lmtpd.c	2007-07-18 21:11:55.000000000 +0300
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/lmtpd.c	2007-08-21 14:59:22.000000000 +0300
@@ -117,6 +117,8 @@
 static FILE *spoolfile(message_data_t *msgdata);
 static void removespool(message_data_t *msgdata);
@ -1512,7 +1512,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/lmtpd.c cyrus-imapd-2.3.8-autocreate.uncompile
 /* current namespace */
 static struct namespace lmtpd_namespace;
 
-@@ -949,6 +951,86 @@
+@@ -950,6 +952,86 @@
     exit(code);
 }
 
@ -1599,7 +1599,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/lmtpd.c cyrus-imapd-2.3.8-autocreate.uncompile
 static int verify_user(const char *user, const char *domain, char *mailbox,
 		       long quotacheck, struct auth_state *authstate)
 {
-@@ -992,6 +1074,15 @@
+@@ -993,6 +1075,15 @@
 	 */
 	r = mlookup(namebuf, &server, &acl, NULL);
 
@ -1615,7 +1615,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/lmtpd.c cyrus-imapd-2.3.8-autocreate.uncompile
 	if (r == IMAP_MAILBOX_NONEXISTENT && !user &&
 	    config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) &&
 	    /* see if we have a mailbox whose name is close */
-@@ -1018,6 +1109,7 @@
+@@ -1019,6 +1110,7 @@
 			     aclcheck, (quotacheck < 0)
 			     || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
 			     quotacheck : 0);
@ -1623,9 +1623,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/lmtpd.c cyrus-imapd-2.3.8-autocreate.uncompile
 	}
     }
 
-diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.c
--- cyrus-imapd-2.3.8/imap/mboxlist.c	2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/mboxlist.c cyrus-imapd-2.3.9-autocreate.uncompiled/imap/mboxlist.c
+--- cyrus-imapd-2.3.9/imap/mboxlist.c	2007-08-15 20:20:55.000000000 +0300
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/mboxlist.c	2007-08-21 14:59:22.000000000 +0300
@@ -83,6 +83,12 @@
 #include "mboxlist.h"
 #include "quota.h"
@ -2019,9 +2019,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.c cyrus-imapd-2.3.8-autocreate.uncomp
 +    return r;
 +}
 +
-diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.h cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.h
--- cyrus-imapd-2.3.8/imap/mboxlist.h	2006-11-30 19:11:19.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.h	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/mboxlist.h cyrus-imapd-2.3.9-autocreate.uncompiled/imap/mboxlist.h
+--- cyrus-imapd-2.3.9/imap/mboxlist.h	2006-11-30 19:11:19.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/mboxlist.h	2007-08-21 14:59:22.000000000 +0300
@@ -204,4 +204,10 @@
 int mboxlist_commit(struct txn *tid);
 int mboxlist_abort(struct txn *tid);
@ -2033,9 +2033,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.h cyrus-imapd-2.3.8-autocreate.uncomp
 +
 +
 #endif
-diff -Naur cyrus-imapd-2.3.8/imap/pop3d.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/pop3d.c
--- cyrus-imapd-2.3.8/imap/pop3d.c	2007-02-05 20:41:48.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/pop3d.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/pop3d.c cyrus-imapd-2.3.9-autocreate.uncompiled/imap/pop3d.c
+--- cyrus-imapd-2.3.9/imap/pop3d.c	2007-03-30 21:51:01.000000000 +0300
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/imap/pop3d.c	2007-08-21 14:59:22.000000000 +0300
@@ -158,6 +158,8 @@
 static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */
 static void cmd_apop(char *response);
@ -2110,9 +2110,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/pop3d.c cyrus-imapd-2.3.8-autocreate.uncompile
     if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
 	(!acl ||
 	 !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) {
-diff -Naur cyrus-imapd-2.3.8/lib/auth.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.c
--- cyrus-imapd-2.3.8/lib/auth.c	2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/auth.c cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth.c
+--- cyrus-imapd-2.3.9/lib/auth.c	2006-11-30 19:11:22.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth.c	2007-08-21 14:59:22.000000000 +0300
@@ -117,3 +117,11 @@
 
     auth->freestate(auth_state);
@ -2125,9 +2125,9 @@ diff -Naur cyrus-imapd-2.3.8/lib/auth.c cyrus-imapd-2.3.8-autocreate.uncompiled/
 +    return auth->auth_canonuser(auth_state);
 +}
 +
-diff -Naur cyrus-imapd-2.3.8/lib/auth.h cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.h
--- cyrus-imapd-2.3.8/lib/auth.h	2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.h	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/auth.h cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth.h
+--- cyrus-imapd-2.3.9/lib/auth.h	2006-11-30 19:11:22.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth.h	2007-08-21 14:59:22.000000000 +0300
@@ -54,6 +54,7 @@
              const char *identifier);
     struct auth_state *(*newstate)(const char *identifier);
@ -2143,9 +2143,9 @@ diff -Naur cyrus-imapd-2.3.8/lib/auth.h cyrus-imapd-2.3.8-autocreate.uncompiled/
 +char *auth_canonuser(struct auth_state *auth_state);
 
 #endif /* INCLUDED_AUTH_H */
-diff -Naur cyrus-imapd-2.3.8/lib/auth_krb.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb.c
--- cyrus-imapd-2.3.8/lib/auth_krb.c	2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/auth_krb.c cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_krb.c
+--- cyrus-imapd-2.3.9/lib/auth_krb.c	2006-11-30 19:11:22.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_krb.c	2007-08-21 14:59:22.000000000 +0300
@@ -338,6 +338,15 @@
     free((char *)auth_state);
 }
@ -2182,9 +2182,9 @@ diff -Naur cyrus-imapd-2.3.8/lib/auth_krb.c cyrus-imapd-2.3.8-autocreate.uncompi
     &myfreestate,
 +    &mycanonuser,
 };
-diff -Naur cyrus-imapd-2.3.8/lib/auth_krb5.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb5.c
--- cyrus-imapd-2.3.8/lib/auth_krb5.c	2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb5.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/auth_krb5.c cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_krb5.c
+--- cyrus-imapd-2.3.9/lib/auth_krb5.c	2006-11-30 19:11:22.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_krb5.c	2007-08-21 14:59:22.000000000 +0300
@@ -197,6 +197,14 @@
     free(auth_state);
 }
@ -2219,9 +2219,9 @@ diff -Naur cyrus-imapd-2.3.8/lib/auth_krb5.c cyrus-imapd-2.3.8-autocreate.uncomp
     &myfreestate,
 +    &mycanonuser,
 };
-diff -Naur cyrus-imapd-2.3.8/lib/auth_pts.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_pts.c
--- cyrus-imapd-2.3.8/lib/auth_pts.c	2007-02-05 20:43:26.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_pts.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/auth_pts.c cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_pts.c
+--- cyrus-imapd-2.3.9/lib/auth_pts.c	2007-08-15 20:20:57.000000000 +0300
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_pts.c	2007-08-21 14:59:22.000000000 +0300
@@ -511,6 +511,14 @@
     free(auth_state);
 }
@ -2243,10 +2243,10 @@ diff -Naur cyrus-imapd-2.3.8/lib/auth_pts.c cyrus-imapd-2.3.8-autocreate.uncompi
     &myfreestate,
 +    &mycanonuser,
 };
-diff -Naur cyrus-imapd-2.3.8/lib/auth_unix.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_unix.c
--- cyrus-imapd-2.3.8/lib/auth_unix.c	2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_unix.c	2007-02-13 14:05:07.000000000 +0200
-@@ -264,6 +264,16 @@
+diff -Naur cyrus-imapd-2.3.9/lib/auth_unix.c cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_unix.c
+--- cyrus-imapd-2.3.9/lib/auth_unix.c	2007-02-13 18:42:49.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/auth_unix.c	2007-08-21 14:59:22.000000000 +0300
+@@ -269,6 +269,16 @@
     free((char *)auth_state);
 }
 
@ -2263,15 +2263,15 @@ diff -Naur cyrus-imapd-2.3.8/lib/auth_unix.c cyrus-imapd-2.3.8-autocreate.uncomp
 
 struct auth_mech auth_unix = 
 {
-@@ -273,4 +283,5 @@
+@@ -278,4 +288,5 @@
     &mymemberof,
     &mynewstate,
     &myfreestate,
 +    &mycanonuser,
 };
-diff -Naur cyrus-imapd-2.3.8/lib/imapoptions cyrus-imapd-2.3.8-autocreate.uncompiled/lib/imapoptions
--- cyrus-imapd-2.3.8/lib/imapoptions	2007-02-07 20:58:07.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/imapoptions	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/imapoptions cyrus-imapd-2.3.9-autocreate.uncompiled/lib/imapoptions
+--- cyrus-imapd-2.3.9/lib/imapoptions	2007-03-30 21:51:02.000000000 +0300
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/lib/imapoptions	2007-08-21 14:59:22.000000000 +0300
@@ -177,6 +177,55 @@
 /* Number of seconds to wait before returning a timeout failure when
    performing a client connection (e.g. in a murder environment) */
@ -2328,9 +2328,9 @@ diff -Naur cyrus-imapd-2.3.8/lib/imapoptions cyrus-imapd-2.3.8-autocreate.uncomp
 { "configdirectory", NULL, STRING }
 /* The pathname of the IMAP configuration directory.  This field is
    required. */
-diff -Naur cyrus-imapd-2.3.8/notifyd/Makefile.in cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/Makefile.in
--- cyrus-imapd-2.3.8/notifyd/Makefile.in	2006-11-30 19:11:23.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/Makefile.in	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/notifyd/Makefile.in cyrus-imapd-2.3.9-autocreate.uncompiled/notifyd/Makefile.in
+--- cyrus-imapd-2.3.9/notifyd/Makefile.in	2006-11-30 19:11:23.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/notifyd/Makefile.in	2007-08-21 14:59:22.000000000 +0300
@@ -69,10 +69,11 @@
 SERVICE=../master/service.o
 
@ -2344,9 +2344,9 @@ diff -Naur cyrus-imapd-2.3.8/notifyd/Makefile.in cyrus-imapd-2.3.8-autocreate.un
 
 PURIFY=/usr/local/bin/purify
 PUREOPT=-best-effort
-diff -Naur cyrus-imapd-2.3.8/notifyd/notifyd.c cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/notifyd.c
--- cyrus-imapd-2.3.8/notifyd/notifyd.c	2006-11-30 19:11:23.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/notifyd.c	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/notifyd/notifyd.c cyrus-imapd-2.3.9-autocreate.uncompiled/notifyd/notifyd.c
+--- cyrus-imapd-2.3.9/notifyd/notifyd.c	2006-11-30 19:11:23.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/notifyd/notifyd.c	2007-08-21 14:59:22.000000000 +0300
@@ -97,7 +97,7 @@
 
 #define NOTIFY_MAXSIZE 8192
@ -2356,9 +2356,9 @@ diff -Naur cyrus-imapd-2.3.8/notifyd/notifyd.c cyrus-imapd-2.3.8-autocreate.unco
 {
     struct sockaddr_un sun_data;
     socklen_t sunlen = sizeof(sun_data);
-diff -Naur cyrus-imapd-2.3.8/ptclient/Makefile.in cyrus-imapd-2.3.8-autocreate.uncompiled/ptclient/Makefile.in
--- cyrus-imapd-2.3.8/ptclient/Makefile.in	2006-11-30 19:11:24.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/ptclient/Makefile.in	2007-02-13 14:05:07.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/ptclient/Makefile.in cyrus-imapd-2.3.9-autocreate.uncompiled/ptclient/Makefile.in
+--- cyrus-imapd-2.3.9/ptclient/Makefile.in	2006-11-30 19:11:24.000000000 +0200
+++ cyrus-imapd-2.3.9-autocreate.uncompiled/ptclient/Makefile.in	2007-08-21 14:59:22.000000000 +0300
@@ -57,10 +57,11 @@
 AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
 AFS_LIBS = @AFS_LIBS@
--- a/cyrus-imapd-2.3.9-autosieve-0.6.0.diff
+++ b/cyrus-imapd-2.3.9-autosieve-0.6.0.diff
@ -1,6 +1,6 @@
-diff -Naur cyrus-imapd-2.3.8/README.autosievefolder cyrus-imapd-2.3.8-autosieve.uncompiled/README.autosievefolder
--- cyrus-imapd-2.3.8/README.autosievefolder	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autosieve.uncompiled/README.autosievefolder	2007-02-13 15:05:04.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/README.autosievefolder cyrus-imapd-2.3.9-autosieve.uncompiled/README.autosievefolder
+--- cyrus-imapd-2.3.9/README.autosievefolder	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd-2.3.9-autosieve.uncompiled/README.autosievefolder	2007-08-21 16:04:08.000000000 +0300
@@ -0,0 +1,42 @@
 +Cyrus IMAP autosievefolder patch
 +----------------------------------
@ -44,9 +44,9 @@ diff -Naur cyrus-imapd-2.3.8/README.autosievefolder cyrus-imapd-2.3.8-autosieve.
 +
 +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder
 +
-diff -Naur cyrus-imapd-2.3.8/imap/lmtp_sieve.c cyrus-imapd-2.3.8-autosieve.uncompiled/imap/lmtp_sieve.c
--- cyrus-imapd-2.3.8/imap/lmtp_sieve.c	2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-autosieve.uncompiled/imap/lmtp_sieve.c	2007-02-13 15:05:04.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/lmtp_sieve.c cyrus-imapd-2.3.9-autosieve.uncompiled/imap/lmtp_sieve.c
+--- cyrus-imapd-2.3.9/imap/lmtp_sieve.c	2007-03-27 22:53:08.000000000 +0300
+++ cyrus-imapd-2.3.9-autosieve.uncompiled/imap/lmtp_sieve.c	2007-08-21 16:04:08.000000000 +0300
@@ -88,6 +88,9 @@
     struct auth_state *authstate;
 } script_data_t;
@ -160,9 +160,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/lmtp_sieve.c cyrus-imapd-2.3.8-autosieve.uncom
 +        return IMAP_MAILBOX_NONEXISTENT;
 +}
 +
-diff -Naur cyrus-imapd-2.3.8/lib/imapoptions cyrus-imapd-2.3.8-autosieve.uncompiled/lib/imapoptions
--- cyrus-imapd-2.3.8/lib/imapoptions	2007-02-07 20:58:07.000000000 +0200
-+++ cyrus-imapd-2.3.8-autosieve.uncompiled/lib/imapoptions	2007-02-13 15:05:04.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/lib/imapoptions cyrus-imapd-2.3.9-autosieve.uncompiled/lib/imapoptions
+--- cyrus-imapd-2.3.9/lib/imapoptions	2007-03-30 21:51:02.000000000 +0300
+++ cyrus-imapd-2.3.9-autosieve.uncompiled/lib/imapoptions	2007-08-21 16:04:08.000000000 +0300
@@ -884,6 +884,15 @@
 /* If enabled, lmtpd will look for Sieve scripts in user's home
    directories: ~user/.sieve. */
--- a/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
+++ b/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
@ -1,6 +1,6 @@
-diff -Naur cyrus-imapd-2.3.8/imap/ctl_cyrusdb.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/ctl_cyrusdb.c
--- cyrus-imapd-2.3.8/imap/ctl_cyrusdb.c	2006-11-30 19:11:17.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/ctl_cyrusdb.c	2007-02-21 16:34:33.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/ctl_cyrusdb.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/ctl_cyrusdb.c
+--- cyrus-imapd-2.3.9/imap/ctl_cyrusdb.c	2007-03-30 21:40:20.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/ctl_cyrusdb.c	2007-08-21 16:49:06.000000000 +0300
@@ -133,7 +133,7 @@
     /* if it is MBTYPE_RESERVED, unset it & call mboxlist_delete */
     if(!r && (mbtype & MBTYPE_RESERVE)) {
@ -10,10 +10,10 @@ diff -Naur cyrus-imapd-2.3.8/imap/ctl_cyrusdb.c cyrus-imapd-2.3.8-rmquota+delete
 	    if(r) {
 		/* log the error */
 		syslog(LOG_ERR,
-diff -Naur cyrus-imapd-2.3.8/imap/ctl_mboxlist.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/ctl_mboxlist.c
--- cyrus-imapd-2.3.8/imap/ctl_mboxlist.c	2007-02-05 20:41:46.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/ctl_mboxlist.c	2007-02-21 16:34:48.000000000 +0200
-@@ -461,7 +461,7 @@
+diff -Naur cyrus-imapd-2.3.9/imap/ctl_mboxlist.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/ctl_mboxlist.c
+--- cyrus-imapd-2.3.9/imap/ctl_mboxlist.c	2007-07-18 21:56:11.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/ctl_mboxlist.c	2007-08-21 16:49:06.000000000 +0300
+@@ -484,7 +484,7 @@
 	    
 	    wipe_head = wipe_head->next;
 	    
@ -22,10 +22,10 @@ diff -Naur cyrus-imapd-2.3.8/imap/ctl_mboxlist.c cyrus-imapd-2.3.8-rmquota+delet
 	    if(!ret) sync_log_mailbox(me->mailbox);
 	    if(ret) {
 		fprintf(stderr, "couldn't delete defunct mailbox %s\n",
-diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/imapd.c
--- cyrus-imapd-2.3.8/imap/imapd.c	2007-02-05 20:49:55.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/imapd.c	2007-02-21 16:34:58.000000000 +0200
-@@ -4983,7 +4983,7 @@
+diff -Naur cyrus-imapd-2.3.9/imap/imapd.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/imapd.c
+--- cyrus-imapd-2.3.9/imap/imapd.c	2007-08-02 17:18:51.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/imapd.c	2007-08-21 16:49:28.000000000 +0300
+@@ -4994,7 +4994,7 @@
 
     r = mboxlist_deletemailbox(name, imapd_userisadmin,
 			       imapd_userid, imapd_authstate,
@ -34,7 +34,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
     
     if (!r) sync_log_mailbox(name);
 
-@@ -5007,6 +5007,12 @@
+@@ -5018,6 +5018,12 @@
     char *p;
     int domainlen = 0;
     int sync_lockfd = (-1);
@ -47,7 +47,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
 
     r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					       imapd_userid, mailboxname);
-@@ -5065,7 +5071,7 @@
+@@ -5076,7 +5082,7 @@
 
 	r = mboxlist_deletemailbox(mailboxname, imapd_userisadmin,
 				   imapd_userid, imapd_authstate, 1-force,
@ -56,7 +56,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
     }
 
     /* was it a top-level user mailbox? */
-@@ -6423,6 +6429,7 @@
+@@ -6434,6 +6440,7 @@
 {
     int newquota = -1;
     int badresource = 0;
@ -64,7 +64,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
     int c;
     int force = 0;
     static struct buf arg;
-@@ -6439,7 +6446,8 @@
+@@ -6450,7 +6457,8 @@
     if (c != ')' || arg.s[0] != '\0') {
 	for (;;) {
 	    if (c != ' ') goto badlist;
@ -74,7 +74,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
 	    c = getword(imapd_in, &arg);
 	    if (c != ' ' && c != ')') goto badlist;
 	    if (arg.s[0] == '\0') goto badlist;
-@@ -6508,7 +6516,10 @@
+@@ -6519,7 +6527,10 @@
 
     /* local mailbox */
     if (!r || (r == IMAP_MAILBOX_NONEXISTENT)) {
@ -86,18 +86,18 @@ diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
     }
 
     imapd_check(NULL, 0, 0);
-@@ -8221,7 +8232,7 @@
- 	/* note also that we need to remember to let proxyadmins do this */
- 	r = mboxlist_deletemailbox(mailboxname,
- 				   imapd_userisadmin || imapd_userisproxyadmin,
-				   imapd_userid, imapd_authstate, 0, 1, 0);
-+				   imapd_userid, imapd_authstate, 0, 1, 0, 1);
- 	if(r) syslog(LOG_ERR,
- 		     "Could not delete local mailbox during move of %s",
- 		     mailboxname);
-diff -Naur cyrus-imapd-2.3.8/imap/mailbox.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mailbox.c
--- cyrus-imapd-2.3.8/imap/mailbox.c	2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mailbox.c	2007-02-21 16:35:10.000000000 +0200
+@@ -8237,7 +8248,7 @@
+ 	    /* note also that we need to remember to let proxyadmins do this */
+ 	    r = mboxlist_deletemailbox(mailboxname,
+ 				       imapd_userisadmin || imapd_userisproxyadmin,
+-				       imapd_userid, imapd_authstate, 0, 1, 0);
+				       imapd_userid, imapd_authstate, 0, 1, 0, 1);
+ 	    if(r) syslog(LOG_ERR,
+ 			 "Could not delete local mailbox during move of %s",
+ 			 mailboxname);
+diff -Naur cyrus-imapd-2.3.9/imap/mailbox.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mailbox.c
+--- cyrus-imapd-2.3.9/imap/mailbox.c	2007-07-20 17:21:57.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mailbox.c	2007-08-21 16:49:06.000000000 +0300
@@ -2745,27 +2745,7 @@
 
     seen_delete_mailbox(mailbox);
@ -127,7 +127,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/mailbox.c cyrus-imapd-2.3.8-rmquota+deletemail
 
     /* Flush data (message file) directory */
     mailbox_delete_files(mailbox->path);
-@@ -3392,3 +3372,48 @@
+@@ -3394,3 +3374,48 @@
 	if (*p == '.') *p = '/';
     }
 }
@ -176,9 +176,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/mailbox.c cyrus-imapd-2.3.8-rmquota+deletemail
 +    return r;
 +}
 +
-diff -Naur cyrus-imapd-2.3.8/imap/mailbox.h cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mailbox.h
--- cyrus-imapd-2.3.8/imap/mailbox.h	2006-11-30 19:11:19.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mailbox.h	2007-02-21 16:35:20.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/mailbox.h cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mailbox.h
+--- cyrus-imapd-2.3.9/imap/mailbox.h	2006-11-30 19:11:19.000000000 +0200
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mailbox.h	2007-08-21 16:49:06.000000000 +0300
@@ -364,6 +364,8 @@
 			  struct mailbox *mailboxp);
 extern int mailbox_delete(struct mailbox *mailbox, int delete_quota_root);
@ -188,9 +188,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/mailbox.h cyrus-imapd-2.3.8-rmquota+deletemail
 extern int mailbox_rename_copy(struct mailbox *oldmailbox, 
 			       const char *newname, char *newpartition,
 			       bit32 *olduidvalidityp, bit32 *newuidvalidityp,
-diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mboxlist.c
--- cyrus-imapd-2.3.8/imap/mboxlist.c	2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mboxlist.c	2007-02-21 16:35:29.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/mboxlist.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mboxlist.c
+--- cyrus-imapd-2.3.9/imap/mboxlist.c	2007-08-15 20:20:55.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mboxlist.c	2007-08-21 16:49:06.000000000 +0300
@@ -95,6 +95,12 @@
 static int mboxlist_opensubs();
 static void mboxlist_closesubs();
@ -428,9 +428,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.c cyrus-imapd-2.3.8-rmquota+deletemai
  error_noclose:
     syslog(LOG_ERR, "LOSTQUOTA: unable to change quota root for %s to %s: %s",
 	   name, mboxlist_newquota->root, error_message(r));
-diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.h cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mboxlist.h
--- cyrus-imapd-2.3.8/imap/mboxlist.h	2006-11-30 19:11:19.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mboxlist.h	2007-02-21 16:35:34.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/mboxlist.h cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mboxlist.h
+--- cyrus-imapd-2.3.9/imap/mboxlist.h	2006-11-30 19:11:19.000000000 +0200
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/mboxlist.h	2007-08-21 16:49:06.000000000 +0300
@@ -126,7 +126,7 @@
  * the planet */
 int mboxlist_deletemailbox(const char *name, int isadmin, char *userid, 
@ -440,30 +440,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.h cyrus-imapd-2.3.8-rmquota+deletemai
 
 /* Rename/move a mailbox (hierarchical) */
 int mboxlist_renamemailbox(char *oldname, char *newname, char *partition, 
-diff -Naur cyrus-imapd-2.3.8/imap/mupdate.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mupdate.c
--- cyrus-imapd-2.3.8/imap/mupdate.c	2007-01-31 16:10:05.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/mupdate.c	2007-02-21 16:35:44.000000000 +0200
-@@ -2313,7 +2313,7 @@
- 	    remote_boxes.head = r->next;
- 	} else if (ret < 0) {
- 	    /* Local without corresponding remote, delete it */
-	    mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0);
-+	    mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0, 1);
- 	    local_boxes.head = l->next;
- 	} else /* (ret > 0) */ {
- 	    /* Remote without corresponding local, insert it */
-@@ -2328,7 +2328,7 @@
-     if(l && !r) {
- 	/* we have more deletes to do */
- 	while(l) {
-	    mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0);
-+	    mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0, 1);
- 	    local_boxes.head = l->next;
- 	    l = local_boxes.head;
- 	}
-diff -Naur cyrus-imapd-2.3.8/imap/nntpd.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/nntpd.c
--- cyrus-imapd-2.3.8/imap/nntpd.c	2007-02-05 20:49:56.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/nntpd.c	2007-02-21 16:35:53.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/nntpd.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/nntpd.c
+--- cyrus-imapd-2.3.9/imap/nntpd.c	2007-03-30 21:51:01.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/nntpd.c	2007-08-21 16:49:06.000000000 +0300
@@ -3358,7 +3358,7 @@
     /* XXX should we delete right away, or wait until empty? */
 
@ -473,9 +452,9 @@ diff -Naur cyrus-imapd-2.3.8/imap/nntpd.c cyrus-imapd-2.3.8-rmquota+deletemailbo
 
     if (!r) sync_log_mailbox(mailboxname);
 
-diff -Naur cyrus-imapd-2.3.8/imap/sync_reset.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/sync_reset.c
--- cyrus-imapd-2.3.8/imap/sync_reset.c	2006-11-30 19:11:20.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/sync_reset.c	2007-02-22 13:23:41.000000000 +0200
+diff -Naur cyrus-imapd-2.3.9/imap/sync_reset.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/sync_reset.c
+--- cyrus-imapd-2.3.9/imap/sync_reset.c	2007-03-30 21:40:21.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/sync_reset.c	2007-08-21 16:49:06.000000000 +0300
@@ -258,7 +258,7 @@
     if (r) goto fail;
 
@ -503,10 +482,10 @@ diff -Naur cyrus-imapd-2.3.8/imap/sync_reset.c cyrus-imapd-2.3.8-rmquota+deletem
     if (r && (r != IMAP_MAILBOX_NONEXISTENT)) goto fail;
 
     if ((r=user_deletedata(user, sync_userid, sync_authstate, 1)))
-diff -Naur cyrus-imapd-2.3.8/imap/sync_server.c cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/sync_server.c
--- cyrus-imapd-2.3.8/imap/sync_server.c	2006-11-30 19:11:20.000000000 +0200
-+++ cyrus-imapd-2.3.8-rmquota+deletemailbox.uncompiled/imap/sync_server.c	2007-02-22 13:24:17.000000000 +0200
-@@ -1581,7 +1581,7 @@
+diff -Naur cyrus-imapd-2.3.9/imap/sync_server.c cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/sync_server.c
+--- cyrus-imapd-2.3.9/imap/sync_server.c	2007-08-01 22:19:03.000000000 +0300
+++ cyrus-imapd-2.3.9-rmquota+deletemailbox.uncompiled/imap/sync_server.c	2007-08-21 16:49:06.000000000 +0300
+@@ -1590,7 +1590,7 @@
 
     for (item = list->head ; item ; item = item->next) {
         r=mboxlist_deletemailbox(item->name, sync_userisadmin, sync_userid,
@ -515,7 +494,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/sync_server.c cyrus-imapd-2.3.8-rmquota+delete
 
         if (r) goto fail;
     }
-@@ -1591,7 +1591,7 @@
+@@ -1600,7 +1600,7 @@
     (sync_namespacep->mboxname_tointernal)(sync_namespacep, "INBOX",
 					   user, buf);
     r = mboxlist_deletemailbox(buf, sync_userisadmin, sync_userid,
@ -524,7 +503,7 @@ diff -Naur cyrus-imapd-2.3.8/imap/sync_server.c cyrus-imapd-2.3.8-rmquota+delete
     if (r && (r != IMAP_MAILBOX_NONEXISTENT)) goto fail;
 
     if ((r=user_deletedata(user, sync_userid, sync_authstate, 1)))
-@@ -2526,7 +2526,7 @@
+@@ -2546,7 +2546,7 @@
 
     /* Delete with admin priveleges */
     r = mboxlist_deletemailbox(name, sync_userisadmin, sync_userid,
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@ -1,7 +1,7 @@
-%define upstream_ver 2.3.9rc2
+%define upstream_ver 2.3.9
 Name: cyrus-imapd
 Version: 2.3.9
-Release: 5.rc2%{?dist}
+Release: 6%{?dist}

 # ********************** BUILD TIME OPTIONS START **********************

@ -89,7 +89,9 @@ Release: 5.rc2%{?dist}
 %endif

 Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-License: BSD
+# BSD with advertising: imap/setproctitle.c, lib/mkgmtime.c, lib/sysexits.h
+# the rest is CMU
+License: MIT and BSD with advertising
 Group: System Environment/Daemons
 URL: http://cyrusimap.web.cmu.edu/
 #Packager: Simon Matter <simon.matter@invoca.ch>
@ -128,10 +130,9 @@ Source29: cyrus-imapd-sendmail-8.12.9-cyrusv2.m4
 Source30: cyrus-imapd-README.contrib
 Source33: cyrus-imapd-README.skiplist_recovery
 Patch0: cyrus-imapd-2.2.12-no_transfig.patch
-#Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.8/cyrus-imapd-2.3.8-autocreate-0.10-0.diff
-Patch1: cyrus-imapd-2.3.9-autocreate-0.10-0.1.diff
-Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.8/cyrus-imapd-2.3.8-autosieve-0.6.0.diff
-Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.8/cyrus-imapd-2.3.8-rmquota+deletemailbox-0.2-1.diff
+Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-autocreate-0.10-0.diff
+Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-autosieve-0.6.0.diff
+Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
 Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
 Patch5: cyrus-imapd-2.2.12-munge8bit.patch
 Patch6: cyrus-imapd-2.1.16-getrlimit.patch
@ -235,7 +236,7 @@ one running the server.
 %if %{AUTOCREATE}
 %patch1 -p1 -b .autocreate
 %patch2 -p1 -b .autosieve
-#%patch3 -p1 -b .rmquota
+%patch3 -p1 -b .rmquota
 %endif
 %patch4 -p1 -b .flock
 # superseded by upstream munge8bit support
@ -797,6 +798,10 @@ fi
 %{_mandir}/man1/*

 %changelog
+* Wed Aug 22 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-6
+- update to latest upstream
+- updated all patches from uoa and reenabled rmquota+deletemailbox
+
 * Thu Aug 16 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-5.rc2
 - update to latest upstream beta

--- a/3
+++ b/3
@ -1,2 +1,3 @@
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz
-113433c1fdc777e3b0466b5ce643b8bc  cyrus-imapd-2.3.9rc2.tar.gz
+113433c1fdc777e3b0466b5ce643b8bc  cyrus-imapd-2.3.9.tar.gz
+030f3c404f6a2e8d53cd08722bca0176  cyrus-imapd-2.3.9.tar.gz.sig