File project.diff of Package cyrus-imapd

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package cyrus-imapd (Revision c2a936c7113ca1ce47da9f8577b96834)

Currently displaying revision c2a936c7113ca1ce47da9f8577b96834 , Show latest

--- authid_normalize.patch.orig
+++ authid_normalize.patch
@@ -2,7 +2,7 @@ Index: lib/auth_unix.c
 ===================================================================
 --- lib/auth_unix.c.orig
 +++ lib/auth_unix.c
-@@ -157,10 +157,12 @@ const char *identifier;
+@@ -155,10 +155,12 @@ const char *identifier;
  size_t len;
  {
      static char retbuf[81];
@@ -42,7 +42,7 @@ Index: lib/imapoptions
 ===================================================================
 --- lib/imapoptions.orig
 +++ lib/imapoptions
-@@ -927,6 +927,11 @@ are listed with ``<none>''.
+@@ -1185,6 +1185,11 @@ product version in the capabilities */
     interface, otherwise the user is assumed to be in the default
     domain (if set). */
  
@@ -58,9 +58,9 @@ Index: lib/libcyr_cfg.c
 ===================================================================
 --- lib/libcyr_cfg.c.orig
 +++ lib/libcyr_cfg.c
-@@ -123,6 +123,11 @@ struct cyrusopt_s cyrus_options[] = {
-       CFGVAL(long, 100),
-       CYRUS_OPT_INT },
+@@ -150,6 +150,11 @@ struct cyrusopt_s cyrus_options[] = {
+       CFGVAL(long, 0),
+       CYRUS_OPT_SWITCH },
  
 +    { CYRUSOPT_NORMALIZEUID,
 +      CFGVAL(long, 1),
@@ -74,7 +74,7 @@ Index: lib/libcyr_cfg.h
 ===================================================================
 --- lib/libcyr_cfg.h.orig
 +++ lib/libcyr_cfg.h
-@@ -99,6 +99,8 @@ enum cyrus_opt {
+@@ -112,6 +112,8 @@ enum cyrus_opt {
      CYRUSOPT_SQL_PASSWD,
      /* Secure SQL connection (OFF) */
      CYRUSOPT_SQL_USESSL,
--- cyrus-imapd-2.3.13-autocreate-0.10-0.diff.orig
+++ cyrus-imapd-2.3.13-autocreate-0.10-0.diff
@@ -1,6 +1,7 @@
-diff -Naur cyrus-imapd-2.3.13/README.autocreate cyrus-imapd-2.3.13-autocreate.uncompiled/README.autocreate
---- cyrus-imapd-2.3.13/README.autocreate	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/README.autocreate	2008-10-29 15:04:11.000000000 +0200
+Index: cyrus-imapd-2.3.14/README.autocreate
+===================================================================
+--- /dev/null
++++ cyrus-imapd-2.3.14/README.autocreate
 @@ -0,0 +1,211 @@
 +Cyrus IMAP autocreate Inbox patch
 +----------------------------------
@@ -213,10 +214,11 @@ diff -Naur cyrus-imapd-2.3.13/README.aut
 +
 +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate
 +
-diff -Naur cyrus-imapd-2.3.13/imap/Makefile.in cyrus-imapd-2.3.13-autocreate.uncompiled/imap/Makefile.in
---- cyrus-imapd-2.3.13/imap/Makefile.in	2008-09-23 19:17:09.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/Makefile.in	2008-10-29 15:04:29.000000000 +0200
-@@ -101,7 +101,7 @@
+Index: cyrus-imapd-2.3.14/imap/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.14.orig/imap/Makefile.in
++++ cyrus-imapd-2.3.14/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 \
@@ -225,7 +227,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/Makef
  	statuscache_db.o
  
  IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
-@@ -118,7 +118,7 @@
+@@ -119,7 +119,7 @@ PROGS = imapd lmtpd pop3d \
  	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 +236,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/Makef
  
  BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
  	lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \
-@@ -183,9 +183,9 @@
+@@ -184,9 +184,9 @@ mupdate_err.c: mupdate_err.et
  mupdate_err.h: mupdate_err.c
  
  ### Services
@@ -246,7 +248,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/Makef
  
  lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
  	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-@@ -199,162 +199,166 @@
+@@ -200,162 +200,166 @@ 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)
  
@@ -483,9 +485,10 @@ diff -Naur cyrus-imapd-2.3.13/imap/Makef
  
  ### Other Misc Targets
  
-diff -Naur cyrus-imapd-2.3.13/imap/autosieve.c cyrus-imapd-2.3.13-autocreate.uncompiled/imap/autosieve.c
---- cyrus-imapd-2.3.13/imap/autosieve.c	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/autosieve.c	2008-10-29 15:04:11.000000000 +0200
+Index: cyrus-imapd-2.3.14/imap/autosieve.c
+===================================================================
+--- /dev/null
++++ cyrus-imapd-2.3.14/imap/autosieve.c
 @@ -0,0 +1,588 @@
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -1075,9 +1078,10 @@ diff -Naur cyrus-imapd-2.3.13/imap/autos
 + * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present
 + */
 +
-diff -Naur cyrus-imapd-2.3.13/imap/compile_sieve.c cyrus-imapd-2.3.13-autocreate.uncompiled/imap/compile_sieve.c
---- cyrus-imapd-2.3.13/imap/compile_sieve.c	1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/compile_sieve.c	2008-10-29 15:04:11.000000000 +0200
+Index: cyrus-imapd-2.3.14/imap/compile_sieve.c
+===================================================================
+--- /dev/null
++++ cyrus-imapd-2.3.14/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 */
@@ -1444,10 +1448,11 @@ diff -Naur cyrus-imapd-2.3.13/imap/compi
 +
 +
 +
-diff -Naur cyrus-imapd-2.3.13/imap/imapd.c cyrus-imapd-2.3.13-autocreate.uncompiled/imap/imapd.c
---- cyrus-imapd-2.3.13/imap/imapd.c	2008-10-08 18:47:06.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/imapd.c	2008-10-29 15:04:11.000000000 +0200
-@@ -209,6 +209,7 @@
+Index: cyrus-imapd-2.3.14/imap/imapd.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/imap/imapd.c
++++ cyrus-imapd-2.3.14/imap/imapd.c
+@@ -221,6 +221,7 @@ static const int max_monthdays[] = {
  void motd_file(int fd);
  void shut_down(int code);
  void fatal(const char *s, int code);
@@ -1455,7 +1460,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/imapd
  
  void cmdloop(void);
  void cmd_login(char *tag, char *user);
-@@ -1975,6 +1976,43 @@
+@@ -2052,6 +2053,43 @@ void cmdloop()
  }
  
  /*
@@ -1499,7 +1504,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/imapd
   * Perform a LOGIN command
   */
  void cmd_login(char *tag, char *user)
-@@ -2151,6 +2189,9 @@
+@@ -2233,6 +2271,9 @@ void cmd_login(char *tag, char *user)
  				strcspn(imapd_userid, "@") : 0);
  
      freebuf(&passwdbuf);
@@ -1509,7 +1514,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/imapd
      return;
  }
  
-@@ -2308,6 +2349,8 @@
+@@ -2395,6 +2436,8 @@ cmd_authenticate(char *tag, char *authty
  				config_virtdomains ?
  				strcspn(imapd_userid, "@") : 0);
  
@@ -1518,10 +1523,11 @@ diff -Naur cyrus-imapd-2.3.13/imap/imapd
      return;
  }
  
