- rel 2

[packages/courier.git] / courier-maildir.patch

diff --git a/courier-maildir.patch b/courier-maildir.patch
index fb868f063883deca35ad3808e4a618be13590927..a99f6568fad405dd2333894b0ea5026b658c488f 100644 (file)
--- a/courier-maildir.patch
+++ b/courier-maildir.patch
@@ -64,24 +64,82 @@ diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
        ;;
  stop)
        @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
+diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
+--- old/imap/imapd.dist.in     2004-01-25 05:40:04.000000000 +0000
++++ new/imap/imapd.dist.in     2004-03-16 17:45:49.000000000 +0000
+@@ -371,4 +371,4 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ #
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
+--- old/imap/pop3d.dist.in     2004-01-25 05:40:04.000000000 +0000
++++ new/imap/pop3d.dist.in     2004-03-16 17:45:56.000000000 +0000
+@@ -145,4 +145,4 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ #
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c
+--- old/pcp/pcpd.c     2004-05-02 14:59:42.000000000 +0000
++++ new/pcp/pcpd.c     2004-05-20 15:55:56.000000000 +0000
+@@ -2187,10 +2187,10 @@
+               exit(1);
+       }
+ 
+-      if (chdir(a->maildir && *a->maildir ? a->maildir:"Maildir") < 0)
++      if (chdir(a->maildir && *a->maildir ? a->maildir:"Mail/Maildir") < 0)
+       {
+               free(token);
+-              fprintf(stderr, "NOTICE: chdir(Maildir) failed: %s\n",
++              fprintf(stderr, "NOTICE: chdir(Mail/Maildir) failed: %s\n",
+                       strerror(errno));
+               maildir_cache_cancel();
+               exit(1);
 diff -Nur old/webmail/auth.c new/webmail/auth.c
---- old/webmail/auth.c 2003-10-11 00:54:37.000000000 +0000
-+++ new/webmail/auth.c 2004-02-20 12:26:31.000000000 +0000
-@@ -79,7 +79,7 @@
- static int login_maildir(const char *maildir)
- {
+--- old/webmail/auth.c 2004-05-09 03:33:22.000000000 +0000
++++ new/webmail/auth.c 2004-05-20 15:54:25.000000000 +0000
+@@ -82,7 +82,7 @@
+       if (!maildir || !*maildir)
+               maildir=getenv("MAILDIRPATH");
        if (!maildir || !*maildir)
 -              maildir="Maildir";
 +              maildir="Mail/Maildir";
        if (chdir(maildir))     return (-1);
        maildir_loginexec();
        return (0);
-@@ -107,7 +107,7 @@
- char  *buf;
+@@ -111,7 +111,7 @@
  struct stat stat_buf;
  
+       if (!p || !*p)  p=getenv("MAILDIRPATH");
 -      if (!p || !*p)  p="Maildir";
 +      if (!p || !*p)  p="Mail/Maildir";
  
        buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
  
+diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in
+--- old/webmail/sqwebmaild.dist.in     2004-05-09 03:33:22.000000000 +0000
++++ new/webmail/sqwebmaild.dist.in     2004-05-28 10:50:17.000000000 +0000
+@@ -32,7 +32,7 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ 
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+ 
+ ##NAME: AUTHMODULES:0
+ #
+diff -Nur old/webmail/sqwebmail.h new/webmail/sqwebmail.h
+--- old/webmail/sqwebmail.h    2004-02-29 20:50:13.000000000 +0000
++++ new/webmail/sqwebmail.h    2004-04-15 10:58:47.000000000 +0000
+@@ -25,7 +25,7 @@
+ 
+ /* Location of the user's Maildir */
+ 
+-#define USER_DIR      "Maildir"
++#define USER_DIR      "Mail/Maildir"
+ 
+ /* For PAM-based authentication */
+