[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-02-20 12:25:45.000000000 +0000
@@ -76,7 +76,7 @@
 #  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/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/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)
 {
 	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;
 
-	if (!p || !*p)	p="Maildir";
+	if (!p || !*p)	p="Mail/Maildir";
 
 	buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
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
f175d865	3	+++ new/courier/courierd.dist.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	4	@@ -76,7 +76,7 @@
	5	# Yes, it's two lines long, with an embedded newline. Of course, you can use
	6	# any default local mail delivery instruction in place of ./Maildir.
	7
	8	-DEFAULTDELIVERY=./Maildir
	9	+DEFAULTDELIVERY=./Mail/Maildir
	10
	11	##NAME: MAILDROPDEFAULT:0
	12	#
	13	@@ -84,7 +84,7 @@
	14	# the location of the default mailbox. You should not change this setting
	15	# unless you REALLY know what you're doing.
	16
	17	-MAILDROPDEFAULT=./Maildir
	18	+MAILDROPDEFAULT=./Mail/Maildir
	19
	20	##NAME: ESMTP_CORK:0
	21	#
	22	diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
	23	--- old/courier/imapd.rc.in 2003-11-29 02:16:15.000000000 +0000
f175d865	24	+++ new/courier/imapd.rc.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	25	@@ -49,7 +49,7 @@
	26	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
	27	-pid=$PIDFILE $TCPDOPTS \
	28	$PORT @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
	29	- @bindir@/imapd Maildir"
	30	+ @bindir@/imapd Mail/Maildir"
	31	;;
	32	stop)
	33	@sbindir@/couriertcpd -pid=$PIDFILE -stop
	34	diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
	35	--- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000
f175d865	36	+++ new/courier/imapd-ssl.rc.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	37	@@ -50,7 +50,7 @@
	38	-pid=$SSLPIDFILE $TCPDOPTS \
	39	$SSLPORT $COURIERTLS -server -tcpd \
	40	@libexecdir@/courier/imaplogin $LIBAUTHMODULES \
	41	- @bindir@/imapd Maildir"
	42	+ @bindir@/imapd Mail/Maildir"
	43	;;
	44	stop)
	45	@sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
	46	diff -Nur old/courier/pop3d.in new/courier/pop3d.in
	47	--- old/courier/pop3d.in 2003-11-28 01:04:59.000000000 +0000
f175d865	48	+++ new/courier/pop3d.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	49	@@ -77,4 +77,4 @@
	50	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
	51	-pid=$PIDFILE $TCPDOPTS -address=$ADDRESS $PORT \
	52	@libexecdir@/courier/courierpop3login $AUTHMODULELIST \
	53	- @libexecdir@/courier/courierpop3d Maildir"
	54	+ @libexecdir@/courier/courierpop3d Mail/Maildir"
	55	diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
	56	--- old/courier/pop3d-ssl.in 2003-11-29 01:37:34.000000000 +0000
f175d865	57	+++ new/courier/pop3d-ssl.in 2004-02-20 12:25:45.000000000 +0000
826fc940 AA	58	@@ -54,7 +54,7 @@
	59	-pid=$SSLPIDFILE $TCPDOPTS \
	60	$SSLPORT $COURIERTLS -server -tcpd \
	61	$libexecdir/courier/courierpop3login $LIBAUTHMODULES \
	62	- $libexecdir/courier/courierpop3d Maildir"
	63	+ $libexecdir/courier/courierpop3d Mail/Maildir"
	64	;;
	65	stop)
	66	@sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
6766f444 AA	67	diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
	68	--- old/imap/imapd.dist.in 2004-01-25 05:40:04.000000000 +0000
	69	+++ new/imap/imapd.dist.in 2004-03-16 17:45:49.000000000 +0000
	70	@@ -371,4 +371,4 @@
	71	#
	72	# MAILDIRPATH - directory name of the maildir directory.
	73	#
	74	-MAILDIRPATH=Maildir
	75	+MAILDIRPATH=Mail/Maildir
	76	diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
	77	--- old/imap/pop3d.dist.in 2004-01-25 05:40:04.000000000 +0000
	78	+++ new/imap/pop3d.dist.in 2004-03-16 17:45:56.000000000 +0000
	79	@@ -145,4 +145,4 @@
	80	#
	81	# MAILDIRPATH - directory name of the maildir directory.
	82	#
	83	-MAILDIRPATH=Maildir
	84	+MAILDIRPATH=Mail/Maildir
f175d865 AA	85	diff -Nur old/webmail/auth.c new/webmail/auth.c
	86	--- old/webmail/auth.c 2003-10-11 00:54:37.000000000 +0000
	87	+++ new/webmail/auth.c 2004-02-20 12:26:31.000000000 +0000
	88	@@ -79,7 +79,7 @@
	89	static int login_maildir(const char *maildir)
	90	{
	91	if (!maildir \|\| !*maildir)
	92	- maildir="Maildir";
	93	+ maildir="Mail/Maildir";
	94	if (chdir(maildir)) return (-1);
	95	maildir_loginexec();
	96	return (0);
	97	@@ -107,7 +107,7 @@
	98	char *buf;
	99	struct stat stat_buf;
	100
	101	- if (!p \|\| !*p) p="Maildir";
	102	+ if (!p \|\| !*p) p="Mail/Maildir";
	103
	104	buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
	105