-diff -Naur cyrus-imapd-2.3.13/imap/lmtpd.c cyrus-imapd-2.3.13-autocreate.uncompiled/imap/lmtpd.c
---- cyrus-imapd-2.3.13/imap/lmtpd.c	2008-04-22 16:11:18.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/lmtpd.c	2008-10-29 15:04:11.000000000 +0200
-@@ -117,6 +117,8 @@
+Index: cyrus-imapd-2.3.14/imap/lmtpd.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/imap/lmtpd.c
++++ cyrus-imapd-2.3.14/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);
  
@@ -1530,7 +1536,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/lmtpd
  /* current namespace */
  static struct namespace lmtpd_namespace;
  
-@@ -976,6 +978,86 @@
+@@ -976,6 +978,86 @@ void shut_down(int code)
      exit(code);
  }
  
@@ -1615,9 +1621,9 @@ diff -Naur cyrus-imapd-2.3.13/imap/lmtpd
 +
 +
  static int verify_user(const char *user, const char *domain, char *mailbox,
- 		       long quotacheck, struct auth_state *authstate)
+ 		       quota_t quotacheck, struct auth_state *authstate)
  {
-@@ -1019,6 +1101,15 @@
+@@ -1019,6 +1101,15 @@ static int verify_user(const char *user,
  	 */
  	r = mlookup(namebuf, &server, &acl, NULL);
  
@@ -1633,7 +1639,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/lmtpd
  	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 @@
+@@ -1045,6 +1136,7 @@ static int verify_user(const char *user,
  			     aclcheck, (quotacheck < 0)
  			     || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
  			     quotacheck : 0);
@@ -1641,9 +1647,10 @@ diff -Naur cyrus-imapd-2.3.13/imap/lmtpd
  	}
      }
  
