courier-maildir.patch

   1 diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in
   2 --- old/courier/courierd.dist.in        2002-03-15 19:17:18.000000000 +0000
   3 +++ new/courier/courierd.dist.in        2004-02-20 12:25:45.000000000 +0000
   4 @@ -76,7 +76,7 @@
   5  #  Yes, it's two lines long, with an embedded newline.  Of course, you can use
   6  #  any default local mail delivery instruction in place of ./Maildir.
   7
   8 -DEFAULTDELIVERY=./Maildir
   9 +DEFAULTDELIVERY=./Mail/Maildir
  10
  11  ##NAME: MAILDROPDEFAULT:0
  12  #
  13 @@ -84,7 +84,7 @@
  14  #  the location of the default mailbox.  You should not change this setting
  15  #  unless you REALLY know what you're doing.
  16
  17 -MAILDROPDEFAULT=./Maildir
  18 +MAILDROPDEFAULT=./Mail/Maildir
  19
  20  ##NAME: ESMTP_CORK:0
  21  #
  22 diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
  23 --- old/courier/imapd.rc.in     2003-11-29 02:16:15.000000000 +0000
  24 +++ new/courier/imapd.rc.in     2004-02-20 12:25:45.000000000 +0000
  25 @@ -49,7 +49,7 @@
  26                         -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
  27                         -pid=$PIDFILE $TCPDOPTS \
  28                         $PORT @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
  29 -                               @bindir@/imapd Maildir"
  30 +                               @bindir@/imapd Mail/Maildir"
  31         ;;
  32  stop)
  33         @sbindir@/couriertcpd -pid=$PIDFILE -stop
  34 diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
  35 --- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000
  36 +++ new/courier/imapd-ssl.rc.in 2004-02-20 12:25:45.000000000 +0000
  37 @@ -50,7 +50,7 @@
  38                         -pid=$SSLPIDFILE $TCPDOPTS \
  39                         $SSLPORT $COURIERTLS -server -tcpd \
  40                                 @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
  41 -                               @bindir@/imapd Maildir"
  42 +                               @bindir@/imapd Mail/Maildir"
  43         ;;
  44  stop)
  45         @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
  46 diff -Nur old/courier/pop3d.in new/courier/pop3d.in
  47 --- old/courier/pop3d.in        2003-11-28 01:04:59.000000000 +0000
  48 +++ new/courier/pop3d.in        2004-02-20 12:25:45.000000000 +0000
  49 @@ -77,4 +77,4 @@
  50                 -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
  51                 -pid=$PIDFILE $TCPDOPTS -address=$ADDRESS $PORT \
  52                 @libexecdir@/courier/courierpop3login $AUTHMODULELIST \
  53 -                       @libexecdir@/courier/courierpop3d Maildir"
  54 +                       @libexecdir@/courier/courierpop3d Mail/Maildir"
  55 diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
  56 --- old/courier/pop3d-ssl.in    2003-11-29 01:37:34.000000000 +0000
  57 +++ new/courier/pop3d-ssl.in    2004-02-20 12:25:45.000000000 +0000
  58 @@ -54,7 +54,7 @@
  59                         -pid=$SSLPIDFILE $TCPDOPTS \
  60                         $SSLPORT $COURIERTLS -server -tcpd \
  61                                 $libexecdir/courier/courierpop3login $LIBAUTHMODULES \
  62 -                               $libexecdir/courier/courierpop3d Maildir"
  63 +                               $libexecdir/courier/courierpop3d Mail/Maildir"
  64         ;;
  65  stop)
  66         @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
  67 diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
  68 --- old/imap/imapd.dist.in      2004-01-25 05:40:04.000000000 +0000
  69 +++ new/imap/imapd.dist.in      2004-03-16 17:45:49.000000000 +0000
  70 @@ -371,4 +371,4 @@
  71  #
  72  # MAILDIRPATH - directory name of the maildir directory.
  73  #
  74 -MAILDIRPATH=Maildir
  75 +MAILDIRPATH=Mail/Maildir
  76 diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
  77 --- old/imap/pop3d.dist.in      2004-01-25 05:40:04.000000000 +0000
  78 +++ new/imap/pop3d.dist.in      2004-03-16 17:45:56.000000000 +0000
  79 @@ -145,4 +145,4 @@
  80  #
  81  # MAILDIRPATH - directory name of the maildir directory.
  82  #
  83 -MAILDIRPATH=Maildir
  84 +MAILDIRPATH=Mail/Maildir
  85 diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c
  86 --- old/pcp/pcpd.c      2003-04-27 17:49:43.000000000 +0000
  87 +++ new/pcp/pcpd.c      2004-04-15 10:59:18.000000000 +0000
  88 @@ -2199,10 +2199,10 @@
  89                 exit(1);
  90         }
  91
  92 -       if (chdir(a->maildir && *a->maildir ? a->maildir:"Maildir") < 0)
  93 +       if (chdir(a->maildir && *a->maildir ? a->maildir:"Mail/Maildir") < 0)
  94         {
  95                 free(token);
  96 -               syslog(LOG_NOTICE, "pcpd: chdir(Maildir) failed.");
  97 +               syslog(LOG_NOTICE, "pcpd: chdir(Mail/Maildir) failed.");
  98                 maildir_cache_cancel();
  99                 exit(1);
 100         }
 101 @@ -2211,7 +2211,7 @@
 102         if (chdir("calendar") < 0)
 103         {
 104                 free(token);
 105 -               syslog(LOG_NOTICE, "pcpd: chdir(Maildir) failed.");
 106 +               syslog(LOG_NOTICE, "pcpd: chdir(Mail/Maildir) failed.");
 107                 maildir_cache_cancel();
 108                 exit(1);
 109         }
 110 diff -Nur old/webmail/auth.c new/webmail/auth.c
 111 --- old/webmail/auth.c  2003-10-11 00:54:37.000000000 +0000
 112 +++ new/webmail/auth.c  2004-02-20 12:26:31.000000000 +0000
 113 @@ -79,7 +79,7 @@
 114  static int login_maildir(const char *maildir)
 115  {
 116         if (!maildir || !*maildir)
 117 -               maildir="Maildir";
 118 +               maildir="Mail/Maildir";
 119         if (chdir(maildir))     return (-1);
 120         maildir_loginexec();
 121         return (0);
 122 @@ -107,7 +107,7 @@
 123  char   *buf;
 124  struct stat stat_buf;
 125
 126 -       if (!p || !*p)  p="Maildir";
 127 +       if (!p || !*p)  p="Mail/Maildir";
 128
 129         buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
 130
 131 diff -Nur old/webmail/sqwebmail.h new/webmail/sqwebmail.h
 132 --- old/webmail/sqwebmail.h     2004-02-29 20:50:13.000000000 +0000
 133 +++ new/webmail/sqwebmail.h     2004-04-15 10:58:47.000000000 +0000
 134 @@ -25,7 +25,7 @@
 135
 136  /* Location of the user's Maildir */
 137
 138 -#define USER_DIR       "Maildir"
 139 +#define USER_DIR       "Mail/Maildir"
 140
 141  /* For PAM-based authentication */
 142