diff --git a/.cvsignore b/.cvsignore index cdde5eb..92b6ae9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ cyrus_sharedbackup-0.1.tar.gz -cyrus-imapd-2.3.11.tar.gz -cyrus-imapd-2.3.11.tar.gz.sig +cyrus-imapd-2.3.12p2.tar.gz +cyrus-imapd-2.3.12p2.tar.gz.sig diff --git a/cyrus-imapd-2.2.10-groupcache.patch b/cyrus-imapd-2.2.10-groupcache.patch deleted file mode 100644 index 4d1a04e..0000000 --- a/cyrus-imapd-2.2.10-groupcache.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur cyrus-imapd-2.2.10.orig/lib/auth_unix.c cyrus-imapd-2.2.10/lib/auth_unix.c ---- cyrus-imapd-2.2.10.orig/lib/auth_unix.c Tue Sep 14 00:49:29 2004 -+++ cyrus-imapd-2.2.10/lib/auth_unix.c Thu Dec 16 08:36:32 2004 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -226,6 +227,10 @@ - struct passwd *pwd; - struct group *grp; - char **mem; -+ FILE *groupcache; -+ char fnamebuf[1024]; -+ const char *config_dir = -+ libcyrus_config_getstring(CYRUSOPT_CONFIG_DIR); - - identifier = auth_canonifyid(identifier, 0); - if (!identifier) return 0; -@@ -242,8 +247,11 @@ - - pwd = getpwnam(identifier); - -+ strcpy(fnamebuf, config_dir); -+ strcat(fnamebuf, "/group.cache"); -+ groupcache = fopen(fnamebuf, "r"); - setgrent(); -- while ((grp = getgrent())) { -+ while (grp = ( (groupcache) ? fgetgrent(groupcache) : getgrent() )) { - for (mem = grp->gr_mem; *mem; mem++) { - if (!strcmp(*mem, identifier)) break; - } -@@ -256,6 +264,7 @@ - } - } - endgrent(); -+ if (groupcache) fclose(groupcache); - return newstate; - } - diff --git a/cyrus-imapd-2.3.11-autocreate-0.10-0.diff b/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff similarity index 92% rename from cyrus-imapd-2.3.11-autocreate-0.10-0.diff rename to cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff index b68d68a..5f68ea2 100644 --- a/cyrus-imapd-2.3.11-autocreate-0.10-0.diff +++ b/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff @@ -1,6 +1,6 @@ -diff -Naur cyrus-imapd-2.3.11/README.autocreate cyrus-imapd-2.3.11-autocreate.uncompiled/README.autocreate ---- cyrus-imapd-2.3.11/README.autocreate 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/README.autocreate 2007-12-12 13:29:49.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/README.autocreate cyrus-imapd-2.3.12p2-autocreate.uncompiled/README.autocreate +--- cyrus-imapd-2.3.12p2/README.autocreate 1970-01-01 02:00:00.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/README.autocreate 2008-05-06 14:48:41.000000000 +0300 @@ -0,0 +1,211 @@ +Cyrus IMAP autocreate Inbox patch +---------------------------------- @@ -213,19 +213,19 @@ diff -Naur cyrus-imapd-2.3.11/README.autocreate cyrus-imapd-2.3.11-autocreate.un + +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate + -diff -Naur cyrus-imapd-2.3.11/imap/Makefile.in cyrus-imapd-2.3.11-autocreate.uncompiled/imap/Makefile.in ---- cyrus-imapd-2.3.11/imap/Makefile.in 2007-10-18 21:48:02.000000000 +0300 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/Makefile.in 2007-12-12 13:29:49.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/imap/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/Makefile.in +--- cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-04-04 00:09:51.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/Makefile.in 2008-05-06 14:49:12.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 \ - imapparse.o telemetry.o user.o notify.o protocol.o idle.o quota_db.o \ -- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o -+ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o + imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ +- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ ++ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ + statuscache_db.o IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o - -@@ -117,7 +117,7 @@ +@@ -118,7 +118,7 @@ fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ @@ -234,7 +234,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/Makefile.in cyrus-imapd-2.3.11-autocreate.unc BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ -@@ -182,9 +182,9 @@ +@@ -183,9 +183,9 @@ mupdate_err.h: mupdate_err.c ### Services @@ -246,7 +246,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/Makefile.in cyrus-imapd-2.3.11-autocreate.unc lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) -@@ -198,158 +198,162 @@ +@@ -199,158 +199,162 @@ $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) @@ -477,9 +477,9 @@ diff -Naur cyrus-imapd-2.3.11/imap/Makefile.in cyrus-imapd-2.3.11-autocreate.unc ### Other Misc Targets -diff -Naur cyrus-imapd-2.3.11/imap/autosieve.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/autosieve.c ---- cyrus-imapd-2.3.11/imap/autosieve.c 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/autosieve.c 2007-12-12 13:29:49.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/imap/autosieve.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/autosieve.c +--- cyrus-imapd-2.3.12p2/imap/autosieve.c 1970-01-01 02:00:00.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/autosieve.c 2008-05-06 14:48:41.000000000 +0300 @@ -0,0 +1,590 @@ +#include +#include @@ -1071,9 +1071,9 @@ diff -Naur cyrus-imapd-2.3.11/imap/autosieve.c cyrus-imapd-2.3.11-autocreate.unc + * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present + */ + -diff -Naur cyrus-imapd-2.3.11/imap/compile_sieve.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/compile_sieve.c ---- cyrus-imapd-2.3.11/imap/compile_sieve.c 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/compile_sieve.c 2007-12-12 13:29:49.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/imap/compile_sieve.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/compile_sieve.c +--- cyrus-imapd-2.3.12p2/imap/compile_sieve.c 1970-01-01 02:00:00.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/compile_sieve.c 2008-05-06 14:48:41.000000000 +0300 @@ -0,0 +1,365 @@ +/* This tool compiles the sieve script from a command +line so that it can be used wby the autoadd patch */ @@ -1440,10 +1440,10 @@ diff -Naur cyrus-imapd-2.3.11/imap/compile_sieve.c cyrus-imapd-2.3.11-autocreate + + + -diff -Naur cyrus-imapd-2.3.11/imap/imapd.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/imapd.c ---- cyrus-imapd-2.3.11/imap/imapd.c 2007-11-27 17:31:28.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/imapd.c 2007-12-12 13:29:49.000000000 +0200 -@@ -205,6 +205,7 @@ +diff -Naur cyrus-imapd-2.3.12p2/imap/imapd.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/imapd.c +--- cyrus-imapd-2.3.12p2/imap/imapd.c 2008-04-13 18:40:29.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/imapd.c 2008-05-06 14:48:41.000000000 +0300 +@@ -208,6 +208,7 @@ void motd_file(int fd); void shut_down(int code); void fatal(const char *s, int code); @@ -1451,7 +1451,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/imapd.c cyrus-imapd-2.3.11-autocreate.uncompi void cmdloop(void); void cmd_login(char *tag, char *user); -@@ -1907,6 +1908,43 @@ +@@ -1970,6 +1971,43 @@ } /* @@ -1495,7 +1495,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/imapd.c cyrus-imapd-2.3.11-autocreate.uncompi * Perform a LOGIN command */ void cmd_login(char *tag, char *user) -@@ -2074,6 +2112,9 @@ +@@ -2137,6 +2175,9 @@ strcspn(imapd_userid, "@") : 0); freebuf(&passwdbuf); @@ -1505,7 +1505,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/imapd.c cyrus-imapd-2.3.11-autocreate.uncompi return; } -@@ -2232,6 +2273,8 @@ +@@ -2295,6 +2336,8 @@ config_virtdomains ? strcspn(imapd_userid, "@") : 0); @@ -1514,9 +1514,9 @@ diff -Naur cyrus-imapd-2.3.11/imap/imapd.c cyrus-imapd-2.3.11-autocreate.uncompi return; } -diff -Naur cyrus-imapd-2.3.11/imap/lmtpd.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/lmtpd.c ---- cyrus-imapd-2.3.11/imap/lmtpd.c 2007-10-12 15:54:23.000000000 +0300 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/lmtpd.c 2007-12-12 13:29:49.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/imap/lmtpd.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/lmtpd.c +--- cyrus-imapd-2.3.12p2/imap/lmtpd.c 2008-04-11 23:07:00.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/lmtpd.c 2008-05-06 14:48:41.000000000 +0300 @@ -117,6 +117,8 @@ static FILE *spoolfile(message_data_t *msgdata); static void removespool(message_data_t *msgdata); @@ -1526,7 +1526,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/lmtpd.c cyrus-imapd-2.3.11-autocreate.uncompi /* current namespace */ static struct namespace lmtpd_namespace; -@@ -956,6 +958,86 @@ +@@ -976,6 +978,86 @@ exit(code); } @@ -1613,7 +1613,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/lmtpd.c cyrus-imapd-2.3.11-autocreate.uncompi static int verify_user(const char *user, const char *domain, char *mailbox, long quotacheck, struct auth_state *authstate) { -@@ -999,6 +1081,15 @@ +@@ -1019,6 +1101,15 @@ */ r = mlookup(namebuf, &server, &acl, NULL); @@ -1629,7 +1629,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/lmtpd.c cyrus-imapd-2.3.11-autocreate.uncompi if (r == IMAP_MAILBOX_NONEXISTENT && !user && config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && /* see if we have a mailbox whose name is close */ -@@ -1025,6 +1116,7 @@ +@@ -1045,6 +1136,7 @@ aclcheck, (quotacheck < 0) || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? quotacheck : 0); @@ -1637,10 +1637,10 @@ diff -Naur cyrus-imapd-2.3.11/imap/lmtpd.c cyrus-imapd-2.3.11-autocreate.uncompi } } -diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.c ---- cyrus-imapd-2.3.11/imap/mboxlist.c 2007-11-27 17:31:29.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.c 2007-12-12 13:29:49.000000000 +0200 -@@ -84,6 +84,12 @@ +diff -Naur cyrus-imapd-2.3.12p2/imap/mboxlist.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/mboxlist.c +--- cyrus-imapd-2.3.12p2/imap/mboxlist.c 2008-04-04 14:09:42.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/mboxlist.c 2008-05-06 14:48:41.000000000 +0300 +@@ -83,6 +83,12 @@ #include "quota.h" #include "sync_log.h" @@ -1653,7 +1653,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.c cyrus-imapd-2.3.11-autocreate.unco #define DB config_mboxlist_db #define SUBDB config_subscription_db -@@ -101,11 +107,29 @@ +@@ -100,11 +106,29 @@ static int mboxlist_changequota(const char *name, int matchlen, int maycreate, void *rock); @@ -1683,7 +1683,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.c cyrus-imapd-2.3.11-autocreate.unco #define FNAME_SUBSSUFFIX ".sub" /* -@@ -3380,3 +3404,349 @@ +@@ -3383,3 +3407,349 @@ return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED); } @@ -2033,10 +2033,10 @@ diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.c cyrus-imapd-2.3.11-autocreate.unco + return r; +} + -diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.h cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.h ---- cyrus-imapd-2.3.11/imap/mboxlist.h 2007-11-27 17:31:29.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.h 2007-12-12 13:30:27.000000000 +0200 -@@ -211,4 +211,8 @@ +diff -Naur cyrus-imapd-2.3.12p2/imap/mboxlist.h cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/mboxlist.h +--- cyrus-imapd-2.3.12p2/imap/mboxlist.h 2008-03-24 19:09:18.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/mboxlist.h 2008-05-06 14:48:41.000000000 +0300 +@@ -212,4 +212,8 @@ int mboxlist_abort(struct txn *tid); int mboxlist_delayed_delete_isenabled(void); @@ -2045,10 +2045,10 @@ diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.h cyrus-imapd-2.3.11-autocreate.unco + int autocreatequota); + #endif -diff -Naur cyrus-imapd-2.3.11/imap/pop3d.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/pop3d.c ---- cyrus-imapd-2.3.11/imap/pop3d.c 2007-11-26 22:23:06.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/pop3d.c 2007-12-12 13:29:49.000000000 +0200 -@@ -159,6 +159,8 @@ +diff -Naur cyrus-imapd-2.3.12p2/imap/pop3d.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/pop3d.c +--- cyrus-imapd-2.3.12p2/imap/pop3d.c 2008-04-11 23:07:00.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/imap/pop3d.c 2008-05-06 14:48:41.000000000 +0300 +@@ -172,6 +172,8 @@ static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* */ static void cmd_apop(char *response); @@ -2057,7 +2057,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/pop3d.c cyrus-imapd-2.3.11-autocreate.uncompi static void cmd_auth(char *arg); static void cmd_capa(void); static void cmd_pass(char *pass); -@@ -1227,6 +1229,7 @@ +@@ -1245,6 +1247,7 @@ popd_userid = xstrdup(userbuf); prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); } @@ -2065,7 +2065,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/pop3d.c cyrus-imapd-2.3.11-autocreate.uncompi } void cmd_pass(char *pass) -@@ -1525,6 +1528,43 @@ +@@ -1545,6 +1548,43 @@ } /* @@ -2109,7 +2109,7 @@ diff -Naur cyrus-imapd-2.3.11/imap/pop3d.c cyrus-imapd-2.3.11-autocreate.uncompi * Complete the login process by opening and locking the user's inbox */ int openinbox(void) -@@ -1553,6 +1593,12 @@ +@@ -1573,6 +1613,12 @@ if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL, &server, &acl, NULL); @@ -2122,10 +2122,10 @@ diff -Naur cyrus-imapd-2.3.11/imap/pop3d.c cyrus-imapd-2.3.11-autocreate.uncompi if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && (!acl || !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { -diff -Naur cyrus-imapd-2.3.11/lib/auth.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.c ---- cyrus-imapd-2.3.11/lib/auth.c 2006-11-30 19:11:22.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.c 2007-12-12 13:29:49.000000000 +0200 -@@ -117,3 +117,11 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/auth.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth.c +--- cyrus-imapd-2.3.12p2/lib/auth.c 2008-03-24 19:43:08.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth.c 2008-05-06 14:48:41.000000000 +0300 +@@ -118,3 +118,11 @@ auth->freestate(auth_state); } @@ -2137,10 +2137,10 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth.c cyrus-imapd-2.3.11-autocreate.uncompile + return auth->auth_canonuser(auth_state); +} + -diff -Naur cyrus-imapd-2.3.11/lib/auth.h cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.h ---- cyrus-imapd-2.3.11/lib/auth.h 2006-11-30 19:11:22.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.h 2007-12-12 13:29:49.000000000 +0200 -@@ -54,6 +54,7 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/auth.h cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth.h +--- cyrus-imapd-2.3.12p2/lib/auth.h 2008-03-24 19:43:08.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth.h 2008-05-06 14:48:41.000000000 +0300 +@@ -55,6 +55,7 @@ const char *identifier); struct auth_state *(*newstate)(const char *identifier); void (*freestate)(struct auth_state *auth_state); @@ -2148,17 +2148,17 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth.h cyrus-imapd-2.3.11-autocreate.uncompile }; extern struct auth_mech *auth_mechs[]; -@@ -76,5 +77,6 @@ +@@ -77,5 +78,6 @@ const char *identifier); struct auth_state *auth_newstate(const char *identifier); void auth_freestate(struct auth_state *auth_state); +char *auth_canonuser(struct auth_state *auth_state); #endif /* INCLUDED_AUTH_H */ -diff -Naur cyrus-imapd-2.3.11/lib/auth_krb.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb.c ---- cyrus-imapd-2.3.11/lib/auth_krb.c 2007-09-27 23:02:45.000000000 +0300 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb.c 2007-12-12 13:29:49.000000000 +0200 -@@ -338,6 +338,15 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/auth_krb.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb.c +--- cyrus-imapd-2.3.12p2/lib/auth_krb.c 2008-03-24 19:43:08.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb.c 2008-05-06 14:48:41.000000000 +0300 +@@ -340,6 +340,15 @@ free((char *)auth_state); } @@ -2174,7 +2174,7 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth_krb.c cyrus-imapd-2.3.11-autocreate.uncom #else /* HAVE_KRB */ static int mymemberof( -@@ -369,6 +378,13 @@ +@@ -371,6 +380,13 @@ fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); } @@ -2188,16 +2188,16 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth_krb.c cyrus-imapd-2.3.11-autocreate.uncom #endif struct auth_mech auth_krb = -@@ -379,4 +395,5 @@ +@@ -381,4 +397,5 @@ &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.3.11/lib/auth_krb5.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb5.c ---- cyrus-imapd-2.3.11/lib/auth_krb5.c 2007-09-27 23:02:45.000000000 +0300 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb5.c 2007-12-12 13:29:49.000000000 +0200 -@@ -197,6 +197,14 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/auth_krb5.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb5.c +--- cyrus-imapd-2.3.12p2/lib/auth_krb5.c 2008-03-24 19:43:08.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb5.c 2008-05-06 14:48:41.000000000 +0300 +@@ -199,6 +199,14 @@ free(auth_state); } @@ -2212,7 +2212,7 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth_krb5.c cyrus-imapd-2.3.11-autocreate.unco #else /* HAVE_GSSAPI_H */ static int mymemberof( -@@ -228,6 +236,12 @@ +@@ -230,6 +238,12 @@ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); } @@ -2225,16 +2225,16 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth_krb5.c cyrus-imapd-2.3.11-autocreate.unco #endif struct auth_mech auth_krb5 = -@@ -238,4 +252,5 @@ +@@ -240,4 +254,5 @@ &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.3.11/lib/auth_pts.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_pts.c ---- cyrus-imapd-2.3.11/lib/auth_pts.c 2007-09-27 23:02:45.000000000 +0300 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_pts.c 2007-12-12 13:29:49.000000000 +0200 -@@ -511,6 +511,14 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/auth_pts.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_pts.c +--- cyrus-imapd-2.3.12p2/lib/auth_pts.c 2008-03-24 19:43:08.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_pts.c 2008-05-06 14:48:41.000000000 +0300 +@@ -512,6 +512,14 @@ free(auth_state); } @@ -2249,16 +2249,16 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth_pts.c cyrus-imapd-2.3.11-autocreate.uncom struct auth_mech auth_pts = { "pts", /* name */ -@@ -519,4 +527,5 @@ +@@ -520,4 +528,5 @@ &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.3.11/lib/auth_unix.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_unix.c ---- cyrus-imapd-2.3.11/lib/auth_unix.c 2007-10-31 12:42:18.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_unix.c 2007-12-12 13:29:49.000000000 +0200 -@@ -314,6 +314,16 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/auth_unix.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_unix.c +--- cyrus-imapd-2.3.12p2/lib/auth_unix.c 2008-03-24 19:43:08.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_unix.c 2008-05-06 14:48:41.000000000 +0300 +@@ -312,6 +312,16 @@ free((char *)auth_state); } @@ -2275,16 +2275,16 @@ diff -Naur cyrus-imapd-2.3.11/lib/auth_unix.c cyrus-imapd-2.3.11-autocreate.unco struct auth_mech auth_unix = { -@@ -323,4 +333,5 @@ +@@ -321,4 +331,5 @@ &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.3.11/lib/imapoptions cyrus-imapd-2.3.11-autocreate.uncompiled/lib/imapoptions ---- cyrus-imapd-2.3.11/lib/imapoptions 2007-10-18 21:14:48.000000000 +0300 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/imapoptions 2007-12-12 13:29:49.000000000 +0200 -@@ -177,6 +177,55 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/imapoptions cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/imapoptions +--- cyrus-imapd-2.3.12p2/lib/imapoptions 2008-04-11 23:07:00.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/imapoptions 2008-05-06 14:48:41.000000000 +0300 +@@ -198,6 +198,55 @@ /* Number of seconds to wait before returning a timeout failure when performing a client connection (e.g. in a murder environment) */ @@ -2340,10 +2340,10 @@ diff -Naur cyrus-imapd-2.3.11/lib/imapoptions cyrus-imapd-2.3.11-autocreate.unco { "configdirectory", NULL, STRING } /* The pathname of the IMAP configuration directory. This field is required. */ -diff -Naur cyrus-imapd-2.3.11/notifyd/Makefile.in cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/Makefile.in ---- cyrus-imapd-2.3.11/notifyd/Makefile.in 2006-11-30 19:11:23.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/Makefile.in 2007-12-12 13:29:49.000000000 +0200 -@@ -69,10 +69,11 @@ +diff -Naur cyrus-imapd-2.3.12p2/notifyd/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/Makefile.in +--- cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-03-24 21:59:32.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/Makefile.in 2008-05-06 14:48:41.000000000 +0300 +@@ -71,10 +71,11 @@ SERVICE=../master/service.o IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ @@ -2356,10 +2356,10 @@ diff -Naur cyrus-imapd-2.3.11/notifyd/Makefile.in cyrus-imapd-2.3.11-autocreate. PURIFY=/usr/local/bin/purify PUREOPT=-best-effort -diff -Naur cyrus-imapd-2.3.11/notifyd/notifyd.c cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/notifyd.c ---- cyrus-imapd-2.3.11/notifyd/notifyd.c 2006-11-30 19:11:23.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/notifyd.c 2007-12-12 13:29:49.000000000 +0200 -@@ -97,7 +97,7 @@ +diff -Naur cyrus-imapd-2.3.12p2/notifyd/notifyd.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/notifyd.c +--- cyrus-imapd-2.3.12p2/notifyd/notifyd.c 2008-03-24 21:59:32.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/notifyd.c 2008-05-06 14:48:41.000000000 +0300 +@@ -96,7 +96,7 @@ #define NOTIFY_MAXSIZE 8192 @@ -2368,9 +2368,9 @@ diff -Naur cyrus-imapd-2.3.11/notifyd/notifyd.c cyrus-imapd-2.3.11-autocreate.un { struct sockaddr_un sun_data; socklen_t sunlen = sizeof(sun_data); -diff -Naur cyrus-imapd-2.3.11/ptclient/Makefile.in cyrus-imapd-2.3.11-autocreate.uncompiled/ptclient/Makefile.in ---- cyrus-imapd-2.3.11/ptclient/Makefile.in 2006-11-30 19:11:24.000000000 +0200 -+++ cyrus-imapd-2.3.11-autocreate.uncompiled/ptclient/Makefile.in 2007-12-12 13:29:49.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/ptclient/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/ptclient/Makefile.in +--- cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-03-24 20:34:22.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/ptclient/Makefile.in 2008-05-06 14:48:41.000000000 +0300 @@ -57,10 +57,11 @@ AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ AFS_LIBS = @AFS_LIBS@ diff --git a/cyrus-imapd-2.3.11-autosieve-0.6.0.diff b/cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff similarity index 88% rename from cyrus-imapd-2.3.11-autosieve-0.6.0.diff rename to cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff index b9fe0c4..0ccc2d1 100644 --- a/cyrus-imapd-2.3.11-autosieve-0.6.0.diff +++ b/cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff @@ -1,6 +1,6 @@ -diff -Naur cyrus-imapd-2.3.11/README.autosievefolder cyrus-imapd-2.3.11-autosieve.uncompiled/README.autosievefolder ---- cyrus-imapd-2.3.11/README.autosievefolder 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.3.11-autosieve.uncompiled/README.autosievefolder 2007-12-12 14:17:18.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/README.autosievefolder cyrus-imapd-2.3.12p2-autosieve.uncompiled/README.autosievefolder +--- cyrus-imapd-2.3.12p2/README.autosievefolder 1970-01-01 02:00:00.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autosieve.uncompiled/README.autosievefolder 2008-05-06 15:16:21.000000000 +0300 @@ -0,0 +1,42 @@ +Cyrus IMAP autosievefolder patch +---------------------------------- @@ -44,9 +44,9 @@ diff -Naur cyrus-imapd-2.3.11/README.autosievefolder cyrus-imapd-2.3.11-autosiev + +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder + -diff -Naur cyrus-imapd-2.3.11/imap/lmtp_sieve.c cyrus-imapd-2.3.11-autosieve.uncompiled/imap/lmtp_sieve.c ---- cyrus-imapd-2.3.11/imap/lmtp_sieve.c 2007-09-28 05:27:46.000000000 +0300 -+++ cyrus-imapd-2.3.11-autosieve.uncompiled/imap/lmtp_sieve.c 2007-12-12 14:17:18.000000000 +0200 +diff -Naur cyrus-imapd-2.3.12p2/imap/lmtp_sieve.c cyrus-imapd-2.3.12p2-autosieve.uncompiled/imap/lmtp_sieve.c +--- cyrus-imapd-2.3.12p2/imap/lmtp_sieve.c 2008-03-24 19:09:17.000000000 +0200 ++++ cyrus-imapd-2.3.12p2-autosieve.uncompiled/imap/lmtp_sieve.c 2008-05-06 15:16:21.000000000 +0300 @@ -88,6 +88,9 @@ struct auth_state *authstate; } script_data_t; @@ -160,10 +160,10 @@ diff -Naur cyrus-imapd-2.3.11/imap/lmtp_sieve.c cyrus-imapd-2.3.11-autosieve.unc + return IMAP_MAILBOX_NONEXISTENT; +} + -diff -Naur cyrus-imapd-2.3.11/lib/imapoptions cyrus-imapd-2.3.11-autosieve.uncompiled/lib/imapoptions ---- cyrus-imapd-2.3.11/lib/imapoptions 2007-10-18 21:14:48.000000000 +0300 -+++ cyrus-imapd-2.3.11-autosieve.uncompiled/lib/imapoptions 2007-12-12 14:17:18.000000000 +0200 -@@ -906,6 +906,15 @@ +diff -Naur cyrus-imapd-2.3.12p2/lib/imapoptions cyrus-imapd-2.3.12p2-autosieve.uncompiled/lib/imapoptions +--- cyrus-imapd-2.3.12p2/lib/imapoptions 2008-04-11 23:07:00.000000000 +0300 ++++ cyrus-imapd-2.3.12p2-autosieve.uncompiled/lib/imapoptions 2008-05-06 15:16:21.000000000 +0300 +@@ -942,6 +942,15 @@ /* If enabled, lmtpd will look for Sieve scripts in user's home directories: ~user/.sieve. */ diff --git a/cyrus-imapd-2.3.7.tar.gz.sig b/cyrus-imapd-2.3.7.tar.gz.sig deleted file mode 100644 index aabd1a4..0000000 Binary files a/cyrus-imapd-2.3.7.tar.gz.sig and /dev/null differ diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 114319c..bbb8a76 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,7 +1,7 @@ -%define upstream_ver 2.3.11 +%define upstream_ver 2.3.12p2 Name: cyrus-imapd -Version: 2.3.11 -Release: 3%{?dist} +Version: 2.3.12p2 +Release: 1%{?dist} # ********************** BUILD TIME OPTIONS START ********************** @@ -130,8 +130,8 @@ 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.9/cyrus-imapd-2.3.11-autocreate-0.10-0.diff -Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.11-autosieve-0.6.0.diff +Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff +Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-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 @@ -807,6 +807,10 @@ fi %{_mandir}/man1/* %changelog +* Mon Sep 1 2008 Dan Horák