-diff -Naur cyrus-imapd-2.3.13/imap/mboxlist.c cyrus-imapd-2.3.13-autocreate.uncompiled/imap/mboxlist.c
---- cyrus-imapd-2.3.13/imap/mboxlist.c	2008-10-08 18:47:08.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/mboxlist.c	2008-10-29 15:04:11.000000000 +0200
+Index: cyrus-imapd-2.3.14/imap/mboxlist.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/imap/mboxlist.c
++++ cyrus-imapd-2.3.14/imap/mboxlist.c
 @@ -83,6 +83,12 @@
  #include "quota.h"
  #include "sync_log.h"
@@ -1657,7 +1664,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/mboxl
  #define DB config_mboxlist_db
  #define SUBDB config_subscription_db
  
-@@ -100,11 +106,29 @@
+@@ -100,11 +106,29 @@ static int mboxlist_rmquota(const char *
  static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
  				void *rock);
  
@@ -1687,7 +1694,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/mboxl
  #define FNAME_SUBSSUFFIX ".sub"
  
  /*
-@@ -3383,3 +3407,349 @@
+@@ -3399,3 +3423,349 @@ int mboxlist_delayed_delete_isenabled(vo
  
      return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
  }
@@ -2037,10 +2044,11 @@ diff -Naur cyrus-imapd-2.3.13/imap/mboxl
 +    return r;
 +}
 +
-diff -Naur cyrus-imapd-2.3.13/imap/mboxlist.h cyrus-imapd-2.3.13-autocreate.uncompiled/imap/mboxlist.h
---- cyrus-imapd-2.3.13/imap/mboxlist.h	2008-03-24 19:09:18.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/mboxlist.h	2008-10-29 15:04:11.000000000 +0200
-@@ -212,4 +212,8 @@
+Index: cyrus-imapd-2.3.14/imap/mboxlist.h
+===================================================================
+--- cyrus-imapd-2.3.14.orig/imap/mboxlist.h
++++ cyrus-imapd-2.3.14/imap/mboxlist.h
+@@ -215,4 +215,8 @@ int mboxlist_commit(struct txn *tid);
  int mboxlist_abort(struct txn *tid);
  
  int mboxlist_delayed_delete_isenabled(void);
@@ -2049,10 +2057,11 @@ diff -Naur cyrus-imapd-2.3.13/imap/mboxl
 +                       int autocreatequota);
 +
  #endif
-diff -Naur cyrus-imapd-2.3.13/imap/pop3d.c cyrus-imapd-2.3.13-autocreate.uncompiled/imap/pop3d.c
---- cyrus-imapd-2.3.13/imap/pop3d.c	2008-04-22 16:11:18.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/imap/pop3d.c	2008-10-29 15:04:11.000000000 +0200
-@@ -172,6 +172,8 @@
+Index: cyrus-imapd-2.3.14/imap/pop3d.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/imap/pop3d.c
++++ cyrus-imapd-2.3.14/imap/pop3d.c
+@@ -177,6 +177,8 @@ static void bitpipe(void);
  static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */
  static void cmd_apop(char *response);
  
@@ -2061,7 +2070,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/pop3d
  static void cmd_auth(char *arg);
  static void cmd_capa(void);
  static void cmd_pass(char *pass);
-@@ -1245,6 +1247,7 @@
+@@ -1255,6 +1257,7 @@ void cmd_user(char *user)
  	popd_userid = xstrdup(userbuf);
  	prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
      }
