-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-08-02 16:55:29.000000000 +0000
-@@ -55,9 +55,9 @@
+diff -urN courier-0.64.2.orig//courier/courierd.dist.in courier-0.64.2/courier/courierd.dist.in
+--- courier-0.64.2.orig//courier/courierd.dist.in 2009-11-08 19:14:47.000000000 +0100
++++ courier-0.64.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.
#
#
# Alternatively, use procmail to deliver mail to local mailboxes.
#
-@@ -71,12 +71,12 @@
+@@ -104,12 +104,12 @@
# use something like this:
#
# DEFAULTDELIVERY="|| dotforward
##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/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 @@
+diff -urN courier-0.64.2.orig//imap/imapd.dist.in courier-0.64.2/imap/imapd.dist.in
+--- courier-0.64.2.orig//imap/imapd.dist.in 2008-06-21 18:01:23.000000000 +0200
++++ courier-0.64.2/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
-diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in
---- old/imap/imapd-ssl.dist.in 2004-06-26 15:09:58.000000000 +0000
-+++ new/imap/imapd-ssl.dist.in 2004-08-02 16:10:12.000000000 +0000
-@@ -194,4 +194,4 @@
+diff -urN courier-0.64.2.orig//imap/imapd-ssl.dist.in courier-0.64.2/imap/imapd-ssl.dist.in
+--- courier-0.64.2.orig//imap/imapd-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200
++++ courier-0.64.2/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
-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 @@
+diff -urN courier-0.64.2.orig//imap/pop3d.dist.in courier-0.64.2/imap/pop3d.dist.in
+--- courier-0.64.2.orig//imap/pop3d.dist.in 2005-07-05 14:42:51.000000000 +0200
++++ courier-0.64.2/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-ssl.dist.in new/imap/pop3d-ssl.dist.in
---- old/imap/pop3d-ssl.dist.in 2004-06-26 15:09:59.000000000 +0000
-+++ new/imap/pop3d-ssl.dist.in 2004-08-02 16:10:20.000000000 +0000
-@@ -182,4 +182,4 @@
+diff -urN courier-0.64.2.orig//imap/pop3d-ssl.dist.in courier-0.64.2/imap/pop3d-ssl.dist.in
+--- courier-0.64.2.orig//imap/pop3d-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200
++++ courier-0.64.2/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/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
+diff -urN courier-0.64.2.orig//pcp/pcpd.c courier-0.64.2/pcp/pcpd.c
+--- courier-0.64.2.orig//pcp/pcpd.c 2006-01-24 00:22:10.000000000 +0100
++++ courier-0.64.2/pcp/pcpd.c 2010-05-08 23:27:21.835978217 +0200
@@ -2187,10 +2187,10 @@
exit(1);
}
strerror(errno));
maildir_cache_cancel();
exit(1);
-diff -Nur old/webmail/auth.c new/webmail/auth.c
---- 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 @@
+diff -urN courier-0.64.2.orig//webmail/auth.c courier-0.64.2/webmail/auth.c
+--- courier-0.64.2.orig//webmail/auth.c 2009-06-27 18:32:50.000000000 +0200
++++ courier-0.64.2/webmail/auth.c 2010-05-08 23:27:21.835978217 +0200
+@@ -79,7 +79,7 @@
if (!maildir || !*maildir)
maildir=getenv("MAILDIRPATH");
if (!maildir || !*maildir)
if (chdir(maildir)) return (-1);
maildir_loginexec();
return (0);
-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
+diff -urN courier-0.64.2.orig//webmail/sqwebmaild.dist.in courier-0.64.2/webmail/sqwebmaild.dist.in
+--- courier-0.64.2.orig//webmail/sqwebmaild.dist.in 2007-02-10 04:16:35.000000000 +0100
++++ courier-0.64.2/webmail/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: AUTHMODULES:0
+ ##NAME: SQWEBMAIL_PREFORK: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
+diff -urN courier-0.64.2.orig//webmail/sqwebmail.h courier-0.64.2/webmail/sqwebmail.h
+--- courier-0.64.2.orig//webmail/sqwebmail.h 2007-02-24 20:02:59.000000000 +0100
++++ courier-0.64.2/webmail/sqwebmail.h 2010-05-08 23:27:21.835978217 +0200
@@ -25,7 +25,7 @@
/* Location of the user's Maildir */