-diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in
---- old/courier/courierd.dist.in 2002-03-15 19:17:18.000000000 +0000
-+++ new/courier/courierd.dist.in 2004-02-20 12:25:45.000000000 +0000
-@@ -76,7 +76,7 @@
+--- courier-0.78.2.orig/courier/courierd.dist.in 2009-11-08 19:14:47.000000000 +0100
++++ courier-0.78.2/courier/courierd.dist.in 2010-05-08 23:27:21.826603250 +0200
+@@ -88,9 +88,9 @@
+ # One of the following definitions of DEFAULTDELIVERY should be
+ # uncommented.
+ #
+-# Default deliveries to $HOME/Maildir
++# Default deliveries to $HOME/Mail/Maildir
+ #
+-# DEFAULTDELIVERY=./Maildir
++# DEFAULTDELIVERY=./Mail/Maildir
+ #
+ # Alternatively, use procmail to deliver mail to local mailboxes.
+ #
+@@ -104,12 +104,12 @@
+ # use something like this:
+ #
+ # DEFAULTDELIVERY="|| dotforward
+-# ./Maildir"
++# ./Mail/Maildir"
+ #
# Yes, it's two lines long, with an embedded newline. Of course, you can use
# any default local mail delivery instruction in place of ./Maildir.
##NAME: MAILDROPDEFAULT:0
#
-@@ -84,7 +84,7 @@
+@@ -117,7 +117,7 @@
# the location of the default mailbox. You should not change this setting
# unless you REALLY know what you're doing.
##NAME: ESMTP_CORK:0
#
-diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
---- old/courier/imapd.rc.in 2003-11-29 02:16:15.000000000 +0000
-+++ new/courier/imapd.rc.in 2004-02-20 12:25:45.000000000 +0000
-@@ -49,7 +49,7 @@
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- -pid=$PIDFILE $TCPDOPTS \
- $PORT @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
-- @bindir@/imapd Maildir"
-+ @bindir@/imapd Mail/Maildir"
- ;;
- stop)
- @sbindir@/couriertcpd -pid=$PIDFILE -stop
-diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
---- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000
-+++ new/courier/imapd-ssl.rc.in 2004-02-20 12:25:45.000000000 +0000
-@@ -50,7 +50,7 @@
- -pid=$SSLPIDFILE $TCPDOPTS \
- $SSLPORT $COURIERTLS -server -tcpd \
- @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
-- @bindir@/imapd Maildir"
-+ @bindir@/imapd Mail/Maildir"
- ;;
- stop)
- @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
-diff -Nur old/courier/pop3d.in new/courier/pop3d.in
---- old/courier/pop3d.in 2003-11-28 01:04:59.000000000 +0000
-+++ new/courier/pop3d.in 2004-02-20 12:25:45.000000000 +0000
-@@ -77,4 +77,4 @@
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- -pid=$PIDFILE $TCPDOPTS -address=$ADDRESS $PORT \
- @libexecdir@/courier/courierpop3login $AUTHMODULELIST \
-- @libexecdir@/courier/courierpop3d Maildir"
-+ @libexecdir@/courier/courierpop3d Mail/Maildir"
-diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
---- old/courier/pop3d-ssl.in 2003-11-29 01:37:34.000000000 +0000
-+++ new/courier/pop3d-ssl.in 2004-02-20 12:25:45.000000000 +0000
-@@ -54,7 +54,7 @@
- -pid=$SSLPIDFILE $TCPDOPTS \
- $SSLPORT $COURIERTLS -server -tcpd \
- $libexecdir/courier/courierpop3login $LIBAUTHMODULES \
-- $libexecdir/courier/courierpop3d Maildir"
-+ $libexecdir/courier/courierpop3d Mail/Maildir"
- ;;
- 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 @@
+--- courier-0.78.2.orig/libs/imap/imapd.dist.in 2008-06-21 18:01:23.000000000 +0200
++++ courier-0.78.2/libs/imap/imapd.dist.in 2010-05-08 23:27:21.829937594 +0200
+@@ -417,4 +417,4 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ #
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+--- courier-0.78.2.orig/libs/imap/imapd-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200
++++ courier-0.78.2/libs/imap/imapd-ssl.dist.in 2010-05-08 23:27:21.829937594 +0200
+@@ -329,4 +329,4 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ #
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+--- courier-0.78.2.orig/libs/imap/pop3d.dist.in 2005-07-05 14:42:51.000000000 +0200
++++ courier-0.78.2/libs/imap/pop3d.dist.in 2010-05-08 23:27:21.829937594 +0200
+@@ -143,4 +143,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 @@
+--- courier-0.78.2.orig/libs/imap/pop3d-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200
++++ courier-0.78.2/libs/imap/pop3d-ssl.dist.in 2010-05-08 23:27:21.835978217 +0200
+@@ -315,4 +315,4 @@
#
# MAILDIRPATH - directory name of the maildir directory.
#
-MAILDIRPATH=Maildir
+MAILDIRPATH=Mail/Maildir
-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
+--- courier-0.78.2.orig/libs/pcp/pcpd.c 2006-01-24 00:22:10.000000000 +0100
++++ courier-0.78.2/libs/pcp/pcpd.c 2010-05-08 23:27:21.835978217 +0200
+@@ -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);
+--- courier-0.78.2.orig/libs/sqwebmail/auth.c 2009-06-27 18:32:50.000000000 +0200
++++ courier-0.78.2/libs/sqwebmail/auth.c 2010-05-08 23:27:21.835978217 +0200
@@ -79,7 +79,7 @@
- static int login_maildir(const char *maildir)
- {
+ 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;
- struct stat stat_buf;
+--- courier-0.78.2.orig/libs/sqwebmail/sqwebmaild.dist.in 2007-02-10 04:16:35.000000000 +0100
++++ courier-0.78.2/libs/sqwebmail/sqwebmaild.dist.in 2010-05-08 23:27:21.835978217 +0200
+@@ -32,7 +32,7 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+
+ ##NAME: SQWEBMAIL_PREFORK:0
+ #
+--- courier-0.78.2.orig/libs/sqwebmail/sqwebmail.h 2007-02-24 20:02:59.000000000 +0100
++++ courier-0.78.2/libs/sqebmail/sqwebmail.h 2010-05-08 23:27:21.835978217 +0200
+@@ -25,7 +25,7 @@
+
+ /* Location of the user's Maildir */
-- if (!p || !*p) p="Maildir";
-+ if (!p || !*p) p="Mail/Maildir";
+-#define USER_DIR "Maildir"
++#define USER_DIR "Mail/Maildir"
- buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
+ /* For PAM-based authentication */
projects / packages / courier.git / blobdiff