@@ -2069,7 +2078,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/pop3d
  }
  
  void cmd_pass(char *pass)
-@@ -1548,6 +1551,43 @@
+@@ -1558,6 +1561,43 @@ void cmd_auth(char *arg)
  }
  
  /*
@@ -2113,7 +2122,7 @@ diff -Naur cyrus-imapd-2.3.13/imap/pop3d
   * Complete the login process by opening and locking the user's inbox
   */
  int openinbox(void)
-@@ -1576,6 +1616,12 @@
+@@ -1586,6 +1626,12 @@ int openinbox(void)
  
      if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL,
  				&server, &acl, NULL);
@@ -2126,10 +2135,11 @@ diff -Naur cyrus-imapd-2.3.13/imap/pop3d
      if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
  	(!acl ||
  	 !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) {
-diff -Naur cyrus-imapd-2.3.13/lib/auth.c cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth.c
---- cyrus-imapd-2.3.13/lib/auth.c	2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth.c	2008-10-29 15:04:11.000000000 +0200
-@@ -118,3 +118,11 @@
+Index: cyrus-imapd-2.3.14/lib/auth.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/auth.c
++++ cyrus-imapd-2.3.14/lib/auth.c
+@@ -118,3 +118,11 @@ struct auth_state *auth_state;
  
      auth->freestate(auth_state);
  }
@@ -2141,10 +2151,11 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth.c
 +    return auth->auth_canonuser(auth_state);
 +}
 +
-diff -Naur cyrus-imapd-2.3.13/lib/auth.h cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth.h
---- cyrus-imapd-2.3.13/lib/auth.h	2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth.h	2008-10-29 15:04:11.000000000 +0200
-@@ -55,6 +55,7 @@
+Index: cyrus-imapd-2.3.14/lib/auth.h
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/auth.h
++++ cyrus-imapd-2.3.14/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);
@@ -2152,17 +2163,18 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth.h
  };
  
  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.3.13/lib/auth_krb.c cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_krb.c
---- cyrus-imapd-2.3.13/lib/auth_krb.c	2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_krb.c	2008-10-29 15:04:11.000000000 +0200
-@@ -340,6 +340,15 @@
+Index: cyrus-imapd-2.3.14/lib/auth_krb.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/auth_krb.c
++++ cyrus-imapd-2.3.14/lib/auth_krb.c
+@@ -340,6 +340,15 @@ struct auth_state *auth_state;
      free((char *)auth_state);
  }
  
