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

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 @@
 #  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.
 #
@@ -71,12 +71,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.
 
-DEFAULTDELIVERY=./Maildir
+DEFAULTDELIVERY=./Mail/Maildir
 
 ##NAME: MAILDROPDEFAULT:0
 #
@@ -84,7 +84,7 @@
 #  the location of the default mailbox.  You should not change this setting
 #  unless you REALLY know what you're doing.
 
-MAILDROPDEFAULT=./Maildir
+MAILDROPDEFAULT=./Mail/Maildir
 
 ##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 @@
 #
 # 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 @@
 #
 # 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/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 @@
 #
 # 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	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);
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 */
Commit	Line	Data
826fc940 AA	1	diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in
826fc940 AA	2	--- old/courier/courierd.dist.in 2002-03-15 19:17:18.000000000 +0000
f7b9dede AA	3	+++ new/courier/courierd.dist.in 2004-08-02 16:55:29.000000000 +0000
	4	@@ -55,9 +55,9 @@
	5	# One of the following definitions of DEFAULTDELIVERY should be
	6	# uncommented.
	7	#
	8	-# Default deliveries to $HOME/Maildir
	9	+# Default deliveries to $HOME/Mail/Maildir
	10	#
	11	-# DEFAULTDELIVERY=./Maildir
	12	+# DEFAULTDELIVERY=./Mail/Maildir
	13	#
	14	# Alternatively, use procmail to deliver mail to local mailboxes.
	15	#
	16	@@ -71,12 +71,12 @@
	17	# use something like this:
	18	#
	19	# DEFAULTDELIVERY="\|\| dotforward
	20	-# ./Maildir"
	21	+# ./Mail/Maildir"
	22	#
826fc940 AA	23	# Yes, it's two lines long, with an embedded newline. Of course, you can use
	24	# any default local mail delivery instruction in place of ./Maildir.
	25
	26	-DEFAULTDELIVERY=./Maildir
	27	+DEFAULTDELIVERY=./Mail/Maildir
	28
	29	##NAME: MAILDROPDEFAULT:0
	30	#
	31	@@ -84,7 +84,7 @@
	32	# the location of the default mailbox. You should not change this setting
	33	# unless you REALLY know what you're doing.
	34
	35	-MAILDROPDEFAULT=./Maildir
	36	+MAILDROPDEFAULT=./Mail/Maildir
	37
	38	##NAME: ESMTP_CORK:0
	39	#
6766f444 AA	40	diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
	41	--- old/imap/imapd.dist.in 2004-01-25 05:40:04.000000000 +0000
	42	+++ new/imap/imapd.dist.in 2004-03-16 17:45:49.000000000 +0000
	43	@@ -371,4 +371,4 @@
	44	#
	45	# MAILDIRPATH - directory name of the maildir directory.
	46	#
	47	-MAILDIRPATH=Maildir
	48	+MAILDIRPATH=Mail/Maildir
3cba79b9 AA	49	diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in
	50	--- old/imap/imapd-ssl.dist.in 2004-06-26 15:09:58.000000000 +0000
	51	+++ new/imap/imapd-ssl.dist.in 2004-08-02 16:10:12.000000000 +0000
	52	@@ -194,4 +194,4 @@
	53	#
	54	# MAILDIRPATH - directory name of the maildir directory.
	55	#
	56	-MAILDIRPATH=Maildir
	57	+MAILDIRPATH=Mail/Maildir
6766f444 AA	58	diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
	59	--- old/imap/pop3d.dist.in 2004-01-25 05:40:04.000000000 +0000
	60	+++ new/imap/pop3d.dist.in 2004-03-16 17:45:56.000000000 +0000
	61	@@ -145,4 +145,4 @@
	62	#
	63	# MAILDIRPATH - directory name of the maildir directory.
	64	#
	65	-MAILDIRPATH=Maildir
	66	+MAILDIRPATH=Mail/Maildir
3cba79b9 AA	67	diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
	68	--- old/imap/pop3d-ssl.dist.in 2004-06-26 15:09:59.000000000 +0000
	69	+++ new/imap/pop3d-ssl.dist.in 2004-08-02 16:10:20.000000000 +0000
	70	@@ -182,4 +182,4 @@
	71	#
	72	# MAILDIRPATH - directory name of the maildir directory.
	73	#
	74	-MAILDIRPATH=Maildir
	75	+MAILDIRPATH=Mail/Maildir
96546e6e	76	diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c
ca41d6c7 AA	77	--- old/pcp/pcpd.c 2004-05-02 14:59:42.000000000 +0000
	78	+++ new/pcp/pcpd.c 2004-05-20 15:55:56.000000000 +0000
	79	@@ -2187,10 +2187,10 @@
96546e6e AA	80	exit(1);
	81	}
	82
	83	- if (chdir(a->maildir && *a->maildir ? a->maildir:"Maildir") < 0)
	84	+ if (chdir(a->maildir && *a->maildir ? a->maildir:"Mail/Maildir") < 0)
	85	{
	86	free(token);
ca41d6c7 AA	87	- fprintf(stderr, "NOTICE: chdir(Maildir) failed: %s\n",
	88	+ fprintf(stderr, "NOTICE: chdir(Mail/Maildir) failed: %s\n",
	89	strerror(errno));
96546e6e AA	90	maildir_cache_cancel();
96546e6e AA	91	exit(1);
f175d865	92	diff -Nur old/webmail/auth.c new/webmail/auth.c
ca41d6c7 AA	93	--- old/webmail/auth.c 2004-05-09 03:33:22.000000000 +0000
	94	+++ new/webmail/auth.c 2004-05-20 15:54:25.000000000 +0000
	95	@@ -82,7 +82,7 @@
	96	if (!maildir \|\| !*maildir)
	97	maildir=getenv("MAILDIRPATH");
f175d865 AA	98	if (!maildir \|\| !*maildir)
	99	- maildir="Maildir";
	100	+ maildir="Mail/Maildir";
	101	if (chdir(maildir)) return (-1);
	102	maildir_loginexec();
	103	return (0);
5f9921e4 AA	104	diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in
	105	--- old/webmail/sqwebmaild.dist.in 2004-05-09 03:33:22.000000000 +0000
	106	+++ new/webmail/sqwebmaild.dist.in 2004-05-28 10:50:17.000000000 +0000
	107	@@ -32,7 +32,7 @@
	108	#
	109	# MAILDIRPATH - directory name of the maildir directory.
	110
	111	-MAILDIRPATH=Maildir
	112	+MAILDIRPATH=Mail/Maildir
	113
	114	##NAME: AUTHMODULES:0
	115	#
96546e6e AA	116	diff -Nur old/webmail/sqwebmail.h new/webmail/sqwebmail.h
	117	--- old/webmail/sqwebmail.h 2004-02-29 20:50:13.000000000 +0000
	118	+++ new/webmail/sqwebmail.h 2004-04-15 10:58:47.000000000 +0000
	119	@@ -25,7 +25,7 @@
	120
	121	/* Location of the user's Maildir */
	122
	123	-#define USER_DIR "Maildir"
	124	+#define USER_DIR "Mail/Maildir"
	125
	126	/* For PAM-based authentication */
	127