[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/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 @@
 #
 # 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);
@@ -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 */
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	#
	40	diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
	41	--- old/courier/imapd.rc.in 2003-11-29 02:16:15.000000000 +0000
f175d865	42	+++ new/courier/imapd.rc.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	43	@@ -49,7 +49,7 @@
	44	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
	45	-pid=$PIDFILE $TCPDOPTS \
	46	$PORT @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
	47	- @bindir@/imapd Maildir"
	48	+ @bindir@/imapd Mail/Maildir"
	49	;;
	50	stop)
	51	@sbindir@/couriertcpd -pid=$PIDFILE -stop
	52	diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
	53	--- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000
f175d865	54	+++ new/courier/imapd-ssl.rc.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	55	@@ -50,7 +50,7 @@
	56	-pid=$SSLPIDFILE $TCPDOPTS \
	57	$SSLPORT $COURIERTLS -server -tcpd \
	58	@libexecdir@/courier/imaplogin $LIBAUTHMODULES \
	59	- @bindir@/imapd Maildir"
	60	+ @bindir@/imapd Mail/Maildir"
	61	;;
	62	stop)
	63	@sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
	64	diff -Nur old/courier/pop3d.in new/courier/pop3d.in
	65	--- old/courier/pop3d.in 2003-11-28 01:04:59.000000000 +0000
f175d865	66	+++ new/courier/pop3d.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	67	@@ -77,4 +77,4 @@
	68	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
	69	-pid=$PIDFILE $TCPDOPTS -address=$ADDRESS $PORT \
	70	@libexecdir@/courier/courierpop3login $AUTHMODULELIST \
	71	- @libexecdir@/courier/courierpop3d Maildir"
	72	+ @libexecdir@/courier/courierpop3d Mail/Maildir"
	73	diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
	74	--- old/courier/pop3d-ssl.in 2003-11-29 01:37:34.000000000 +0000
f175d865	75	+++ new/courier/pop3d-ssl.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	76	@@ -54,7 +54,7 @@
	77	-pid=$SSLPIDFILE $TCPDOPTS \
	78	$SSLPORT $COURIERTLS -server -tcpd \
	79	$libexecdir/courier/courierpop3login $LIBAUTHMODULES \
	80	- $libexecdir/courier/courierpop3d Maildir"
	81	+ $libexecdir/courier/courierpop3d Mail/Maildir"
	82	;;
	83	stop)
	84	@sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
6766f444 AA	85	diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
	86	--- old/imap/imapd.dist.in 2004-01-25 05:40:04.000000000 +0000
	87	+++ new/imap/imapd.dist.in 2004-03-16 17:45:49.000000000 +0000
	88	@@ -371,4 +371,4 @@
	89	#
	90	# MAILDIRPATH - directory name of the maildir directory.
	91	#
	92	-MAILDIRPATH=Maildir
	93	+MAILDIRPATH=Mail/Maildir
3cba79b9 AA	94	diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in
	95	--- old/imap/imapd-ssl.dist.in 2004-06-26 15:09:58.000000000 +0000
	96	+++ new/imap/imapd-ssl.dist.in 2004-08-02 16:10:12.000000000 +0000
	97	@@ -194,4 +194,4 @@
	98	#
	99	# MAILDIRPATH - directory name of the maildir directory.
	100	#
	101	-MAILDIRPATH=Maildir
	102	+MAILDIRPATH=Mail/Maildir
6766f444 AA	103	diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
	104	--- old/imap/pop3d.dist.in 2004-01-25 05:40:04.000000000 +0000
	105	+++ new/imap/pop3d.dist.in 2004-03-16 17:45:56.000000000 +0000
	106	@@ -145,4 +145,4 @@
	107	#
	108	# MAILDIRPATH - directory name of the maildir directory.
	109	#
	110	-MAILDIRPATH=Maildir
	111	+MAILDIRPATH=Mail/Maildir
3cba79b9 AA	112	diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
	113	--- old/imap/pop3d-ssl.dist.in 2004-06-26 15:09:59.000000000 +0000
	114	+++ new/imap/pop3d-ssl.dist.in 2004-08-02 16:10:20.000000000 +0000
	115	@@ -182,4 +182,4 @@
	116	#
	117	# MAILDIRPATH - directory name of the maildir directory.
	118	#
	119	-MAILDIRPATH=Maildir
	120	+MAILDIRPATH=Mail/Maildir
96546e6e	121	diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c
ca41d6c7 AA	122	--- old/pcp/pcpd.c 2004-05-02 14:59:42.000000000 +0000
	123	+++ new/pcp/pcpd.c 2004-05-20 15:55:56.000000000 +0000
	124	@@ -2187,10 +2187,10 @@
96546e6e AA	125	exit(1);
	126	}
	127
	128	- if (chdir(a->maildir && *a->maildir ? a->maildir:"Maildir") < 0)
	129	+ if (chdir(a->maildir && *a->maildir ? a->maildir:"Mail/Maildir") < 0)
	130	{
	131	free(token);
ca41d6c7 AA	132	- fprintf(stderr, "NOTICE: chdir(Maildir) failed: %s\n",
	133	+ fprintf(stderr, "NOTICE: chdir(Mail/Maildir) failed: %s\n",
	134	strerror(errno));
96546e6e AA	135	maildir_cache_cancel();
96546e6e AA	136	exit(1);
f175d865	137	diff -Nur old/webmail/auth.c new/webmail/auth.c
ca41d6c7 AA	138	--- old/webmail/auth.c 2004-05-09 03:33:22.000000000 +0000
	139	+++ new/webmail/auth.c 2004-05-20 15:54:25.000000000 +0000
	140	@@ -82,7 +82,7 @@
	141	if (!maildir \|\| !*maildir)
	142	maildir=getenv("MAILDIRPATH");
f175d865 AA	143	if (!maildir \|\| !*maildir)
	144	- maildir="Maildir";
	145	+ maildir="Mail/Maildir";
	146	if (chdir(maildir)) return (-1);
	147	maildir_loginexec();
	148	return (0);
ca41d6c7	149	@@ -111,7 +111,7 @@
f175d865 AA	150	struct stat stat_buf;
f175d865 AA	151
ca41d6c7	152	if (!p \|\| !*p) p=getenv("MAILDIRPATH");
f175d865 AA	153	- if (!p \|\| !*p) p="Maildir";
	154	+ if (!p \|\| !*p) p="Mail/Maildir";
	155
	156	buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
	157
5f9921e4 AA	158	diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in
	159	--- old/webmail/sqwebmaild.dist.in 2004-05-09 03:33:22.000000000 +0000
	160	+++ new/webmail/sqwebmaild.dist.in 2004-05-28 10:50:17.000000000 +0000
	161	@@ -32,7 +32,7 @@
	162	#
	163	# MAILDIRPATH - directory name of the maildir directory.
	164
	165	-MAILDIRPATH=Maildir
	166	+MAILDIRPATH=Mail/Maildir
	167
	168	##NAME: AUTHMODULES:0
	169	#
96546e6e AA	170	diff -Nur old/webmail/sqwebmail.h new/webmail/sqwebmail.h
	171	--- old/webmail/sqwebmail.h 2004-02-29 20:50:13.000000000 +0000
	172	+++ new/webmail/sqwebmail.h 2004-04-15 10:58:47.000000000 +0000
	173	@@ -25,7 +25,7 @@
	174
	175	/* Location of the user's Maildir */
	176
	177	-#define USER_DIR "Maildir"
	178	+#define USER_DIR "Mail/Maildir"
	179
	180	/* For PAM-based authentication */
	181