@@ -2178,7 +2190,7 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth_k
  #else /* HAVE_KRB */
  
  static int mymemberof(
-@@ -371,6 +380,14 @@
+@@ -371,6 +380,14 @@ static void myfreestate(
  	fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
  }
  
@@ -2193,16 +2205,17 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth_k
  #endif
  
  struct auth_mech auth_krb = 
-@@ -381,4 +397,5 @@
+@@ -381,4 +398,5 @@ struct auth_mech auth_krb =
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
-diff -Naur cyrus-imapd-2.3.13/lib/auth_krb5.c cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_krb5.c
---- cyrus-imapd-2.3.13/lib/auth_krb5.c	2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_krb5.c	2008-10-29 15:04:11.000000000 +0200
-@@ -199,6 +199,14 @@
+Index: cyrus-imapd-2.3.14/lib/auth_krb5.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/auth_krb5.c
++++ cyrus-imapd-2.3.14/lib/auth_krb5.c
+@@ -199,6 +199,14 @@ static void myfreestate(struct auth_stat
      free(auth_state);
  }
  
@@ -2217,7 +2230,7 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth_k
  #else /* HAVE_GSSAPI_H */
  
  static int mymemberof(
-@@ -230,6 +238,12 @@
+@@ -230,6 +238,12 @@ static void myfreestate(
  	fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
  }
  
@@ -2230,16 +2243,17 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth_k
  #endif
  
  struct auth_mech auth_krb5 = 
-@@ -240,4 +254,5 @@
+@@ -240,4 +254,5 @@ struct auth_mech auth_krb5 =
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
-diff -Naur cyrus-imapd-2.3.13/lib/auth_pts.c cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_pts.c
---- cyrus-imapd-2.3.13/lib/auth_pts.c	2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_pts.c	2008-10-29 15:04:11.000000000 +0200
-@@ -512,6 +512,14 @@
+Index: cyrus-imapd-2.3.14/lib/auth_pts.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/auth_pts.c
++++ cyrus-imapd-2.3.14/lib/auth_pts.c
+@@ -512,6 +512,14 @@ static void myfreestate(struct auth_stat
      free(auth_state);
  }
  
@@ -2254,16 +2268,17 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth_p
  struct auth_mech auth_pts = 
  {
      "pts",		/* name */
-@@ -520,4 +528,5 @@
+@@ -520,4 +528,5 @@ struct auth_mech auth_pts =
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
-diff -Naur cyrus-imapd-2.3.13/lib/auth_unix.c cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_unix.c
---- cyrus-imapd-2.3.13/lib/auth_unix.c	2008-08-26 22:20:39.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/auth_unix.c	2008-10-29 15:04:11.000000000 +0200
-@@ -314,6 +314,16 @@
+Index: cyrus-imapd-2.3.14/lib/auth_unix.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/auth_unix.c
++++ cyrus-imapd-2.3.14/lib/auth_unix.c
+@@ -314,6 +314,16 @@ struct auth_state *auth_state;
      free((char *)auth_state);
  }
  
@@ -2280,16 +2295,17 @@ diff -Naur cyrus-imapd-2.3.13/lib/auth_u
  
  struct auth_mech auth_unix = 
  {
-@@ -323,4 +333,5 @@
+@@ -323,4 +333,5 @@ struct auth_mech auth_unix =
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
-diff -Naur cyrus-imapd-2.3.13/lib/imapoptions cyrus-imapd-2.3.13-autocreate.uncompiled/lib/imapoptions
---- cyrus-imapd-2.3.13/lib/imapoptions	2008-10-08 20:18:12.000000000 +0300
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/lib/imapoptions	2008-10-29 15:04:11.000000000 +0200
-@@ -198,6 +198,55 @@
+Index: cyrus-imapd-2.3.14/lib/imapoptions
+===================================================================
+--- cyrus-imapd-2.3.14.orig/lib/imapoptions
++++ cyrus-imapd-2.3.14/lib/imapoptions
+@@ -198,6 +198,55 @@ are listed with ``<none>''.
  /* Number of seconds to wait before returning a timeout failure when
     performing a client connection (e.g., in a murder environment) */
  
@@ -2345,10 +2361,11 @@ diff -Naur cyrus-imapd-2.3.13/lib/imapop
  { "configdirectory", NULL, STRING }
  /* The pathname of the IMAP configuration directory.  This field is
     required. */
-diff -Naur cyrus-imapd-2.3.13/notifyd/Makefile.in cyrus-imapd-2.3.13-autocreate.uncompiled/notifyd/Makefile.in
---- cyrus-imapd-2.3.13/notifyd/Makefile.in	2008-03-24 21:59:32.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/notifyd/Makefile.in	2008-10-29 15:04:11.000000000 +0200
-@@ -71,10 +71,11 @@
+Index: cyrus-imapd-2.3.14/notifyd/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.14.orig/notifyd/Makefile.in
++++ cyrus-imapd-2.3.14/notifyd/Makefile.in
+@@ -71,10 +71,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@
  SERVICE=../master/service.o
  
  IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
@@ -2361,10 +2378,11 @@ diff -Naur cyrus-imapd-2.3.13/notifyd/Ma
  
  PURIFY=/usr/local/bin/purify
  PUREOPT=-best-effort
-diff -Naur cyrus-imapd-2.3.13/notifyd/notifyd.c cyrus-imapd-2.3.13-autocreate.uncompiled/notifyd/notifyd.c
---- cyrus-imapd-2.3.13/notifyd/notifyd.c	2008-03-24 21:59:32.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/notifyd/notifyd.c	2008-10-29 15:04:11.000000000 +0200
-@@ -96,7 +96,7 @@
+Index: cyrus-imapd-2.3.14/notifyd/notifyd.c
+===================================================================
+--- cyrus-imapd-2.3.14.orig/notifyd/notifyd.c
++++ cyrus-imapd-2.3.14/notifyd/notifyd.c
+@@ -96,7 +96,7 @@ char *fetch_arg(char *head, char* tail)
  
  #define NOTIFY_MAXSIZE 8192
  
@@ -2373,10 +2391,11 @@ diff -Naur cyrus-imapd-2.3.13/notifyd/no
  {
      struct sockaddr_un sun_data;
      socklen_t sunlen = sizeof(sun_data);
-diff -Naur cyrus-imapd-2.3.13/ptclient/Makefile.in cyrus-imapd-2.3.13-autocreate.uncompiled/ptclient/Makefile.in
---- cyrus-imapd-2.3.13/ptclient/Makefile.in	2008-03-24 20:34:22.000000000 +0200
-+++ cyrus-imapd-2.3.13-autocreate.uncompiled/ptclient/Makefile.in	2008-10-29 15:04:11.000000000 +0200
-@@ -57,10 +57,11 @@
+Index: cyrus-imapd-2.3.14/ptclient/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.14.orig/ptclient/Makefile.in
++++ cyrus-imapd-2.3.14/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@
--- cyrus-imapd-openslp.patch.orig
+++ cyrus-imapd-openslp.patch
@@ -1,8 +1,10 @@
---- configure.in
-+++ configure.in	2004/05/31 11:51:43
-@@ -961,6 +961,19 @@
- SNMP_SUBDIRS=""
- AC_SUBST(SNMP_SUBDIRS)
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -1232,6 +1232,19 @@ AC_ARG_WITH(drac, [  --with-drac=DIR
+ 	fi)
+ AC_SUBST(DRACLIBS)
  
 +dnl
 +dnl Test for OpenSLP
@@ -20,9 +22,11 @@
  CMU_LIBWRAP
  CMU_UCDSNMP
  
---- master/Makefile.in
-+++ master/Makefile.in	2004/05/31 11:51:43
-@@ -59,7 +59,7 @@
+Index: master/Makefile.in
+===================================================================
+--- master/Makefile.in.orig
++++ master/Makefile.in
+@@ -58,7 +58,7 @@ DEPLIBS = @DEPLIBS@
  
  CFLAGS = @CFLAGS@
  LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
@@ -31,9 +35,11 @@
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@
---- master/master.c
-+++ master/master.c	2004/05/31 11:52:41
-@@ -100,6 +100,10 @@
+Index: master/master.c
+===================================================================
+--- master/master.c.orig
++++ master/master.c
+@@ -108,6 +108,10 @@
    int deny_severity = LOG_ERR;
  #endif
  
@@ -44,8 +50,8 @@
  #include "masterconf.h"
  
  #include "master.h"
-@@ -109,6 +113,16 @@
- 
+@@ -117,6 +121,16 @@
+ #include "util.h"
  #include "xmalloc.h"
  
 +#ifdef USE_SLP
@@ -61,7 +67,7 @@
  enum {
      become_cyrus_early = 1,
      child_table_size = 10000,
-@@ -165,10 +179,41 @@
+@@ -177,10 +191,41 @@ static struct timeval janitor_mark;	/* L
  void limit_fds(rlim_t);
  void schedule_event(struct event *a);
  
@@ -103,7 +109,7 @@
      exit(code);
  }
  
-@@ -481,7 +526,90 @@
+@@ -462,7 +507,90 @@ void service_create(struct service *s)
  	    s->socket = 0;
  	    continue;
  	}
@@ -195,7 +201,7 @@
  	s->ready_workers = 0;
  	s->associate = nsocket;
  	s->family = res->ai_family;
-@@ -1001,6 +1129,9 @@
+@@ -1000,6 +1128,9 @@ void sigterm_handler(int sig __attribute
      /* tell master agent we're exiting */
      snmp_shutdown("cyrusMaster");
  #endif
@@ -205,7 +211,7 @@
  
      syslog(LOG_INFO, "exiting on SIGTERM/SIGINT");
      exit(0);
-@@ -1894,6 +2025,16 @@
+@@ -1852,6 +1983,16 @@ int main(int argc, char **argv)
  
      syslog(LOG_NOTICE, "process started");
  
--- cyrus-imapd.changes.orig
+++ cyrus-imapd.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Nov  3 19:09:12 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
 Mon Sep 28 08:48:12 UTC 2009 - rhafer@novell.com
 
 - Fixed init script dependencies. saslauthd is not a hard 
--- pie.patch.orig
+++ pie.patch
@@ -1,8 +1,8 @@
-Index: cyrus-imapd-2.3.10/configure.in
+Index: cyrus-imapd-2.3.14/configure.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/configure.in
-+++ cyrus-imapd-2.3.10/configure.in
-@@ -1093,6 +1093,27 @@ AC_SUBST(PERL_SUBDIRS)
+--- cyrus-imapd-2.3.14.orig/configure.in
++++ cyrus-imapd-2.3.14/configure.in
+@@ -1295,6 +1295,27 @@ AC_SUBST(PERL_SUBDIRS)
  AC_SUBST(PERL_DEPSUBDIRS)
  AC_SUBST(PERL)
  
@@ -28,12 +28,12 @@ Index: cyrus-imapd-2.3.10/configure.in
 +AC_SUBST(PIE_LDFLAGS)
 +
  AH_TOP([
- /* $Id: configure.in,v 1.303 2007/10/18 18:14:47 murch Exp $ */
- /* 
-Index: cyrus-imapd-2.3.10/imap/Makefile.in
+ /*
+  * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+Index: cyrus-imapd-2.3.14/imap/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/imap/Makefile.in
-+++ cyrus-imapd-2.3.10/imap/Makefile.in
+--- cyrus-imapd-2.3.14.orig/imap/Makefile.in
++++ cyrus-imapd-2.3.14/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,11 +45,11 @@ Index: cyrus-imapd-2.3.10/imap/Makefile.
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@
-Index: cyrus-imapd-2.3.10/lib/Makefile.in
+Index: cyrus-imapd-2.3.14/lib/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/lib/Makefile.in
-+++ cyrus-imapd-2.3.10/lib/Makefile.in
-@@ -62,8 +62,8 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPF
+--- cyrus-imapd-2.3.14.orig/lib/Makefile.in
++++ cyrus-imapd-2.3.14/lib/Makefile.in
+@@ -63,8 +63,8 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPF
  LIBS = @LIBS@
  
  MAKEDEPEND_CFLAGS = @CFLAGS@
@@ -60,11 +60,11 @@ Index: cyrus-imapd-2.3.10/lib/Makefile.i
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@
-Index: cyrus-imapd-2.3.10/master/Makefile.in
+Index: cyrus-imapd-2.3.14/master/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/master/Makefile.in
-+++ cyrus-imapd-2.3.10/master/Makefile.in
-@@ -57,8 +57,8 @@ DEFS = @DEFS@ @LOCALDEFS@
+--- cyrus-imapd-2.3.14.orig/master/Makefile.in
++++ cyrus-imapd-2.3.14/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,11 +75,11 @@ Index: cyrus-imapd-2.3.10/master/Makefil
  LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ @SLPLIBS@
  
  SHELL = /bin/sh
-Index: cyrus-imapd-2.3.10/netnews/Makefile.in
+Index: cyrus-imapd-2.3.14/netnews/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/netnews/Makefile.in
-+++ cyrus-imapd-2.3.10/netnews/Makefile.in
-@@ -53,8 +53,8 @@ CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/
+--- cyrus-imapd-2.3.14.orig/netnews/Makefile.in
++++ cyrus-imapd-2.3.14/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,11 +90,11 @@ Index: cyrus-imapd-2.3.10/netnews/Makefi
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@
-Index: cyrus-imapd-2.3.10/notifyd/Makefile.in
+Index: cyrus-imapd-2.3.14/notifyd/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/notifyd/Makefile.in
-+++ cyrus-imapd-2.3.10/notifyd/Makefile.in
-@@ -54,8 +54,8 @@ CYRUS_GROUP=@cyrus_group@
+--- cyrus-imapd-2.3.14.orig/notifyd/Makefile.in
++++ cyrus-imapd-2.3.14/notifyd/Makefile.in
+@@ -56,8 +56,8 @@ CYRUS_GROUP=@cyrus_group@
  
  DEFS = @DEFS@ @LOCALDEFS@
  CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
@@ -105,11 +105,11 @@ Index: cyrus-imapd-2.3.10/notifyd/Makefi
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-Index: cyrus-imapd-2.3.10/perl/sieve/lib/Makefile.in
+Index: cyrus-imapd-2.3.14/perl/sieve/lib/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/perl/sieve/lib/Makefile.in
-+++ cyrus-imapd-2.3.10/perl/sieve/lib/Makefile.in
-@@ -57,7 +57,7 @@ IMAP_LIBS = @IMAP_LIBS@
+--- cyrus-imapd-2.3.14.orig/perl/sieve/lib/Makefile.in
++++ cyrus-imapd-2.3.14/perl/sieve/lib/Makefile.in
+@@ -58,7 +58,7 @@ IMAP_LIBS = @IMAP_LIBS@
  DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
  
  MAKEDEPEND_CFLAGS = @CFLAGS@
@@ -118,11 +118,11 @@ Index: cyrus-imapd-2.3.10/perl/sieve/lib
  LDFLAGS = @LDFLAGS@
  
  SHELL = /bin/sh
-Index: cyrus-imapd-2.3.10/sieve/Makefile.in
+Index: cyrus-imapd-2.3.14/sieve/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/sieve/Makefile.in
-+++ cyrus-imapd-2.3.10/sieve/Makefile.in
-@@ -41,8 +41,8 @@ COMPILE_ET = @COMPILE_ET@
+--- cyrus-imapd-2.3.14.orig/sieve/Makefile.in
++++ cyrus-imapd-2.3.14/sieve/Makefile.in
+@@ -60,8 +60,8 @@ COMPILE_ET = @COMPILE_ET@
  DEFS = @DEFS@ @LOCALDEFS@
  CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  MAKEDEPEND_CFLAGS = @CFLAGS@
@@ -133,11 +133,11 @@ Index: cyrus-imapd-2.3.10/sieve/Makefile
  
  MAKEDEPEND = @MAKEDEPEND@
  
-Index: cyrus-imapd-2.3.10/syslog/Makefile.in
+Index: cyrus-imapd-2.3.14/syslog/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/syslog/Makefile.in
-+++ cyrus-imapd-2.3.10/syslog/Makefile.in
-@@ -54,8 +54,8 @@ DEFS = @DEFS@
+--- cyrus-imapd-2.3.14.orig/syslog/Makefile.in
++++ cyrus-imapd-2.3.14/syslog/Makefile.in
+@@ -55,8 +55,8 @@ DEFS = @DEFS@
  CPPFLAGS = @CPPFLAGS@
  LIBS = @LIBS@
  
@@ -148,11 +148,11 @@ Index: cyrus-imapd-2.3.10/syslog/Makefil
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@
-Index: cyrus-imapd-2.3.10/timsieved/Makefile.in
+Index: cyrus-imapd-2.3.14/timsieved/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/timsieved/Makefile.in
-+++ cyrus-imapd-2.3.10/timsieved/Makefile.in
-@@ -54,8 +54,8 @@ CYRUS_GROUP=@cyrus_group@
+--- cyrus-imapd-2.3.14.orig/timsieved/Makefile.in
++++ cyrus-imapd-2.3.14/timsieved/Makefile.in
+@@ -56,8 +56,8 @@ CYRUS_GROUP=@cyrus_group@
  
  DEFS = @DEFS@ @LOCALDEFS@
  CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
@@ -163,11 +163,11 @@ Index: cyrus-imapd-2.3.10/timsieved/Make
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-Index: cyrus-imapd-2.3.10/com_err/et/Makefile.in
+Index: cyrus-imapd-2.3.14/com_err/et/Makefile.in
 ===================================================================
---- cyrus-imapd-2.3.10.orig/com_err/et/Makefile.in
-+++ cyrus-imapd-2.3.10/com_err/et/Makefile.in
-@@ -55,8 +55,8 @@ DEFS = @DEFS@
+--- cyrus-imapd-2.3.14.orig/com_err/et/Makefile.in
++++ cyrus-imapd-2.3.14/com_err/et/Makefile.in
+@@ -58,8 +58,8 @@ DEFS = @DEFS@
  CPPFLAGS = @CPPFLAGS@
  LIBS = @LIBS@

Places

File project.diff of Package cyrus-imapd (Revision c2a936c7113ca1ce47da9f8577b96834)

Places