Hello community, here is the log from the commit of package cyrus-imapd for openSUSE:Factory checked in at Wed Sep 21 16:59:50 CEST 2011.
-------- --- cyrus-imapd/cyrus-imapd.changes 2011-09-18 02:14:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2011-09-21 11:35:51.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 21 09:34:04 UTC 2011 - rha...@suse.de + +- Update to 2.3.17. Only change: + * includes the nntpd bufferoverflow patch +- Refreshed KOLAB patches +- Fixed a potential DoS bug, when server-side threading is used + (bnc#718428) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch KOLAB_cyrus-imapd-2.3.16_Folder-names.patch KOLAB_cyrus-imapd-2.3.16_Groups2.patch KOLAB_cyrus-imapd-2.3.16_Logging.patch KOLAB_cyrus-imapd-2.3.16_UID.patch KOLAB_cyrus-imapd-2.3.16_cross-domain-acls.patch KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch auth_krb5-sentinel.patch cyrus-imapd-2.3.16.tar.bz2 cyrus-imapd-STARTTLS-plaintext-command-injection.patch cyrus-imapd-libdb-4_8.patch cyrus-imapd_nntp-overflow.dif murder-backend-empty-mechlist.patch New: ---- KOLAB_cyrus-imapd-2.3.17_Cyradm_Annotations.patch KOLAB_cyrus-imapd-2.3.17_Folder-names.patch KOLAB_cyrus-imapd-2.3.17_Groups2.patch KOLAB_cyrus-imapd-2.3.17_Logging.patch KOLAB_cyrus-imapd-2.3.17_UID.patch KOLAB_cyrus-imapd-2.3.17_cross-domain-acls.patch KOLAB_cyrus-imapd-2.3.17_timsieved_starttls-sendcaps.patch cyrus-imapd-2.3.17.tar.gz cyrus-imapd_references_header-dos.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-imapd.spec ++++++ --- /var/tmp/diff_new_pack.h9noIn/_old 2011-09-21 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.h9noIn/_new 2011-09-21 16:59:44.000000000 +0200 @@ -42,7 +42,7 @@ %endif -BuildRequires: bison cyrus-sasl-devel db-devel drac ed flex krb5-devel openslp-devel openssl-devel opie pwdutils tcpd-devel +BuildRequires: bison cyrus-sasl-devel db-devel drac ed flex krb5-devel openslp-devel openssl-devel opie perl-Digest-SHA1 pwdutils tcpd-devel Url: http://cyrusimap.web.cmu.edu/ License: BSD3c(or similar) Group: Productivity/Networking/Email/Servers @@ -55,27 +55,23 @@ Conflicts: cyrus-imapd-kolab %endif Summary: The Cyrus IMAP and POP Mail Server -Version: 2.3.16 +Version: 2.3.17 Release: 22 -Source: %{prjname}-%{version}.tar.bz2 +Source: %{prjname}-%{version}.tar.gz Source1: cyrus-imapd-rc.tar.gz Source2: DB_CONFIG # The autocreate Patchset is maintained at: # http://email.uoa.gr/projects/cyrus/autocreate/ Patch1: cyrus-imapd-2.3.16-autocreate-0.10-0.drac.diff -Patch3: auth_krb5-sentinel.patch Patch4: luser_relay.patch Patch5: user_deny_db-once.patch -Patch6: murder-backend-empty-mechlist.patch Patch7: syslog-facility-doc.patch Patch10: cyrus-imapd-openslp.patch Patch12: pie.patch Patch18: cyrus-imapd-perl-path.patch -Patch19: cyrus-imapd-libdb-4_8.patch Patch20: cyrus-imapd-perl-5.14.patch -Patch21: cyrus-imapd-STARTTLS-plaintext-command-injection.patch Patch22: cyrus-imapd_tls-session-leak.dif -Patch23: cyrus-imapd_nntp-overflow.dif +Patch23: cyrus-imapd_references_header-dos.dif %if %{with_kolab} # KOLAB_cyrus-imapd patches are maintained at @@ -152,17 +148,13 @@ %setup -q -a 1 -n %{prjname}-%{version} patch -s -p0 < contrib/drac_auth.patch %patch1 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch10 %patch12 -p1 %patch18 -%patch19 -p1 %patch20 -p1 -%patch21 -p1 %patch22 -p1 %patch23 -p1 ++++++ KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch -> KOLAB_cyrus-imapd-2.3.17_Cyradm_Annotations.patch ++++++ ++++++ KOLAB_cyrus-imapd-2.3.16_Folder-names.patch -> KOLAB_cyrus-imapd-2.3.17_Folder-names.patch ++++++ --- cyrus-imapd/KOLAB_cyrus-imapd-2.3.16_Folder-names.patch 2010-02-24 22:11:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/cyrus-imapd/KOLAB_cyrus-imapd-2.3.17_Folder-names.patch 2011-09-21 11:35:45.000000000 +0200 @@ -1,16 +1,17 @@ Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9] -diff -r 17e54b46d7b6 imap/mboxname.c ---- a/imap/mboxname.c Mon Oct 27 18:44:56 2008 +0100 -+++ b/imap/mboxname.c Mon Oct 27 18:47:11 2008 +0100 -@@ -713,8 +713,10 @@ +Index: cyrus-imapd-2.3.17/imap/mboxname.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/mboxname.c ++++ cyrus-imapd-2.3.17/imap/mboxname.c +@@ -720,8 +720,10 @@ 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~" + #define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~" ++ */ +#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~" int mboxname_policycheck(char *name) { ++++++ KOLAB_cyrus-imapd-2.3.16_Groups2.patch -> KOLAB_cyrus-imapd-2.3.17_Groups2.patch ++++++ ++++++ KOLAB_cyrus-imapd-2.3.16_Logging.patch -> KOLAB_cyrus-imapd-2.3.17_Logging.patch ++++++ --- cyrus-imapd/KOLAB_cyrus-imapd-2.3.16_Logging.patch 2010-02-24 22:11:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/cyrus-imapd/KOLAB_cyrus-imapd-2.3.17_Logging.patch 2011-09-21 11:35:46.000000000 +0200 @@ -1,9 +1,10 @@ Provides improved logging for the cyrus imapd server [Version: 2.3.9] -diff -r e17e42827afc imap/append.c ---- a/imap/append.c Wed Dec 23 20:17:41 2009 +0100 -+++ b/imap/append.c Wed Dec 23 20:49:56 2009 +0100 -@@ -654,6 +654,9 @@ +Index: cyrus-imapd-2.3.17/imap/append.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/append.c ++++ cyrus-imapd-2.3.17/imap/append.c +@@ -654,6 +654,9 @@ int append_fromstage(struct appendstate /* ok, we've successfully added a message */ as->quota_used += message_index.size; @@ -13,10 +14,11 @@ return 0; } -diff -r e17e42827afc imap/imapd.c ---- a/imap/imapd.c Wed Dec 23 20:17:41 2009 +0100 -+++ b/imap/imapd.c Wed Dec 23 20:49:56 2009 +0100 -@@ -3638,6 +3638,8 @@ +Index: cyrus-imapd-2.3.17/imap/imapd.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/imapd.c ++++ cyrus-imapd-2.3.17/imap/imapd.c +@@ -3779,6 +3779,8 @@ void cmd_close(char *tag, char *cmd) if ((cmd[0] == 'C') && (imapd_mailbox->myrights & ACL_EXPUNGE)) { if (!mailbox_expunge(imapd_mailbox, NULL, NULL, 0)) { sync_log_mailbox(imapd_mailbox->name); @@ -25,10 +27,11 @@ } } -diff -r e17e42827afc imap/mailbox.c ---- a/imap/mailbox.c Wed Dec 23 20:17:41 2009 +0100 -+++ b/imap/mailbox.c Wed Dec 23 20:49:56 2009 +0100 -@@ -2575,6 +2575,8 @@ +Index: cyrus-imapd-2.3.17/imap/mailbox.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/mailbox.c ++++ cyrus-imapd-2.3.17/imap/mailbox.c +@@ -2575,6 +2575,8 @@ int mailbox_expunge(struct mailbox *mail *(fname->tail)++ = '/'; fname->len++; for (msgno = 0; msgno < numdeleted; msgno++) { ++++++ KOLAB_cyrus-imapd-2.3.16_UID.patch -> KOLAB_cyrus-imapd-2.3.17_UID.patch ++++++ --- cyrus-imapd/KOLAB_cyrus-imapd-2.3.16_UID.patch 2010-02-24 22:11:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/cyrus-imapd/KOLAB_cyrus-imapd-2.3.17_UID.patch 2011-09-21 11:35:46.000000000 +0200 @@ -1,9 +1,10 @@ Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9] -diff -r 2ebe14b7db9d configure ---- a/configure Mon Oct 27 18:47:12 2008 +0100 -+++ b/configure Mon Oct 27 18:48:18 2008 +0100 -@@ -19667,7 +19667,7 @@ +Index: cyrus-imapd-2.3.17/configure +=================================================================== +--- cyrus-imapd-2.3.17.orig/configure ++++ cyrus-imapd-2.3.17/configure +@@ -10860,7 +10860,7 @@ for flag in ${ldflags} ${default_ldflags done IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}" @@ -12,20 +13,21 @@ -diff -r 2ebe14b7db9d imap/global.c ---- a/imap/global.c Mon Oct 27 18:47:12 2008 +0100 -+++ b/imap/global.c Mon Oct 27 18:48:18 2008 +0100 -@@ -52,6 +52,9 @@ - #include <sys/types.h> +Index: cyrus-imapd-2.3.17/imap/global.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/global.c ++++ cyrus-imapd-2.3.17/imap/global.c +@@ -54,6 +54,9 @@ #include <netinet/in.h> #include <sys/stat.h> -+ + +#include <ldap.h> +#include <lber.h> - ++ #if HAVE_UNISTD_H # include <unistd.h> -@@ -378,6 +381,18 @@ + #endif +@@ -383,6 +386,18 @@ char *canonify_userid(char *user, char * char *domain = NULL; int len = strlen(user); char buf[81]; @@ -44,7 +46,7 @@ /* check for domain */ if (config_virtdomains && -@@ -396,6 +411,49 @@ +@@ -401,6 +416,49 @@ char *canonify_userid(char *user, char * } if (config_virtdomains) { @@ -94,7 +96,7 @@ if (domain) { if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) { *domain = '\0'; /* trim the default domain */ -@@ -408,7 +466,7 @@ +@@ -413,7 +471,7 @@ char *canonify_userid(char *user, char * user = buf; } } @@ -103,10 +105,11 @@ socklen_t salen; int error; struct sockaddr_storage localaddr; -diff -r 2ebe14b7db9d lib/imapoptions ---- a/lib/imapoptions Mon Oct 27 18:47:12 2008 +0100 -+++ b/lib/imapoptions Mon Oct 27 18:48:18 2008 +0100 -@@ -1114,7 +1114,7 @@ +Index: cyrus-imapd-2.3.17/lib/imapoptions +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/imapoptions ++++ cyrus-imapd-2.3.17/lib/imapoptions +@@ -1265,7 +1265,7 @@ product version in the capabilities */ mailbox hierarchy. The default is to use the netnews separator character '.'. */ ++++++ KOLAB_cyrus-imapd-2.3.16_cross-domain-acls.patch -> KOLAB_cyrus-imapd-2.3.17_cross-domain-acls.patch ++++++ --- cyrus-imapd/KOLAB_cyrus-imapd-2.3.16_cross-domain-acls.patch 2010-02-24 22:11:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/cyrus-imapd/KOLAB_cyrus-imapd-2.3.17_cross-domain-acls.patch 2011-09-21 11:35:46.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ur cyrus-imapd-2.3.16/imap/mboxlist.c cyrus-imapd-2.3.16.new/imap/mboxlist.c ---- cyrus-imapd-2.3.16/imap/mboxlist.c 2010-02-23 23:08:28.210817472 +0000 -+++ cyrus-imapd-2.3.16.new/imap/mboxlist.c 2010-02-23 23:16:40.008872697 +0000 -@@ -1618,7 +1618,7 @@ +Index: cyrus-imapd-2.3.17/imap/mboxlist.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/mboxlist.c ++++ cyrus-imapd-2.3.17/imap/mboxlist.c +@@ -1618,7 +1618,7 @@ int mboxlist_setacl(const char *name, co except for "anonymous", "anyone", the global admin and users in the default domain */ if ((cp = strchr(identifier, '@'))) { @@ -10,7 +11,7 @@ ((domain && strncasecmp(cp+1, domain, strlen(cp+1))) || (!domain && (!config_defdomain || strcasecmp(config_defdomain, cp+1))))) { -@@ -1960,6 +1960,7 @@ +@@ -1960,6 +1960,7 @@ struct find_rock { int usermboxnamelen; int checkmboxlist; int checkshared; @@ -18,7 +19,7 @@ int isadmin; struct auth_state *auth_state; int (*proc)(char *, int, int, void *rock); -@@ -1977,7 +1978,9 @@ +@@ -1977,7 +1978,9 @@ static int find_p(void *rockp, long matchlen; /* don't list mailboxes outside of the default domain */ @@ -29,7 +30,7 @@ minmatch = 0; if (rock->inboxoffset) { -@@ -2150,6 +2153,23 @@ +@@ -2150,6 +2153,23 @@ static int find_cb(void *rockp, } rock->checkshared = 0; @@ -53,7 +54,7 @@ r = (*rock->proc)(namebuf+rock->inboxoffset, matchlen, 1, rock->procrock); -@@ -2170,6 +2190,91 @@ +@@ -2170,6 +2190,91 @@ static int find_cb(void *rockp, return r; } @@ -145,7 +146,7 @@ /* * Find all mailboxes that match 'pattern'. * 'isadmin' is nonzero if user is a mailbox admin. 'userid' -@@ -2193,8 +2298,11 @@ +@@ -2193,8 +2298,11 @@ int mboxlist_findall(struct namespace *n char *p; int prefixlen; int userlen = userid ? strlen(userid) : 0, domainlen = 0; @@ -157,7 +158,7 @@ if (config_virtdomains) { char *domain; -@@ -2204,8 +2312,10 @@ +@@ -2204,8 +2312,10 @@ int mboxlist_findall(struct namespace *n domainlen = strlen(domain); /* includes separator */ if ((p = strchr(pattern , '!'))) { @@ -170,7 +171,7 @@ /* don't allow cross-domain access */ return IMAP_MAILBOX_BADNAME; } -@@ -2213,7 +2323,16 @@ +@@ -2213,7 +2323,16 @@ int mboxlist_findall(struct namespace *n pattern = p+1; } @@ -188,7 +189,7 @@ } if ((p = strrchr(pattern, '@'))) { /* global admin specified mbox@domain */ -@@ -2243,6 +2362,7 @@ +@@ -2243,6 +2362,7 @@ int mboxlist_findall(struct namespace *n cbrock.auth_state = auth_state; cbrock.checkmboxlist = 0; /* don't duplicate work */ cbrock.checkshared = 0; @@ -196,7 +197,7 @@ cbrock.proc = proc; cbrock.procrock = rock; -@@ -2302,6 +2422,12 @@ +@@ -2302,6 +2422,12 @@ int mboxlist_findall(struct namespace *n prefixlen = p - pattern; *p = '\0'; @@ -209,7 +210,7 @@ /* * If user.X.* or INBOX.* can match pattern, * search for those mailboxes next -@@ -2334,6 +2460,7 @@ +@@ -2334,6 +2460,7 @@ int mboxlist_findall(struct namespace *n glob_free(&cbrock.g); cbrock.g = glob_init(domainpat, GLOB_HIERARCHY); cbrock.inboxoffset = 0; @@ -217,7 +218,7 @@ if (usermboxnamelen) { usermboxname[--usermboxnamelen] = '\0'; cbrock.usermboxname = usermboxname; -@@ -2343,7 +2470,7 @@ +@@ -2343,7 +2470,7 @@ int mboxlist_findall(struct namespace *n just bother looking at the ones that have the same pattern prefix. */ r = DB->foreach(mbdb, @@ -226,7 +227,7 @@ &find_p, &find_cb, &cbrock, NULL); } -@@ -2352,6 +2479,7 @@ +@@ -2352,6 +2479,7 @@ int mboxlist_findall(struct namespace *n done: glob_free(&cbrock.g); if (pat) free(pat); @@ -234,7 +235,7 @@ return r; } -@@ -2389,6 +2517,7 @@ +@@ -2389,6 +2517,7 @@ int mboxlist_findall_alt(struct namespac cbrock.auth_state = auth_state; cbrock.checkmboxlist = 0; /* don't duplicate work */ cbrock.checkshared = 0; @@ -242,7 +243,7 @@ cbrock.proc = proc; cbrock.procrock = rock; -@@ -3029,6 +3158,7 @@ +@@ -3029,6 +3158,7 @@ int mboxlist_findsub(struct namespace *n cbrock.auth_state = auth_state; cbrock.checkmboxlist = !force; cbrock.checkshared = 0; @@ -250,7 +251,7 @@ cbrock.proc = proc; cbrock.procrock = rock; -@@ -3180,6 +3310,7 @@ +@@ -3180,6 +3310,7 @@ int mboxlist_findsub_alt(struct namespac cbrock.auth_state = auth_state; cbrock.checkmboxlist = !force; cbrock.checkshared = 0; @@ -258,11 +259,11 @@ cbrock.proc = proc; cbrock.procrock = rock; -Only in cyrus-imapd-2.3.16.new/imap: mboxlist.c.orig -diff -ur cyrus-imapd-2.3.16/imap/mboxname.c cyrus-imapd-2.3.16.new/imap/mboxname.c ---- cyrus-imapd-2.3.16/imap/mboxname.c 2009-11-10 04:16:46.000000000 +0000 -+++ cyrus-imapd-2.3.16.new/imap/mboxname.c 2010-02-23 23:16:40.009869896 +0000 -@@ -113,6 +113,8 @@ +Index: cyrus-imapd-2.3.17/imap/mboxname.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/mboxname.c ++++ cyrus-imapd-2.3.17/imap/mboxname.c +@@ -113,6 +113,8 @@ static int mboxname_tointernal(struct na char *cp; char *atp; int userlen, domainlen = 0, namelen; @@ -271,7 +272,7 @@ /* Blank the result, just in case */ result[0] = '\0'; -@@ -163,6 +165,18 @@ +@@ -163,6 +165,18 @@ static int mboxname_tointernal(struct na } } @@ -290,7 +291,7 @@ /* if no domain specified, we're in the default domain */ } -@@ -193,7 +207,13 @@ +@@ -193,7 +207,13 @@ static int mboxname_tointernal(struct na if (domainlen+namelen > MAX_MAILBOX_NAME) { return IMAP_MAILBOX_BADNAME; } @@ -305,7 +306,7 @@ /* Translate any separators in mailboxname */ mboxname_hiersep_tointernal(namespace, result, 0); -@@ -356,6 +376,7 @@ +@@ -356,6 +376,7 @@ static int mboxname_toexternal(struct na { char *domain = NULL, *cp; size_t domainlen = 0, resultlen; @@ -313,7 +314,7 @@ /* Blank the result, just in case */ result[0] = '\0'; -@@ -370,18 +391,29 @@ +@@ -370,18 +391,29 @@ static int mboxname_toexternal(struct na /* don't use the domain if it matches the user's domain */ if (userid && (cp = strchr(userid, '@')) && (strlen(++cp) == domainlen) && !strncmp(domain, cp, domainlen)) @@ -349,11 +350,11 @@ if(resultlen+domainlen+1 > MAX_MAILBOX_NAME) return IMAP_MAILBOX_BADNAME; -Only in cyrus-imapd-2.3.16.new/imap: mboxname.c.orig -diff -ur cyrus-imapd-2.3.16/lib/imapoptions cyrus-imapd-2.3.16.new/lib/imapoptions ---- cyrus-imapd-2.3.16/lib/imapoptions 2010-02-23 23:08:28.222930032 +0000 -+++ cyrus-imapd-2.3.16.new/lib/imapoptions 2010-02-23 23:16:40.010875442 +0000 -@@ -1283,6 +1283,9 @@ +Index: cyrus-imapd-2.3.17/lib/imapoptions +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/imapoptions ++++ cyrus-imapd-2.3.17/lib/imapoptions +@@ -1278,6 +1278,9 @@ product version in the capabilities */ /* Send mail to mailboxes, which do not exists, to this user. NOTE: This must be an existing local mailbox name. NOT an email address! */ @@ -363,4 +364,3 @@ /* .SH SEE ALSO .PP -Only in cyrus-imapd-2.3.16.new/lib: imapoptions.orig ++++++ KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch -> KOLAB_cyrus-imapd-2.3.17_timsieved_starttls-sendcaps.patch ++++++ --- cyrus-imapd/KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch 2010-02-24 22:11:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/cyrus-imapd/KOLAB_cyrus-imapd-2.3.17_timsieved_starttls-sendcaps.patch 2011-09-21 11:35:46.000000000 +0200 @@ -6,10 +6,11 @@ capabilities after starttls) and can be dropped as soon as kontact has a way to work with old and new cyrus imapd servers. -diff -r 1688e25afb65 timsieved/parser.c ---- a/timsieved/parser.c Thu Apr 23 23:28:07 2009 +0200 -+++ b/timsieved/parser.c Thu Apr 23 23:28:54 2009 +0200 -@@ -908,8 +908,7 @@ +Index: cyrus-imapd-2.3.17/timsieved/parser.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/timsieved/parser.c ++++ cyrus-imapd-2.3.17/timsieved/parser.c +@@ -912,8 +912,7 @@ static int cmd_starttls(struct protstrea starttls_done = 1; ++++++ cyrus-imapd-2.3.16-autocreate-0.10-0.drac.diff ++++++ --- /var/tmp/diff_new_pack.h9noIn/_old 2011-09-21 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.h9noIn/_new 2011-09-21 16:59:44.000000000 +0200 @@ -8,11 +8,10 @@ 19 files changed, 1919 insertions(+), 79 deletions(-) -diff --git a/README.autocreate b/README.autocreate -new file mode 100644 -index 0000000..7a7087e +Index: cyrus-imapd-2.3.17/README.autocreate +=================================================================== --- /dev/null -+++ b/README.autocreate ++++ cyrus-imapd-2.3.17/README.autocreate @@ -0,0 +1,211 @@ +Cyrus IMAP autocreate Inbox patch +---------------------------------- @@ -225,11 +224,11 @@ + +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate + -diff --git a/imap/Makefile.in b/imap/Makefile.in -index c3252cf..1fe164c 100644 ---- a/imap/Makefile.in -+++ b/imap/Makefile.in -@@ -102,7 +102,7 @@ LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \ +Index: cyrus-imapd-2.3.17/imap/Makefile.in +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/Makefile.in ++++ cyrus-imapd-2.3.17/imap/Makefile.in +@@ -102,7 +102,7 @@ LOBJS= append.o mailbox.o mboxlist.o mup 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 idle.o quota_db.o \ @@ -259,7 +258,7 @@ lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) -@@ -200,166 +200,171 @@ lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ +@@ -200,166 +200,171 @@ lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) @@ -503,11 +502,10 @@ ### Other Misc Targets -diff --git a/imap/autosieve.c b/imap/autosieve.c -new file mode 100644 -index 0000000..cbad363 +Index: cyrus-imapd-2.3.17/imap/autosieve.c +=================================================================== --- /dev/null -+++ b/imap/autosieve.c ++++ cyrus-imapd-2.3.17/imap/autosieve.c @@ -0,0 +1,588 @@ +#include <stdio.h> +#include <stdlib.h> @@ -1097,11 +1095,10 @@ + * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present + */ + -diff --git a/imap/compile_sieve.c b/imap/compile_sieve.c -new file mode 100644 -index 0000000..43a948f +Index: cyrus-imapd-2.3.17/imap/compile_sieve.c +=================================================================== --- /dev/null -+++ b/imap/compile_sieve.c ++++ cyrus-imapd-2.3.17/imap/compile_sieve.c @@ -0,0 +1,365 @@ +/* This tool compiles the sieve script from a command +line so that it can be used wby the autoadd patch */ @@ -1468,10 +1465,10 @@ + + + -diff --git a/imap/imapd.c b/imap/imapd.c -index e441c66..3690dc5 100644 ---- a/imap/imapd.c -+++ b/imap/imapd.c +Index: cyrus-imapd-2.3.17/imap/imapd.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/imapd.c ++++ cyrus-imapd-2.3.17/imap/imapd.c @@ -226,6 +226,7 @@ static int idling = 0; void motd_file(int fd); void shut_down(int code); @@ -1480,7 +1477,7 @@ void cmdloop(void); void cmd_login(char *tag, char *user); -@@ -2088,6 +2089,43 @@ void cmdloop() +@@ -2091,6 +2092,43 @@ void cmdloop() } /* @@ -1524,7 +1521,7 @@ * Perform a LOGIN command */ void cmd_login(char *tag, char *user) -@@ -2269,6 +2307,9 @@ void cmd_login(char *tag, char *user) +@@ -2272,6 +2310,9 @@ void cmd_login(char *tag, char *user) strcspn(imapd_userid, "@") : 0); freebuf(&passwdbuf); @@ -1534,7 +1531,7 @@ return; } -@@ -2431,6 +2472,8 @@ cmd_authenticate(char *tag, char *authtype, char *resp) +@@ -2434,6 +2475,8 @@ cmd_authenticate(char *tag, char *authty config_virtdomains ? strcspn(imapd_userid, "@") : 0); @@ -1543,10 +1540,10 @@ return; } -diff --git a/imap/lmtpd.c b/imap/lmtpd.c -index cf680e4..d89ae77 100644 ---- a/imap/lmtpd.c -+++ b/imap/lmtpd.c +Index: cyrus-imapd-2.3.17/imap/lmtpd.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/lmtpd.c ++++ cyrus-imapd-2.3.17/imap/lmtpd.c @@ -117,6 +117,8 @@ void shut_down(int code); static FILE *spoolfile(message_data_t *msgdata); static void removespool(message_data_t *msgdata); @@ -1643,7 +1640,7 @@ static int verify_user(const char *user, const char *domain, char *mailbox, quota_t quotacheck, struct auth_state *authstate) { -@@ -1022,6 +1104,15 @@ static int verify_user(const char *user, const char *domain, char *mailbox, +@@ -1022,6 +1104,15 @@ static int verify_user(const char *user, */ r = mlookup(namebuf, &server, &acl, NULL); @@ -1659,7 +1656,7 @@ if (r == IMAP_MAILBOX_NONEXISTENT && !user && config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && /* see if we have a mailbox whose name is close */ -@@ -1048,6 +1139,7 @@ static int verify_user(const char *user, const char *domain, char *mailbox, +@@ -1048,6 +1139,7 @@ static int verify_user(const char *user, aclcheck, (quotacheck < 0) || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? quotacheck : 0); @@ -1667,10 +1664,10 @@ } } -diff --git a/imap/mboxlist.c b/imap/mboxlist.c -index e3181a0..5566229 100644 ---- a/imap/mboxlist.c -+++ b/imap/mboxlist.c +Index: cyrus-imapd-2.3.17/imap/mboxlist.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/mboxlist.c ++++ cyrus-imapd-2.3.17/imap/mboxlist.c @@ -83,6 +83,12 @@ #include "quota.h" #include "sync_log.h" @@ -1684,7 +1681,7 @@ #define DB config_mboxlist_db #define SUBDB config_subscription_db -@@ -100,11 +106,29 @@ static int mboxlist_rmquota(const char *name, int matchlen, int maycreate, +@@ -100,11 +106,29 @@ static int mboxlist_rmquota(const char * static int mboxlist_changequota(const char *name, int matchlen, int maycreate, void *rock); @@ -1714,7 +1711,7 @@ #define FNAME_SUBSSUFFIX ".sub" /* -@@ -3464,3 +3488,349 @@ mboxlist_count_inferiors(char *mailboxname, int isadmin, char *userid, +@@ -3464,3 +3488,349 @@ mboxlist_count_inferiors(char *mailboxna return(count); } @@ -2064,11 +2061,11 @@ + return r; +} + -diff --git a/imap/mboxlist.h b/imap/mboxlist.h -index 59334bd..b9d0547 100644 ---- a/imap/mboxlist.h -+++ b/imap/mboxlist.h -@@ -221,4 +221,9 @@ int mboxlist_delayed_delete_isenabled(void); +Index: cyrus-imapd-2.3.17/imap/mboxlist.h +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/mboxlist.h ++++ cyrus-imapd-2.3.17/imap/mboxlist.h +@@ -221,4 +221,9 @@ int mboxlist_delayed_delete_isenabled(vo int mboxlist_count_inferiors(char *mailboxname, int isadmin, char *userid, struct auth_state *authstate); @@ -2078,10 +2075,10 @@ + + #endif -diff --git a/imap/pop3d.c b/imap/pop3d.c -index 88c9ffb..529ee49 100644 ---- a/imap/pop3d.c -+++ b/imap/pop3d.c +Index: cyrus-imapd-2.3.17/imap/pop3d.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/pop3d.c ++++ cyrus-imapd-2.3.17/imap/pop3d.c @@ -182,6 +182,8 @@ static void bitpipe(void); static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */ static void cmd_apop(char *response); @@ -2091,7 +2088,7 @@ static void cmd_auth(char *arg); static void cmd_capa(void); static void cmd_pass(char *pass); -@@ -1304,6 +1306,7 @@ void cmd_user(char *user) +@@ -1307,6 +1309,7 @@ void cmd_user(char *user) popd_userid = xstrdup(userbuf); prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); } @@ -2099,7 +2096,7 @@ } void cmd_pass(char *pass) -@@ -1607,6 +1610,43 @@ void cmd_auth(char *arg) +@@ -1610,6 +1613,43 @@ void cmd_auth(char *arg) } /* @@ -2143,7 +2140,7 @@ * Complete the login process by opening and locking the user's inbox */ int openinbox(void) -@@ -1636,6 +1676,12 @@ int openinbox(void) +@@ -1639,6 +1679,12 @@ int openinbox(void) if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL, &server, &acl, NULL); @@ -2156,10 +2153,10 @@ if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && (!acl || !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { -diff --git a/lib/auth.c b/lib/auth.c -index 8775f38..e4c6e6e 100644 ---- a/lib/auth.c -+++ b/lib/auth.c +Index: cyrus-imapd-2.3.17/lib/auth.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/auth.c ++++ cyrus-imapd-2.3.17/lib/auth.c @@ -118,3 +118,11 @@ struct auth_state *auth_state; auth->freestate(auth_state); @@ -2172,10 +2169,10 @@ + return auth->auth_canonuser(auth_state); +} + -diff --git a/lib/auth.h b/lib/auth.h -index e22918b..9faef28 100644 ---- a/lib/auth.h -+++ b/lib/auth.h +Index: cyrus-imapd-2.3.17/lib/auth.h +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/auth.h ++++ cyrus-imapd-2.3.17/lib/auth.h @@ -55,6 +55,7 @@ struct auth_mech { const char *identifier); struct auth_state *(*newstate)(const char *identifier); @@ -2184,17 +2181,17 @@ }; extern struct auth_mech *auth_mechs[]; -@@ -77,5 +78,6 @@ int auth_memberof(struct auth_state *auth_state, +@@ -77,5 +78,6 @@ int auth_memberof(struct auth_state *aut 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 --git a/lib/auth_krb.c b/lib/auth_krb.c -index 19869a1..a94dfa5 100644 ---- a/lib/auth_krb.c -+++ b/lib/auth_krb.c +Index: cyrus-imapd-2.3.17/lib/auth_krb.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/auth_krb.c ++++ cyrus-imapd-2.3.17/lib/auth_krb.c @@ -341,6 +341,15 @@ struct auth_state *auth_state; free((char *)auth_state); } @@ -2232,11 +2229,11 @@ &myfreestate, + &mycanonuser, }; -diff --git a/lib/auth_krb5.c b/lib/auth_krb5.c -index 4aecb2d..0b8350e 100644 ---- a/lib/auth_krb5.c -+++ b/lib/auth_krb5.c -@@ -199,6 +199,14 @@ static void myfreestate(struct auth_state *auth_state) +Index: cyrus-imapd-2.3.17/lib/auth_krb5.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/auth_krb5.c ++++ cyrus-imapd-2.3.17/lib/auth_krb5.c +@@ -199,6 +199,14 @@ static void myfreestate(struct auth_stat free(auth_state); } @@ -2271,11 +2268,11 @@ &myfreestate, + &mycanonuser, }; -diff --git a/lib/auth_pts.c b/lib/auth_pts.c -index a6f0db9..3201ca8 100644 ---- a/lib/auth_pts.c -+++ b/lib/auth_pts.c -@@ -512,6 +512,14 @@ static void myfreestate(struct auth_state *auth_state) +Index: cyrus-imapd-2.3.17/lib/auth_pts.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/auth_pts.c ++++ cyrus-imapd-2.3.17/lib/auth_pts.c +@@ -512,6 +512,14 @@ static void myfreestate(struct auth_stat free(auth_state); } @@ -2296,10 +2293,10 @@ &myfreestate, + &mycanonuser, }; -diff --git a/lib/auth_unix.c b/lib/auth_unix.c -index 14944bf..3fb8e77 100644 ---- a/lib/auth_unix.c -+++ b/lib/auth_unix.c +Index: cyrus-imapd-2.3.17/lib/auth_unix.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/auth_unix.c ++++ cyrus-imapd-2.3.17/lib/auth_unix.c @@ -315,6 +315,16 @@ struct auth_state *auth_state; free((char *)auth_state); } @@ -2323,11 +2320,11 @@ &myfreestate, + &mycanonuser, }; -diff --git a/lib/imapoptions b/lib/imapoptions -index ce07feb..7cf08d9 100644 ---- a/lib/imapoptions -+++ b/lib/imapoptions -@@ -236,6 +236,55 @@ Blank lines and lines beginning with ``#'' are ignored. +Index: cyrus-imapd-2.3.17/lib/imapoptions +=================================================================== +--- cyrus-imapd-2.3.17.orig/lib/imapoptions ++++ cyrus-imapd-2.3.17/lib/imapoptions +@@ -236,6 +236,55 @@ Blank lines and lines beginning with ``# /* Number of seconds to wait before returning a timeout failure when performing a client connection (e.g., in a murder environment) */ @@ -2383,10 +2380,10 @@ { "configdirectory", NULL, STRING } /* The pathname of the IMAP configuration directory. This field is required. */ -diff --git a/notifyd/Makefile.in b/notifyd/Makefile.in -index 01fd635..5b82d61 100644 ---- a/notifyd/Makefile.in -+++ b/notifyd/Makefile.in +Index: cyrus-imapd-2.3.17/notifyd/Makefile.in +=================================================================== +--- cyrus-imapd-2.3.17.orig/notifyd/Makefile.in ++++ cyrus-imapd-2.3.17/notifyd/Makefile.in @@ -71,10 +71,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@ SERVICE=../master/service.o @@ -2400,10 +2397,10 @@ PURIFY=/usr/local/bin/purify PUREOPT=-best-effort -diff --git a/notifyd/notifyd.c b/notifyd/notifyd.c -index e3d6bbf..3b96dee 100644 ---- a/notifyd/notifyd.c -+++ b/notifyd/notifyd.c +Index: cyrus-imapd-2.3.17/notifyd/notifyd.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/notifyd/notifyd.c ++++ cyrus-imapd-2.3.17/notifyd/notifyd.c @@ -96,7 +96,7 @@ char *fetch_arg(char *head, char* tail) #define NOTIFY_MAXSIZE 8192 @@ -2413,11 +2410,11 @@ { struct sockaddr_un sun_data; socklen_t sunlen = sizeof(sun_data); -diff --git a/ptclient/Makefile.in b/ptclient/Makefile.in -index 3d8cc68..3794736 100644 ---- a/ptclient/Makefile.in -+++ b/ptclient/Makefile.in -@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFL +Index: cyrus-imapd-2.3.17/ptclient/Makefile.in +=================================================================== +--- cyrus-imapd-2.3.17.orig/ptclient/Makefile.in ++++ cyrus-imapd-2.3.17/ptclient/Makefile.in +@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$( AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ AFS_LIBS = @AFS_LIBS@ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ @@ -2430,6 +2427,3 @@ UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o LDAP_LIBS=@LDAP_LIBS@ --- -1.6.4.2 - ++++++ cyrus-imapd-openslp.patch ++++++ --- /var/tmp/diff_new_pack.h9noIn/_old 2011-09-21 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.h9noIn/_new 2011-09-21 16:59:44.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- configure.in.orig +++ configure.in -@@ -1193,6 +1193,19 @@ AC_ARG_WITH(drac, [ --with-drac=DIR +@@ -1194,6 +1194,19 @@ AC_ARG_WITH(drac, [ --with-drac=DIR fi) AC_SUBST(DRACLIBS) @@ -201,7 +201,7 @@ s->ready_workers = 0; s->associate = nsocket; s->family = res->ai_family; -@@ -1022,6 +1150,9 @@ void sigterm_handler(int sig __attribute +@@ -1015,6 +1143,9 @@ void sigterm_handler(int sig __attribute /* tell master agent we're exiting */ snmp_shutdown("cyrusMaster"); #endif @@ -211,7 +211,7 @@ syslog(LOG_INFO, "exiting on SIGTERM/SIGINT"); exit(0); -@@ -1876,6 +2007,16 @@ int main(int argc, char **argv) +@@ -1929,6 +2060,16 @@ int main(int argc, char **argv) syslog(LOG_NOTICE, "process started"); ++++++ cyrus-imapd_references_header-dos.dif ++++++ Index: cyrus-imapd-2.3.17/imap/index.c =================================================================== --- cyrus-imapd-2.3.17.orig/imap/index.c +++ cyrus-imapd-2.3.17/imap/index.c @@ -192,6 +192,7 @@ static void index_thread_orderedsubj(uns static void index_thread_sort(Thread *root, struct sortcrit *sortcrit); static void index_thread_print(Thread *threads, int usinguid); static void index_thread_ref(unsigned *msgno_list, int nmsg, int usinguid); +static void massage_header(char *hdr); /* NOTE: Make sure these are listed in CAPABILITY_STRING */ static const struct thread_algorithm thread_algs[] = { @@ -4132,6 +4133,7 @@ void index_get_ids(MsgData *msgdata, cha /* allocate some space for refs */ msgdata->ref = (char **) xmalloc(refsize * sizeof(char *)); /* find references */ + massage_header(buf); refstr = buf; while ((ref = find_msgid(refstr, &refstr)) != NULL) { /* reallocate space for this msgid if necessary */ ++++++ pie.patch ++++++ --- /var/tmp/diff_new_pack.h9noIn/_old 2011-09-21 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.h9noIn/_new 2011-09-21 16:59:44.000000000 +0200 @@ -1,8 +1,8 @@ -Index: cyrus-imapd-2.3.16/configure.in +Index: cyrus-imapd-2.3.17/configure.in =================================================================== ---- cyrus-imapd-2.3.16.orig/configure.in -+++ cyrus-imapd-2.3.16/configure.in -@@ -1256,6 +1256,27 @@ AC_SUBST(PERL_SUBDIRS) +--- cyrus-imapd-2.3.17.orig/configure.in ++++ cyrus-imapd-2.3.17/configure.in +@@ -1257,6 +1257,27 @@ AC_SUBST(PERL_SUBDIRS) AC_SUBST(PERL_DEPSUBDIRS) AC_SUBST(PERL) @@ -30,10 +30,10 @@ AH_TOP([ /* * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved. -Index: cyrus-imapd-2.3.16/imap/Makefile.in +Index: cyrus-imapd-2.3.17/imap/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/imap/Makefile.in -+++ cyrus-imapd-2.3.16/imap/Makefile.in +--- cyrus-imapd-2.3.17.orig/imap/Makefile.in ++++ cyrus-imapd-2.3.17/imap/Makefile.in @@ -70,8 +70,8 @@ DRAC_LIBS = @DRACLIBS@ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ @@ -45,10 +45,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.16/lib/Makefile.in +Index: cyrus-imapd-2.3.17/lib/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/lib/Makefile.in -+++ cyrus-imapd-2.3.16/lib/Makefile.in +--- cyrus-imapd-2.3.17.orig/lib/Makefile.in ++++ cyrus-imapd-2.3.17/lib/Makefile.in @@ -63,8 +63,8 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPF LIBS = @LIBS@ @@ -60,10 +60,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.16/master/Makefile.in +Index: cyrus-imapd-2.3.17/master/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/master/Makefile.in -+++ cyrus-imapd-2.3.16/master/Makefile.in +--- cyrus-imapd-2.3.17.orig/master/Makefile.in ++++ cyrus-imapd-2.3.17/master/Makefile.in @@ -56,8 +56,8 @@ DEFS = @DEFS@ @LOCALDEFS@ CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@ DEPLIBS = @DEPLIBS@ @@ -75,10 +75,10 @@ LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ @SLPLIBS@ SHELL = /bin/sh -Index: cyrus-imapd-2.3.16/netnews/Makefile.in +Index: cyrus-imapd-2.3.17/netnews/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/netnews/Makefile.in -+++ cyrus-imapd-2.3.16/netnews/Makefile.in +--- cyrus-imapd-2.3.17.orig/netnews/Makefile.in ++++ cyrus-imapd-2.3.17/netnews/Makefile.in @@ -55,8 +55,8 @@ CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/ LIBS = @IMAP_LIBS@ @LIB_RT@ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ @@ -90,10 +90,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.16/notifyd/Makefile.in +Index: cyrus-imapd-2.3.17/notifyd/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/notifyd/Makefile.in -+++ cyrus-imapd-2.3.16/notifyd/Makefile.in +--- cyrus-imapd-2.3.17.orig/notifyd/Makefile.in ++++ cyrus-imapd-2.3.17/notifyd/Makefile.in @@ -56,8 +56,8 @@ CYRUS_GROUP=@cyrus_group@ DEFS = @DEFS@ @LOCALDEFS@ @@ -105,10 +105,10 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -Index: cyrus-imapd-2.3.16/perl/sieve/lib/Makefile.in +Index: cyrus-imapd-2.3.17/perl/sieve/lib/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/perl/sieve/lib/Makefile.in -+++ cyrus-imapd-2.3.16/perl/sieve/lib/Makefile.in +--- cyrus-imapd-2.3.17.orig/perl/sieve/lib/Makefile.in ++++ cyrus-imapd-2.3.17/perl/sieve/lib/Makefile.in @@ -58,7 +58,7 @@ IMAP_LIBS = @IMAP_LIBS@ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@ @@ -118,10 +118,10 @@ LDFLAGS = @LDFLAGS@ SHELL = /bin/sh -Index: cyrus-imapd-2.3.16/sieve/Makefile.in +Index: cyrus-imapd-2.3.17/sieve/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/sieve/Makefile.in -+++ cyrus-imapd-2.3.16/sieve/Makefile.in +--- cyrus-imapd-2.3.17.orig/sieve/Makefile.in ++++ cyrus-imapd-2.3.17/sieve/Makefile.in @@ -60,8 +60,8 @@ COMPILE_ET = @COMPILE_ET@ DEFS = @DEFS@ @LOCALDEFS@ CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ @@ -133,10 +133,10 @@ MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.16/syslog/Makefile.in +Index: cyrus-imapd-2.3.17/syslog/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/syslog/Makefile.in -+++ cyrus-imapd-2.3.16/syslog/Makefile.in +--- cyrus-imapd-2.3.17.orig/syslog/Makefile.in ++++ cyrus-imapd-2.3.17/syslog/Makefile.in @@ -55,8 +55,8 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ @@ -148,10 +148,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.16/timsieved/Makefile.in +Index: cyrus-imapd-2.3.17/timsieved/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/timsieved/Makefile.in -+++ cyrus-imapd-2.3.16/timsieved/Makefile.in +--- cyrus-imapd-2.3.17.orig/timsieved/Makefile.in ++++ cyrus-imapd-2.3.17/timsieved/Makefile.in @@ -56,8 +56,8 @@ CYRUS_GROUP=@cyrus_group@ DEFS = @DEFS@ @LOCALDEFS@ @@ -163,10 +163,10 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -Index: cyrus-imapd-2.3.16/com_err/et/Makefile.in +Index: cyrus-imapd-2.3.17/com_err/et/Makefile.in =================================================================== ---- cyrus-imapd-2.3.16.orig/com_err/et/Makefile.in -+++ cyrus-imapd-2.3.16/com_err/et/Makefile.in +--- cyrus-imapd-2.3.17.orig/com_err/et/Makefile.in ++++ cyrus-imapd-2.3.17/com_err/et/Makefile.in @@ -58,8 +58,8 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ ++++++ user_deny_db-once.patch ++++++ --- /var/tmp/diff_new_pack.h9noIn/_old 2011-09-21 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.h9noIn/_new 2011-09-21 16:59:44.000000000 +0200 @@ -6,11 +6,11 @@ 8 files changed, 325 insertions(+), 127 deletions(-) -diff --git a/imap/Makefile.in b/imap/Makefile.in -index 3dd823c..e9c5790 100644 ---- a/imap/Makefile.in -+++ b/imap/Makefile.in -@@ -103,7 +103,7 @@ LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \ +Index: cyrus-imapd-2.3.17/imap/Makefile.in +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/Makefile.in ++++ cyrus-imapd-2.3.17/imap/Makefile.in +@@ -103,7 +103,7 @@ LOBJS= append.o mailbox.o mboxlist.o mup annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ @@ -19,10 +19,10 @@ IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o -diff --git a/imap/global.c b/imap/global.c -index 30412b6..940f592 100644 ---- a/imap/global.c -+++ b/imap/global.c +Index: cyrus-imapd-2.3.17/imap/global.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/global.c ++++ cyrus-imapd-2.3.17/imap/global.c @@ -72,8 +72,8 @@ #include "mupdate_err.h" #include "mutex.h" @@ -33,7 +33,7 @@ #include "xmalloc.h" #include "xstrlcpy.h" #include "xstrlcat.h" -@@ -531,124 +531,6 @@ static int acl_ok(const char *user, struct auth_state *authstate) +@@ -531,124 +531,6 @@ static int acl_ok(const char *user, stru return r; } @@ -158,7 +158,7 @@ /* should we allow users to proxy? return SASL_OK if yes, SASL_BADAUTH otherwise */ int mysasl_proxy_policy(sasl_conn_t *conn, -@@ -704,7 +586,7 @@ int mysasl_proxy_policy(sasl_conn_t *conn, +@@ -704,7 +586,7 @@ int mysasl_proxy_policy(sasl_conn_t *con } /* is requested_user denied access? authenticated admins are exempt */ @@ -167,21 +167,21 @@ syslog(LOG_ERR, "user '%s' denied access to service '%s'", requested_user, config_ident); sasl_seterror(conn, SASL_NOLOG, -diff --git a/imap/global.h b/imap/global.h -index ec3d54e..791c5c7 100644 ---- a/imap/global.h -+++ b/imap/global.h -@@ -160,5 +160,6 @@ extern struct cyrusdb_backend *config_duplicate_db; +Index: cyrus-imapd-2.3.17/imap/global.h +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/global.h ++++ cyrus-imapd-2.3.17/imap/global.h +@@ -160,5 +160,6 @@ extern struct cyrusdb_backend *config_du extern struct cyrusdb_backend *config_tlscache_db; extern struct cyrusdb_backend *config_ptscache_db; extern struct cyrusdb_backend *config_statuscache_db; +extern struct cyrusdb_backend *config_userdeny_db; #endif /* INCLUDED_GLOBAL_H */ -diff --git a/imap/imapd.c b/imap/imapd.c -index ca837b9..3ebeb16 100644 ---- a/imap/imapd.c -+++ b/imap/imapd.c +Index: cyrus-imapd-2.3.17/imap/imapd.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/imapd.c ++++ cyrus-imapd-2.3.17/imap/imapd.c @@ -101,6 +101,7 @@ #include "telemetry.h" #include "tls.h" @@ -190,7 +190,7 @@ #include "util.h" #include "version.h" #include "xmalloc.h" -@@ -679,6 +680,10 @@ int service_init(int argc, char **argv, char **envp) +@@ -679,6 +680,10 @@ int service_init(int argc, char **argv, quotadb_init(0); quotadb_open(NULL); @@ -220,7 +220,7 @@ for (p = shut; *p == '['; p++); /* can't have [ be first char */ prot_printf(imapd_out, "* BYE [ALERT] %s\r\n", p); shut_down(0); -@@ -2738,7 +2746,7 @@ void cmd_idle(char *tag) +@@ -2741,7 +2749,7 @@ void cmd_idle(char *tag) if (!imapd_userisadmin && (shutdown_file(buf, sizeof(buf)) || (imapd_userid && @@ -229,7 +229,7 @@ shutdown = done = 1; goto done; } -@@ -2799,7 +2807,7 @@ void idle_update(idle_flags_t flags) +@@ -2802,7 +2810,7 @@ void idle_update(idle_flags_t flags) if (! imapd_userisadmin && (shutdown_file(shut, sizeof(shut)) || (imapd_userid && @@ -238,10 +238,10 @@ char *p; for (p = shut; *p == '['; p++); /* can't have [ be first char */ prot_printf(imapd_out, "* BYE [ALERT] %s\r\n", p); -diff --git a/imap/nntpd.c b/imap/nntpd.c -index 4265abe..a495285 100644 ---- a/imap/nntpd.c -+++ b/imap/nntpd.c +Index: cyrus-imapd-2.3.17/imap/nntpd.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/nntpd.c ++++ cyrus-imapd-2.3.17/imap/nntpd.c @@ -103,6 +103,7 @@ #include "sync_log.h" #include "telemetry.h" @@ -250,7 +250,7 @@ #include "util.h" #include "version.h" #include "wildmat.h" -@@ -494,6 +495,10 @@ int service_init(int argc __attribute__((unused)), +@@ -494,6 +495,10 @@ int service_init(int argc __attribute__( quotadb_init(0); quotadb_open(NULL); @@ -280,10 +280,10 @@ prot_printf(nntp_out, "400 %s\r\n", buf); shut_down(0); } -diff --git a/imap/pop3d.c b/imap/pop3d.c -index 1302e3c..84b928b 100644 ---- a/imap/pop3d.c -+++ b/imap/pop3d.c +Index: cyrus-imapd-2.3.17/imap/pop3d.c +=================================================================== +--- cyrus-imapd-2.3.17.orig/imap/pop3d.c ++++ cyrus-imapd-2.3.17/imap/pop3d.c @@ -88,6 +88,7 @@ #include "backend.h" #include "proxy.h" @@ -292,7 +292,7 @@ #include "sync_log.h" #include "statuscache.h" -@@ -434,6 +435,10 @@ int service_init(int argc __attribute__((unused)), +@@ -434,6 +435,10 @@ int service_init(int argc __attribute__( quotadb_init(0); quotadb_open(NULL); @@ -322,7 +322,7 @@ for (p = inputbuf; *p == '['; p++); /* can't have [ be first char */ prot_printf(popd_out, "-ERR [SYS/TEMP] %s\r\n", p); shut_down(0); -@@ -2024,7 +2032,7 @@ static void bitpipe(void) +@@ -2027,7 +2035,7 @@ static void bitpipe(void) /* check for shutdown file */ if (shutdown_file(buf, sizeof(buf)) || @@ -331,11 +331,10 @@ shutdown = 1; goto done; } -diff --git a/imap/userdeny.h b/imap/userdeny.h -new file mode 100644 -index 0000000..a4428c3 +Index: cyrus-imapd-2.3.17/imap/userdeny.h +=================================================================== --- /dev/null -+++ b/imap/userdeny.h ++++ cyrus-imapd-2.3.17/imap/userdeny.h @@ -0,0 +1,72 @@ +/* userdeny.h -- User deny definitions + * @@ -409,11 +408,10 @@ +void denydb_done(void); + +#endif /* INCLUDED_USERDENY_H */ -diff --git a/imap/userdeny_db.c b/imap/userdeny_db.c -new file mode 100644 -index 0000000..8d8791d +Index: cyrus-imapd-2.3.17/imap/userdeny_db.c +=================================================================== --- /dev/null -+++ b/imap/userdeny_db.c ++++ cyrus-imapd-2.3.17/imap/userdeny_db.c @@ -0,0 +1,219 @@ +/* userdeny_db.c -- User deny manipulation routines + * @@ -634,6 +632,3 @@ +{ + /* DB->done() handled by cyrus_done() */ +} --- -1.7.0.3 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
