]>
Commit | Line | Data |
---|---|---|
4694d3f7 | 1 | diff -urN courier-imap-4.3.0.orig/configure.in courier-imap-4.3.0/configure.in |
2 | --- courier-imap-4.3.0.orig/configure.in 2007-11-24 04:20:18.000000000 +0100 | |
3 | +++ courier-imap-4.3.0/configure.in 2008-01-19 19:53:07.090124292 +0100 | |
4 | @@ -222,6 +222,11 @@ | |
5 | ||
6 | # Neither does it use the change password feature | |
383f8032 AA |
7 | |
8 | +AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ], | |
9 | +certsdir="$withval", certsdir=$datadir) | |
10 | + | |
11 | +AC_SUBST(certsdir) | |
12 | + | |
13 | AC_ARG_WITH(authchangepwdir, [], , | |
4694d3f7 | 14 | ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null") |
383f8032 | 15 | |
4694d3f7 | 16 | diff -urN courier-imap-4.3.0.orig/imap/configure.in courier-imap-4.3.0/imap/configure.in |
17 | --- courier-imap-4.3.0.orig/imap/configure.in 2007-11-24 04:20:18.000000000 +0100 | |
18 | +++ courier-imap-4.3.0/imap/configure.in 2008-01-19 19:53:07.090124292 +0100 | |
19 | @@ -52,6 +52,11 @@ | |
383f8032 AA |
20 | eval "exec_prefix=$exec_prefix" |
21 | eval "bindir=$bindir" | |
22 | ||
23 | +AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ], | |
24 | +certsdir="$withval", certsdir=$datadir) | |
25 | + | |
26 | +AC_SUBST(certsdir) | |
27 | + | |
28 | AC_ARG_WITH(mailer, | |
29 | [ --with-mailer=prog Your mail submission program], | |
30 | SENDMAIL="$withval", | |
4694d3f7 | 31 | diff -urN courier-imap-4.3.0.orig/imap/imapd.cnf.openssl.in courier-imap-4.3.0/imap/imapd.cnf.openssl.in |
32 | --- courier-imap-4.3.0.orig/imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 | |
33 | +++ courier-imap-4.3.0/imap/imapd.cnf.openssl.in 2008-01-19 19:53:07.090124292 +0100 | |
383f8032 AA |
34 | @@ -1,5 +1,5 @@ |
35 | ||
4694d3f7 | 36 | -RANDFILE = @mydatadir@/imapd.rand |
383f8032 AA |
37 | +RANDFILE = @certsdir@/imapd.rand |
38 | ||
39 | [ req ] | |
40 | default_bits = 1024 | |
4694d3f7 | 41 | diff -urN courier-imap-4.3.0.orig/imap/imapd-ssl.dist.in courier-imap-4.3.0/imap/imapd-ssl.dist.in |
42 | --- courier-imap-4.3.0.orig/imap/imapd-ssl.dist.in 2007-11-22 15:23:05.000000000 +0100 | |
43 | +++ courier-imap-4.3.0/imap/imapd-ssl.dist.in 2008-01-19 19:53:22.977590279 +0100 | |
44 | @@ -254,7 +254,7 @@ | |
383f8032 | 45 | # |
4694d3f7 | 46 | # This is an experimental feature. |
47 | ||
48 | -TLS_CERTFILE=@mydatadir@/imapd.pem | |
383f8032 AA |
49 | +TLS_CERTFILE=@certsdir@/imapd.pem |
50 | ||
51 | ##NAME: TLS_TRUSTCERTS:0 | |
52 | # | |
4694d3f7 | 53 | diff -urN courier-imap-4.3.0.orig/imap/mkimapdcert.8.in courier-imap-4.3.0/imap/mkimapdcert.8.in |
54 | --- courier-imap-4.3.0.orig/imap/mkimapdcert.8.in 2007-04-22 17:33:32.000000000 +0200 | |
55 | +++ courier-imap-4.3.0/imap/mkimapdcert.8.in 2008-01-19 19:53:58.669385973 +0100 | |
56 | @@ -21,18 +21,18 @@ | |
57 | .SH "DESCRIPTION" | |
383f8032 | 58 | .PP |
956473f5 | 59 | IMAP over SSL requires a valid, signed, X\.509 certificate\. The default location for the certificate file is |
60 | -\fI@datadir@/imapd\.pem\fR\. | |
61 | +\fI@certsdir@/imapd\.pem\fR\. | |
383f8032 | 62 | \fBmkimapdcert\fR |
956473f5 | 63 | generates a self\-signed X\.509 certificate, mainly for testing\. For production use the X\.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\. |
383f8032 | 64 | .PP |
956473f5 | 65 | |
66 | -\fI@datadir@/imapd\.pem\fR | |
67 | +\fI@certsdir@/imapd\.pem\fR | |
68 | must be owned by the @mailuser@ user and have no group or world permissions\. The | |
4694d3f7 | 69 | \fBmkimapdcert\fR |
956473f5 | 70 | command will enforce this\. To prevent an unfortunate accident, |
4694d3f7 | 71 | \fBmkimapdcert\fR |
72 | will not work if | |
956473f5 | 73 | -\fB@datadir@/imapd\.pem\fR |
74 | +\fB@certsdir@/imapd\.pem\fR | |
75 | already exists\. | |
383f8032 | 76 | .PP |
956473f5 | 77 | |
4694d3f7 | 78 | @@ -42,7 +42,7 @@ |
956473f5 | 79 | to be installed\. |
4694d3f7 | 80 | .SH "FILES" |
81 | .PP | |
956473f5 | 82 | -@datadir@/imapd\.pem |
83 | +@certsdir@/imapd\.pem | |
4694d3f7 | 84 | .RS 4 |
956473f5 | 85 | X\.509 certificate\. |
4694d3f7 | 86 | .RE |
87 | diff -urN courier-imap-4.3.0.orig/imap/mkimapdcert.html.in courier-imap-4.3.0/imap/mkimapdcert.html.in | |
88 | --- courier-imap-4.3.0.orig/imap/mkimapdcert.html.in 2007-04-22 17:33:32.000000000 +0200 | |
89 | +++ courier-imap-4.3.0/imap/mkimapdcert.html.in 2008-01-19 19:54:30.834337552 +0100 | |
90 | @@ -7,22 +7,22 @@ | |
956473f5 | 91 | Content-type: text/html ]>