]> git.pld-linux.org Git - packages/courier.git/blame - courier-maildir.patch
projects / packages / courier.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 2 (by relup.sh)
[packages/courier.git] / courier-maildir.patch
CommitLineData
d17b8ca4 1diff -urN courier-0.64.2.orig//courier/courierd.dist.in courier-0.64.2/courier/courierd.dist.in
2--- courier-0.64.2.orig//courier/courierd.dist.in 2009-11-08 19:14:47.000000000 +0100
3+++ courier-0.64.2/courier/courierd.dist.in 2010-05-08 23:27:21.826603250 +0200
4@@ -88,9 +88,9 @@
f7b9dede
AA		 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 #
d17b8ca4 16@@ -104,12 +104,12 @@
f7b9dede
AA		 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 #
d17b8ca4 31@@ -117,7 +117,7 @@
826fc940
AA		 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 #
d17b8ca4 40diff -urN courier-0.64.2.orig//imap/imapd.dist.in courier-0.64.2/imap/imapd.dist.in
41--- courier-0.64.2.orig//imap/imapd.dist.in 2008-06-21 18:01:23.000000000 +0200
42+++ courier-0.64.2/imap/imapd.dist.in 2010-05-08 23:27:21.829937594 +0200
43@@ -417,4 +417,4 @@
6766f444
AA		 44 #
45 # MAILDIRPATH - directory name of the maildir directory.
46 #
47-MAILDIRPATH=Maildir
48+MAILDIRPATH=Mail/Maildir
d17b8ca4 49diff -urN courier-0.64.2.orig//imap/imapd-ssl.dist.in courier-0.64.2/imap/imapd-ssl.dist.in
50--- courier-0.64.2.orig//imap/imapd-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200
51+++ courier-0.64.2/imap/imapd-ssl.dist.in 2010-05-08 23:27:21.829937594 +0200
52@@ -329,4 +329,4 @@
3cba79b9
AA		 53 #
54 # MAILDIRPATH - directory name of the maildir directory.
55 #
56-MAILDIRPATH=Maildir
57+MAILDIRPATH=Mail/Maildir
d17b8ca4 58diff -urN courier-0.64.2.orig//imap/pop3d.dist.in courier-0.64.2/imap/pop3d.dist.in
59--- courier-0.64.2.orig//imap/pop3d.dist.in 2005-07-05 14:42:51.000000000 +0200
60+++ courier-0.64.2/imap/pop3d.dist.in 2010-05-08 23:27:21.829937594 +0200
61@@ -143,4 +143,4 @@
6766f444
AA		 62 #
63 # MAILDIRPATH - directory name of the maildir directory.
64 #
65-MAILDIRPATH=Maildir
66+MAILDIRPATH=Mail/Maildir
d17b8ca4 67diff -urN courier-0.64.2.orig//imap/pop3d-ssl.dist.in courier-0.64.2/imap/pop3d-ssl.dist.in
68--- courier-0.64.2.orig//imap/pop3d-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200
69+++ courier-0.64.2/imap/pop3d-ssl.dist.in 2010-05-08 23:27:21.835978217 +0200
70@@ -315,4 +315,4 @@
3cba79b9
AA		 71 #
72 # MAILDIRPATH - directory name of the maildir directory.
73 #
74-MAILDIRPATH=Maildir
75+MAILDIRPATH=Mail/Maildir
d17b8ca4 76diff -urN courier-0.64.2.orig//pcp/pcpd.c courier-0.64.2/pcp/pcpd.c
77--- courier-0.64.2.orig//pcp/pcpd.c 2006-01-24 00:22:10.000000000 +0100
78+++ courier-0.64.2/pcp/pcpd.c 2010-05-08 23:27:21.835978217 +0200
ca41d6c7 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();
91 exit(1);
d17b8ca4 92diff -urN courier-0.64.2.orig//webmail/auth.c courier-0.64.2/webmail/auth.c
93--- courier-0.64.2.orig//webmail/auth.c 2009-06-27 18:32:50.000000000 +0200
94+++ courier-0.64.2/webmail/auth.c 2010-05-08 23:27:21.835978217 +0200
95@@ -79,7 +79,7 @@
ca41d6c7
AA		 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);
d17b8ca4 104diff -urN courier-0.64.2.orig//webmail/sqwebmaild.dist.in courier-0.64.2/webmail/sqwebmaild.dist.in
105--- courier-0.64.2.orig//webmail/sqwebmaild.dist.in 2007-02-10 04:16:35.000000000 +0100
106+++ courier-0.64.2/webmail/sqwebmaild.dist.in 2010-05-08 23:27:21.835978217 +0200
5f9921e4
AA		 107@@ -32,7 +32,7 @@
108 #
109 # MAILDIRPATH - directory name of the maildir directory.
110
111-MAILDIRPATH=Maildir
112+MAILDIRPATH=Mail/Maildir
113
d17b8ca4 114 ##NAME: SQWEBMAIL_PREFORK:0
5f9921e4 115 #
d17b8ca4 116diff -urN courier-0.64.2.orig//webmail/sqwebmail.h courier-0.64.2/webmail/sqwebmail.h
117--- courier-0.64.2.orig//webmail/sqwebmail.h 2007-02-24 20:02:59.000000000 +0100
118+++ courier-0.64.2/webmail/sqwebmail.h 2010-05-08 23:27:21.835978217 +0200
96546e6e
AA		 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
Courier mail server
This page took 0.385001 seconds and 4 git commands to generate.