courier-maildir.patch

   1 --- courier-0.78.2.orig/courier/courierd.dist.in        2009-11-08 19:14:47.000000000 +0100
   2 +++ courier-0.78.2/courier/courierd.dist.in     2010-05-08 23:27:21.826603250 +0200
   3 @@ -88,9 +88,9 @@
   4  #  One of the following definitions of DEFAULTDELIVERY should be
   5  #  uncommented.
   6  #
   7 -#  Default deliveries to $HOME/Maildir
   8 +#  Default deliveries to $HOME/Mail/Maildir
   9  #
  10 -#  DEFAULTDELIVERY=./Maildir
  11 +#  DEFAULTDELIVERY=./Mail/Maildir
  12  #
  13  #  Alternatively, use procmail to deliver mail to local mailboxes.
  14  #
  15 @@ -104,12 +104,12 @@
  16  #  use something like this:
  17  #
  18  #  DEFAULTDELIVERY="|| dotforward
  19 -#  ./Maildir"
  20 +#  ./Mail/Maildir"
  21  #
  22  #  Yes, it's two lines long, with an embedded newline.  Of course, you can use
  23  #  any default local mail delivery instruction in place of ./Maildir.
  24
  25 -DEFAULTDELIVERY=./Maildir
  26 +DEFAULTDELIVERY=./Mail/Maildir
  27
  28  ##NAME: MAILDROPDEFAULT:0
  29  #
  30 @@ -117,7 +117,7 @@
  31  #  the location of the default mailbox.  You should not change this setting
  32  #  unless you REALLY know what you're doing.
  33
  34 -MAILDROPDEFAULT=./Maildir
  35 +MAILDROPDEFAULT=./Mail/Maildir
  36
  37  ##NAME: ESMTP_CORK:0
  38  #
  39 --- courier-0.78.2.orig/libs/imap/imapd.dist.in 2008-06-21 18:01:23.000000000 +0200
  40 +++ courier-0.78.2/libs/imap/imapd.dist.in      2010-05-08 23:27:21.829937594 +0200
  41 @@ -417,4 +417,4 @@
  42  #
  43  # MAILDIRPATH - directory name of the maildir directory.
  44  #
  45 -MAILDIRPATH=Maildir
  46 +MAILDIRPATH=Mail/Maildir
  47 --- courier-0.78.2.orig/libs/imap/imapd-ssl.dist.in     2009-08-13 00:25:49.000000000 +0200
  48 +++ courier-0.78.2/libs/imap/imapd-ssl.dist.in  2010-05-08 23:27:21.829937594 +0200
  49 @@ -329,4 +329,4 @@
  50  #
  51  # MAILDIRPATH - directory name of the maildir directory.
  52  #
  53 -MAILDIRPATH=Maildir
  54 +MAILDIRPATH=Mail/Maildir
  55 --- courier-0.78.2.orig/libs/imap/pop3d.dist.in 2005-07-05 14:42:51.000000000 +0200
  56 +++ courier-0.78.2/libs/imap/pop3d.dist.in      2010-05-08 23:27:21.829937594 +0200
  57 @@ -143,4 +143,4 @@
  58  #
  59  # MAILDIRPATH - directory name of the maildir directory.
  60  #
  61 -MAILDIRPATH=Maildir
  62 +MAILDIRPATH=Mail/Maildir
  63 --- courier-0.78.2.orig/libs/imap/pop3d-ssl.dist.in     2009-08-13 00:25:49.000000000 +0200
  64 +++ courier-0.78.2/libs/imap/pop3d-ssl.dist.in  2010-05-08 23:27:21.835978217 +0200
  65 @@ -315,4 +315,4 @@
  66  #
  67  # MAILDIRPATH - directory name of the maildir directory.
  68  #
  69 -MAILDIRPATH=Maildir
  70 +MAILDIRPATH=Mail/Maildir
  71 --- courier-0.78.2.orig/libs/pcp/pcpd.c 2006-01-24 00:22:10.000000000 +0100
  72 +++ courier-0.78.2/libs/pcp/pcpd.c      2010-05-08 23:27:21.835978217 +0200
  73 @@ -2187,10 +2187,10 @@
  74                 exit(1);
  75         }
  76
  77 -       if (chdir(a->maildir && *a->maildir ? a->maildir:"Maildir") < 0)
  78 +       if (chdir(a->maildir && *a->maildir ? a->maildir:"Mail/Maildir") < 0)
  79         {
  80                 free(token);
  81 -               fprintf(stderr, "NOTICE: chdir(Maildir) failed: %s\n",
  82 +               fprintf(stderr, "NOTICE: chdir(Mail/Maildir) failed: %s\n",
  83                         strerror(errno));
  84                 maildir_cache_cancel();
  85                 exit(1);
  86 --- courier-0.78.2.orig/libs/sqwebmail/auth.c   2009-06-27 18:32:50.000000000 +0200
  87 +++ courier-0.78.2/libs/sqwebmail/auth.c        2010-05-08 23:27:21.835978217 +0200
  88 @@ -79,7 +79,7 @@
  89         if (!maildir || !*maildir)
  90                 maildir=getenv("MAILDIRPATH");
  91         if (!maildir || !*maildir)
  92 -               maildir="Maildir";
  93 +               maildir="Mail/Maildir";
  94         if (chdir(maildir))     return (-1);
  95         maildir_loginexec();
  96         return (0);
  97 --- courier-0.78.2.orig/libs/sqwebmail/sqwebmaild.dist.in       2007-02-10 04:16:35.000000000 +0100
  98 +++ courier-0.78.2/libs/sqwebmail/sqwebmaild.dist.in    2010-05-08 23:27:21.835978217 +0200
  99 @@ -32,7 +32,7 @@
 100  #
 101  # MAILDIRPATH - directory name of the maildir directory.
 102
 103 -MAILDIRPATH=Maildir
 104 +MAILDIRPATH=Mail/Maildir
 105
 106  ##NAME: SQWEBMAIL_PREFORK:0
 107  #
 108 --- courier-0.78.2.orig/libs/sqwebmail/sqwebmail.h      2007-02-24 20:02:59.000000000 +0100
 109 +++ courier-0.78.2/libs/sqebmail/sqwebmail.h    2010-05-08 23:27:21.835978217 +0200
 110 @@ -25,7 +25,7 @@
 111
 112  /* Location of the user's Maildir */
 113
 114 -#define USER_DIR       "Maildir"
 115 +#define USER_DIR       "Mail/Maildir"
 116
 117  /* For PAM-based authentication */
 118