Hello community, here is the log from the commit of package cyrus-imapd for openSUSE:Factory checked in at 2017-10-31 15:43:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old) and /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cyrus-imapd" Tue Oct 31 15:43:30 2017 rev:69 rq:536505 version:2.4.19 Changes: -------- --- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes 2017-07-11 08:27:32.157140276 +0200 +++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 2017-10-31 15:43:31.102821653 +0100 @@ -1,0 +2,10 @@ +Wed Oct 25 09:07:33 UTC 2017 - [email protected] + +- Removed "cyrus-imapd-2.4.19_drac_auth.patch" and dropped drac + from the BuildRequires. DRAC's upstream is bascially dead nowadays, + and the drac patch in cyrus-imapd is also largely unmaintained. + Rebased cyrus-imapd-2.4.17_openslp.patch and + cyrus-imapd-2.4.19_autocreate-0.10-0.patch as a result of the + removal. + +------------------------------------------------------------------- Old: ---- cyrus-imapd-2.4.19_drac_auth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-imapd.spec ++++++ --- /var/tmp/diff_new_pack.PtJK0D/_old 2017-10-31 15:43:31.870793813 +0100 +++ /var/tmp/diff_new_pack.PtJK0D/_new 2017-10-31 15:43:31.874793668 +0100 @@ -42,8 +42,6 @@ Source1: http://ftp.andrew.cmu.edu/pub/mibs/cmu/cmu.mib # Distribution specific sources Source10: cyrus-imapd-rc-2.tar.gz -# PATCH-FEATURE-UPSTREAM -- Add support for Dynamic Relay Authorization Control -Patch0: cyrus-imapd-2.4.19_drac_auth.patch # PATCH-FEATURE-UPSTREAM -- Autocreate INBOX folders // included in 2.5 Patch1: cyrus-imapd-2.4.19_autocreate-0.10-0.patch # PATCH-FEATURE-UPSTREAM -- Add support to define a catchall mailbox @@ -69,7 +67,6 @@ BuildRequires: bison BuildRequires: cyrus-sasl-devel BuildRequires: db-devel -BuildRequires: drac BuildRequires: ed BuildRequires: flex BuildRequires: krb5-devel @@ -206,7 +203,6 @@ %prep %setup -q -a 10 -%patch0 -p1 %patch1 -p1 %patch4 -p1 %patch7 -p1 @@ -242,7 +238,6 @@ --with-cyrus-user=%{cyrus_user} \ --with-cyrus-group=%{cyrus_group} \ --with-cyrus-prefix=%{_prefix}/lib/cyrus \ - --with-drac \ --with-gss_impl=auto \ --with-ldap \ --with-libwrap \ ++++++ cyrus-imapd-2.4.17_openslp.patch ++++++ --- /var/tmp/diff_new_pack.PtJK0D/_old 2017-10-31 15:43:31.922791928 +0100 +++ /var/tmp/diff_new_pack.PtJK0D/_new 2017-10-31 15:43:31.922791928 +0100 @@ -1,9 +1,10 @@ -diff -Ppru cyrus-imapd-2.4.17.orig/configure.in cyrus-imapd-2.4.17/configure.in ---- cyrus-imapd-2.4.17.orig/configure.in 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/configure.in 2014-01-25 13:35:37.326786213 +0100 -@@ -1242,6 +1242,19 @@ DRACLIBS="-ldrac") - fi) - AC_SUBST(DRACLIBS) +Index: cyrus-imapd-2.4.19/configure.in +=================================================================== +--- cyrus-imapd-2.4.19.orig/configure.in ++++ cyrus-imapd-2.4.19/configure.in +@@ -1239,6 +1239,19 @@ dnl (agentx was depricated, but SNMP_SUB + SNMP_SUBDIRS="" + AC_SUBST(SNMP_SUBDIRS) +dnl +dnl Test for OpenSLP @@ -21,9 +22,10 @@ CMU_LIBWRAP CMU_UCDSNMP -diff -Ppru cyrus-imapd-2.4.17.orig/master/Makefile.in cyrus-imapd-2.4.17/master/Makefile.in ---- cyrus-imapd-2.4.17.orig/master/Makefile.in 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/master/Makefile.in 2014-01-25 13:36:16.326368670 +0100 +Index: cyrus-imapd-2.4.19/master/Makefile.in +=================================================================== +--- cyrus-imapd-2.4.19.orig/master/Makefile.in ++++ cyrus-imapd-2.4.19/master/Makefile.in @@ -58,7 +58,7 @@ DEPLIBS = @DEPLIBS@ CFLAGS = @CFLAGS@ @@ -33,9 +35,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -diff -Ppru cyrus-imapd-2.4.17.orig/master/master.c cyrus-imapd-2.4.17/master/master.c ---- cyrus-imapd-2.4.17.orig/master/master.c 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/master/master.c 2014-01-25 14:35:29.896103172 +0100 +Index: cyrus-imapd-2.4.19/master/master.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/master/master.c ++++ cyrus-imapd-2.4.19/master/master.c @@ -110,6 +110,10 @@ int deny_severity = LOG_ERR; #endif ++++++ cyrus-imapd-2.4.19_autocreate-0.10-0.patch ++++++ --- /var/tmp/diff_new_pack.PtJK0D/_old 2017-10-31 15:43:31.954790768 +0100 +++ /var/tmp/diff_new_pack.PtJK0D/_new 2017-10-31 15:43:31.954790768 +0100 @@ -1,6 +1,7 @@ -diff -Naur cyrus-imapd-2.4.4.orig/README.autocreate cyrus-imapd-2.4.4/README.autocreate ---- cyrus-imapd-2.4.4.orig/README.autocreate 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.4.4/README.autocreate 2010-11-16 08:48:37.704981331 +0100 +Index: cyrus-imapd-2.4.19/README.autocreate +=================================================================== +--- /dev/null ++++ cyrus-imapd-2.4.19/README.autocreate @@ -0,0 +1,213 @@ +Cyrus IMAP autocreate Inbox patch +---------------------------------- @@ -215,12 +216,13 @@ + +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate + -diff -Ppru cyrus-imapd-2.4.19.orig/imap/Makefile.in cyrus-imapd-2.4.19.autocreate/imap/Makefile.in ---- cyrus-imapd-2.4.19.orig/imap/Makefile.in 2017-05-15 07:43:30.000000000 +0200 -+++ cyrus-imapd-2.4.19.autocreate/imap/Makefile.in 2017-06-14 20:06:17.326953196 +0200 +Index: cyrus-imapd-2.4.19/imap/Makefile.in +=================================================================== +--- cyrus-imapd-2.4.19.orig/imap/Makefile.in ++++ cyrus-imapd-2.4.19/imap/Makefile.in @@ -66,7 +66,7 @@ SIEVE_LIBS = @SIEVE_LIBS@ + IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ LIB_WRAP = @LIB_WRAP@ - DRAC_LIBS = @DRACLIBS@ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ +DEPLIBS = $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ @@ -268,9 +270,10 @@ ### Other Misc Targets clean: -diff -Naur cyrus-imapd-2.4.4.orig/imap/autosieve.c cyrus-imapd-2.4.4/imap/autosieve.c ---- cyrus-imapd-2.4.4.orig/imap/autosieve.c 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.4.4/imap/autosieve.c 2010-11-16 08:48:37.722056581 +0100 +Index: cyrus-imapd-2.4.19/imap/autosieve.c +=================================================================== +--- /dev/null ++++ cyrus-imapd-2.4.19/imap/autosieve.c @@ -0,0 +1,590 @@ +#include <stdio.h> +#include <stdlib.h> @@ -862,9 +865,10 @@ + * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present + */ + -diff -Naur cyrus-imapd-2.4.4.orig/imap/compile_sieve.c cyrus-imapd-2.4.4/imap/compile_sieve.c ---- cyrus-imapd-2.4.4.orig/imap/compile_sieve.c 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.4.4/imap/compile_sieve.c 2010-11-16 08:48:37.724064645 +0100 +Index: cyrus-imapd-2.4.19/imap/compile_sieve.c +=================================================================== +--- /dev/null ++++ cyrus-imapd-2.4.19/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 */ @@ -1231,10 +1235,11 @@ + + + -diff -Naur cyrus-imapd-2.4.4.orig/imap/imapd.c cyrus-imapd-2.4.4/imap/imapd.c ---- cyrus-imapd-2.4.4.orig/imap/imapd.c 2010-11-16 08:48:20.829659918 +0100 -+++ cyrus-imapd-2.4.4/imap/imapd.c 2010-11-16 08:48:37.728081052 +0100 -@@ -269,6 +269,7 @@ +Index: cyrus-imapd-2.4.19/imap/imapd.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/imap/imapd.c ++++ cyrus-imapd-2.4.19/imap/imapd.c +@@ -332,6 +332,7 @@ enum { void motd_file(int fd); void shut_down(int code); void fatal(const char *s, int code); @@ -1242,7 +1247,7 @@ void cmdloop(void); void cmd_login(char *tag, char *user); -@@ -2102,8 +2103,47 @@ +@@ -2167,8 +2168,47 @@ static void authentication_success(void) mboxname_hiersep_tointernal(&imapd_namespace, imapd_userid, config_virtdomains ? strcspn(imapd_userid, "@") : 0); @@ -1290,7 +1295,7 @@ /* * Perform a LOGIN command */ -@@ -5880,6 +5920,8 @@ +@@ -6047,6 +6087,8 @@ void getlistargs(char *tag, struct lista goto freeargs; } @@ -1299,10 +1304,11 @@ return; freeargs: -diff -Naur cyrus-imapd-2.4.4.orig/imap/lmtpd.c cyrus-imapd-2.4.4/imap/lmtpd.c ---- cyrus-imapd-2.4.4.orig/imap/lmtpd.c 2010-11-16 08:48:20.824640875 +0100 -+++ cyrus-imapd-2.4.4/imap/lmtpd.c 2010-11-16 08:48:37.729084805 +0100 -@@ -119,6 +119,8 @@ +Index: cyrus-imapd-2.4.19/imap/lmtpd.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/imap/lmtpd.c ++++ cyrus-imapd-2.4.19/imap/lmtpd.c +@@ -118,6 +118,8 @@ void shut_down(int code); static FILE *spoolfile(message_data_t *msgdata); static void removespool(message_data_t *msgdata); @@ -1311,7 +1317,7 @@ /* current namespace */ static struct namespace lmtpd_namespace; -@@ -976,6 +978,86 @@ +@@ -922,6 +924,86 @@ void shut_down(int code) exit(code); } @@ -1398,7 +1404,7 @@ static int verify_user(const char *user, const char *domain, char *mailbox, quota_t quotacheck, struct auth_state *authstate) { -@@ -1019,6 +1101,15 @@ +@@ -965,6 +1047,15 @@ static int verify_user(const char *user, */ r = mlookup(namebuf, &server, &acl, NULL); @@ -1414,7 +1420,7 @@ if (r == IMAP_MAILBOX_NONEXISTENT && !user && config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && /* see if we have a mailbox whose name is close */ -@@ -1045,6 +1136,7 @@ +@@ -991,6 +1082,7 @@ static int verify_user(const char *user, aclcheck, (quotacheck < 0) || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? quotacheck : 0); @@ -1422,10 +1428,11 @@ } } -diff -Naur cyrus-imapd-2.4.4.orig/imap/mboxlist.c cyrus-imapd-2.4.4/imap/mboxlist.c ---- cyrus-imapd-2.4.4.orig/imap/mboxlist.c 2010-11-16 08:48:20.818616124 +0100 -+++ cyrus-imapd-2.4.4/imap/mboxlist.c 2010-11-16 08:48:37.732096343 +0100 -@@ -84,6 +84,12 @@ +Index: cyrus-imapd-2.4.19/imap/mboxlist.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/imap/mboxlist.c ++++ cyrus-imapd-2.4.19/imap/mboxlist.c +@@ -85,6 +85,12 @@ #include "quota.h" #include "sync_log.h" @@ -1438,7 +1445,7 @@ #define DB config_mboxlist_db #define SUBDB config_subscription_db -@@ -100,6 +106,19 @@ +@@ -101,6 +107,19 @@ static int mboxlist_rmquota(const char * void *rock); static int mboxlist_changequota(const char *name, int matchlen, int maycreate, void *rock); @@ -1458,7 +1465,7 @@ char *mboxlist_makeentry(int mbtype, const char *part, const char *acl) { -@@ -2996,3 +3015,349 @@ +@@ -3181,3 +3200,349 @@ mboxlist_count_inferiors(const char *mai return(count); } @@ -1808,10 +1815,11 @@ + return r; +} + -diff -Naur cyrus-imapd-2.4.4.orig/imap/mboxlist.h cyrus-imapd-2.4.4/imap/mboxlist.h ---- cyrus-imapd-2.4.4.orig/imap/mboxlist.h 2010-11-16 08:48:20.828655886 +0100 -+++ cyrus-imapd-2.4.4/imap/mboxlist.h 2010-11-16 08:48:37.732096343 +0100 -@@ -221,4 +221,9 @@ +Index: cyrus-imapd-2.4.19/imap/mboxlist.h +=================================================================== +--- cyrus-imapd-2.4.19.orig/imap/mboxlist.h ++++ cyrus-imapd-2.4.19/imap/mboxlist.h +@@ -217,4 +217,9 @@ int mboxlist_count_inferiors(const char const char *userid, struct auth_state *authstate); @@ -1821,10 +1829,11 @@ + + #endif -diff -Naur cyrus-imapd-2.4.4.orig/imap/pop3d.c cyrus-imapd-2.4.4/imap/pop3d.c ---- cyrus-imapd-2.4.4.orig/imap/pop3d.c 2010-11-16 08:48:20.820623909 +0100 -+++ cyrus-imapd-2.4.4/imap/pop3d.c 2010-11-16 08:48:37.734104407 +0100 -@@ -181,6 +181,8 @@ +Index: cyrus-imapd-2.4.19/imap/pop3d.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/imap/pop3d.c ++++ cyrus-imapd-2.4.19/imap/pop3d.c +@@ -181,6 +181,8 @@ static void bitpipe(void); static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */ static void cmd_apop(char *response); @@ -1833,7 +1842,7 @@ static void cmd_auth(char *arg); static void cmd_capa(void); static void cmd_pass(char *pass); -@@ -1389,6 +1391,7 @@ +@@ -1403,6 +1405,7 @@ void cmd_user(char *user) popd_userid = xstrdup(userbuf); prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); } @@ -1841,7 +1850,7 @@ } void cmd_pass(char *pass) -@@ -1692,6 +1695,43 @@ +@@ -1720,6 +1723,43 @@ void cmd_auth(char *arg) } /* @@ -1885,7 +1894,7 @@ * Complete the login process by opening and locking the user's inbox */ int openinbox(void) -@@ -1720,6 +1760,12 @@ +@@ -1748,6 +1788,12 @@ int openinbox(void) userid, inboxname); if (!r) r = mboxlist_lookup(inboxname, &mbentry, NULL); @@ -1898,10 +1907,11 @@ if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && (!mbentry.acl || !((myrights = cyrus_acl_myrights(popd_authstate, mbentry.acl)) & ACL_READ))) { -diff -Naur cyrus-imapd-2.4.4.orig/lib/auth.c cyrus-imapd-2.4.4/lib/auth.c ---- cyrus-imapd-2.4.4.orig/lib/auth.c 2010-11-16 08:48:20.875850421 +0100 -+++ cyrus-imapd-2.4.4/lib/auth.c 2010-11-16 08:48:37.755228749 +0100 -@@ -118,3 +118,11 @@ +Index: cyrus-imapd-2.4.19/lib/auth.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/auth.c ++++ cyrus-imapd-2.4.19/lib/auth.c +@@ -118,3 +118,11 @@ struct auth_state *auth_state; auth->freestate(auth_state); } @@ -1913,10 +1923,11 @@ + return auth->auth_canonuser(auth_state); +} + -diff -Naur cyrus-imapd-2.4.4.orig/lib/auth.h cyrus-imapd-2.4.4/lib/auth.h ---- cyrus-imapd-2.4.4.orig/lib/auth.h 2010-11-16 08:48:20.881874054 +0100 -+++ cyrus-imapd-2.4.4/lib/auth.h 2010-11-16 08:48:37.755228749 +0100 -@@ -55,6 +55,7 @@ +Index: cyrus-imapd-2.4.19/lib/auth.h +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/auth.h ++++ cyrus-imapd-2.4.19/lib/auth.h +@@ -55,6 +55,7 @@ struct auth_mech { const char *identifier); struct auth_state *(*newstate)(const char *identifier); void (*freestate)(struct auth_state *auth_state); @@ -1924,17 +1935,18 @@ }; extern struct auth_mech *auth_mechs[]; -@@ -77,5 +78,6 @@ +@@ -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 -Naur cyrus-imapd-2.4.4.orig/lib/auth_krb.c cyrus-imapd-2.4.4/lib/auth_krb.c ---- cyrus-imapd-2.4.4.orig/lib/auth_krb.c 2010-11-16 08:48:20.885889903 +0100 -+++ cyrus-imapd-2.4.4/lib/auth_krb.c 2010-11-16 08:48:37.756232781 +0100 -@@ -341,6 +341,15 @@ +Index: cyrus-imapd-2.4.19/lib/auth_krb.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/auth_krb.c ++++ cyrus-imapd-2.4.19/lib/auth_krb.c +@@ -341,6 +341,15 @@ struct auth_state *auth_state; free((char *)auth_state); } @@ -1950,7 +1962,7 @@ #else /* HAVE_KRB */ static int mymemberof( -@@ -372,6 +381,14 @@ +@@ -372,6 +381,14 @@ static void myfreestate( fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); } @@ -1965,16 +1977,17 @@ #endif struct auth_mech auth_krb = -@@ -382,4 +399,5 @@ +@@ -382,4 +399,5 @@ struct auth_mech auth_krb = &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_krb5.c cyrus-imapd-2.4.4/lib/auth_krb5.c ---- cyrus-imapd-2.4.4.orig/lib/auth_krb5.c 2010-11-16 08:48:20.877858205 +0100 -+++ cyrus-imapd-2.4.4/lib/auth_krb5.c 2010-11-16 08:48:37.756232781 +0100 -@@ -199,6 +199,14 @@ +Index: cyrus-imapd-2.4.19/lib/auth_krb5.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/auth_krb5.c ++++ cyrus-imapd-2.4.19/lib/auth_krb5.c +@@ -199,6 +199,14 @@ static void myfreestate(struct auth_stat free(auth_state); } @@ -1989,7 +2002,7 @@ #else /* HAVE_GSSAPI_H */ static int mymemberof( -@@ -230,6 +238,13 @@ +@@ -230,6 +238,13 @@ static void myfreestate( fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); } @@ -2003,16 +2016,17 @@ #endif struct auth_mech auth_krb5 = -@@ -240,4 +255,5 @@ +@@ -240,4 +255,5 @@ struct auth_mech auth_krb5 = &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_pts.c cyrus-imapd-2.4.4/lib/auth_pts.c ---- cyrus-imapd-2.4.4.orig/lib/auth_pts.c 2010-11-16 08:48:20.877858205 +0100 -+++ cyrus-imapd-2.4.4/lib/auth_pts.c 2010-11-16 08:48:37.757236534 +0100 -@@ -512,6 +512,14 @@ +Index: cyrus-imapd-2.4.19/lib/auth_pts.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/auth_pts.c ++++ cyrus-imapd-2.4.19/lib/auth_pts.c +@@ -521,6 +521,14 @@ static void myfreestate(struct auth_stat free(auth_state); } @@ -2027,16 +2041,17 @@ struct auth_mech auth_pts = { "pts", /* name */ -@@ -520,4 +528,5 @@ +@@ -529,4 +537,5 @@ struct auth_mech auth_pts = &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_unix.c cyrus-imapd-2.4.4/lib/auth_unix.c ---- cyrus-imapd-2.4.4.orig/lib/auth_unix.c 2010-11-16 08:48:20.880870301 +0100 -+++ cyrus-imapd-2.4.4/lib/auth_unix.c 2010-11-16 08:48:37.757236534 +0100 -@@ -315,6 +315,16 @@ +Index: cyrus-imapd-2.4.19/lib/auth_unix.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/auth_unix.c ++++ cyrus-imapd-2.4.19/lib/auth_unix.c +@@ -315,6 +315,16 @@ struct auth_state *auth_state; free((char *)auth_state); } @@ -2053,16 +2068,17 @@ struct auth_mech auth_unix = { -@@ -324,4 +334,5 @@ +@@ -324,4 +334,5 @@ struct auth_mech auth_unix = &mymemberof, &mynewstate, &myfreestate, + &mycanonuser, }; -diff -Naur cyrus-imapd-2.4.4.orig/lib/imapoptions cyrus-imapd-2.4.4/lib/imapoptions ---- cyrus-imapd-2.4.4.orig/lib/imapoptions 2010-11-16 08:48:20.878862238 +0100 -+++ cyrus-imapd-2.4.4/lib/imapoptions 2010-11-16 08:48:37.759244877 +0100 -@@ -245,6 +245,55 @@ +Index: cyrus-imapd-2.4.19/lib/imapoptions +=================================================================== +--- cyrus-imapd-2.4.19.orig/lib/imapoptions ++++ cyrus-imapd-2.4.19/lib/imapoptions +@@ -255,6 +255,55 @@ Blank lines and lines beginning with ``# /* Time in seconds. Any imap command that takes longer than this time is logged. */ @@ -2118,10 +2134,11 @@ { "configdirectory", NULL, STRING } /* The pathname of the IMAP configuration directory. This field is required. */ -diff -Naur cyrus-imapd-2.4.4.orig/notifyd/Makefile.in cyrus-imapd-2.4.4/notifyd/Makefile.in ---- cyrus-imapd-2.4.4.orig/notifyd/Makefile.in 2010-11-16 08:48:20.897937729 +0100 -+++ cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-16 08:48:37.769295255 +0100 -@@ -71,10 +71,11 @@ +Index: cyrus-imapd-2.4.19/notifyd/Makefile.in +=================================================================== +--- cyrus-imapd-2.4.19.orig/notifyd/Makefile.in ++++ cyrus-imapd-2.4.19/notifyd/Makefile.in +@@ -71,10 +71,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@ SERVICE=../master/service.o IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ @@ -2134,10 +2151,11 @@ PURIFY=/usr/local/bin/purify PUREOPT=-best-effort -diff -Naur cyrus-imapd-2.4.4.orig/notifyd/notifyd.c cyrus-imapd-2.4.4/notifyd/notifyd.c ---- cyrus-imapd-2.4.4.orig/notifyd/notifyd.c 2010-11-16 08:48:20.897937729 +0100 -+++ cyrus-imapd-2.4.4/notifyd/notifyd.c 2010-11-16 08:48:37.770300684 +0100 -@@ -98,7 +98,7 @@ +Index: cyrus-imapd-2.4.19/notifyd/notifyd.c +=================================================================== +--- cyrus-imapd-2.4.19.orig/notifyd/notifyd.c ++++ cyrus-imapd-2.4.19/notifyd/notifyd.c +@@ -98,7 +98,7 @@ char *fetch_arg(char *head, char* tail) #define NOTIFY_MAXSIZE 8192 @@ -2146,10 +2164,11 @@ { struct sockaddr_un sun_data; socklen_t sunlen = sizeof(sun_data); -diff -Naur cyrus-imapd-2.4.4.orig/ptclient/Makefile.in cyrus-imapd-2.4.4/ptclient/Makefile.in ---- cyrus-imapd-2.4.4.orig/ptclient/Makefile.in 2010-11-16 08:48:20.800544944 +0100 -+++ cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-16 08:48:37.770300684 +0100 -@@ -57,10 +57,11 @@ +Index: cyrus-imapd-2.4.19/ptclient/Makefile.in +=================================================================== +--- cyrus-imapd-2.4.19.orig/ptclient/Makefile.in ++++ cyrus-imapd-2.4.19/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@
