]>
Commit | Line | Data |
---|---|---|
a16d6ff9 JR |
1 | diff -urNp -x '*.orig' courier-1.0.9.org/courier/configure.ac courier-1.0.9/courier/configure.ac |
2 | --- courier-1.0.9.org/courier/configure.ac 2019-06-08 15:03:56.000000000 +0200 | |
3 | +++ courier-1.0.9/courier/configure.ac 2021-05-07 22:54:47.564469723 +0200 | |
4 | @@ -472,6 +472,12 @@ eval "exec_prefix=$exec_prefix" | |
5d26edcf | 5 | eval "datarootdir=$datarootdir" |
c2c7a750 | 6 | eval "bindir=$bindir" |
5d26edcf | 7 | eval "localstatedir=$localstatedir" |
69e1f9b1 AA |
8 | +eval "datadir=$datadir" |
9 | + | |
c2c7a750 | 10 | +AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ], |
69e1f9b1 | 11 | +certsdir="$withval", certsdir=$datadir) |
c2c7a750 AA |
12 | + |
13 | +AC_SUBST(certsdir) | |
69e1f9b1 | 14 | |
c2c7a750 AA |
15 | MAILDROP="$bindir/maildrop" |
16 | AC_SUBST(MAILDROP) | |
a16d6ff9 JR |
17 | diff -urNp -x '*.orig' courier-1.0.9.org/courier/imapd-ssl.rc.in courier-1.0.9/courier/imapd-ssl.rc.in |
18 | --- courier-1.0.9.org/courier/imapd-ssl.rc.in 2021-05-07 22:54:46.201129431 +0200 | |
19 | +++ courier-1.0.9/courier/imapd-ssl.rc.in 2021-05-07 22:54:47.564469723 +0200 | |
20 | @@ -27,6 +27,12 @@ fi | |
c2c7a750 AA |
21 | |
22 | case $1 in | |
23 | start) | |
6d61614b JB |
24 | + # If we do not have a certificate, make one up. |
25 | + if test ! -f @certsdir@/imapd.pem | |
26 | + then | |
27 | + @sbindir@/mkimapdcert | |
28 | + fi | |
c2c7a750 | 29 | + |
6d61614b JB |
30 | if test "$TLS_CACHEFILE" != "" |
31 | then | |
32 | rm -f "$TLS_CACHEFILE" | |
a16d6ff9 JR |
33 | diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.in courier-1.0.9/courier/module.esmtp/esmtpd-ssl.in |
34 | --- courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.in 2021-05-07 22:54:46.201129431 +0200 | |
35 | +++ courier-1.0.9/courier/module.esmtp/esmtpd-ssl.in 2021-05-07 22:54:47.567803074 +0200 | |
36 | @@ -24,6 +24,10 @@ export SHELL | |
c2c7a750 AA |
37 | |
38 | case $1 in | |
39 | start) | |
40 | + # If we do not have a certificate, make one up. | |
41 | + if [ ! -f @certsdir@/esmtpd.pem ]; then | |
42 | + @sbindir@/mkesmtpdcert | |
43 | + fi | |
44 | ;; | |
45 | stop) | |
46 | ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop | |
a16d6ff9 JR |
47 | diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/mkesmtpdcert.in courier-1.0.9/courier/module.esmtp/mkesmtpdcert.in |
48 | --- courier-1.0.9.org/courier/module.esmtp/mkesmtpdcert.in 2017-01-28 04:06:06.000000000 +0100 | |
49 | +++ courier-1.0.9/courier/module.esmtp/mkesmtpdcert.in 2021-05-07 22:54:47.567803074 +0200 | |
a16d6ff9 | 50 | @@ -35,7 +35,7 @@ cleanup() { |
69e1f9b1 AA |
51 | exit 1 |
52 | } | |
53 | ||
5d26edcf | 54 | -cd @mydatadir@ |
55 | +cd @certsdir@ | |
9754ea44 JB |
56 | umask 077 |
57 | BITS="$BITS" | |
58 | set -e | |
a16d6ff9 JR |
59 | diff -urNp -x '*.orig' courier-1.0.9.org/courier/pop3d-ssl.in courier-1.0.9/courier/pop3d-ssl.in |
60 | --- courier-1.0.9.org/courier/pop3d-ssl.in 2021-05-07 22:54:46.201129431 +0200 | |
61 | +++ courier-1.0.9/courier/pop3d-ssl.in 2021-05-07 22:54:47.567803074 +0200 | |
62 | @@ -28,6 +28,12 @@ fi | |
c2c7a750 AA |
63 | |
64 | case $1 in | |
65 | start) | |
6d61614b JB |
66 | + # If we do not have a certificate, make one up. |
67 | + if test ! -f @certsdir@/pop3d.pem | |
68 | + then | |
69 | + @sbindir@/mkpop3dcert | |
70 | + fi | |
c2c7a750 | 71 | + |
6d61614b JB |
72 | if test "$TLS_CACHEFILE" != "" |
73 | then | |
74 | rm -f "$TLS_CACHEFILE" | |
f3928986 JB |
75 | --- courier-1.2.2.org/courier.sysvinit.in 2021-05-07 22:54:46.201129431 +0200 |
76 | +++ courier-1.2.2/courier.sysvinit.in 2021-05-07 22:54:47.567803074 +0200 | |
a16d6ff9 | 77 | @@ -18,7 +18,7 @@ sysconfdir="@sysconfdir@" |
c2c7a750 AA |
78 | sbindir="@sbindir@" |
79 | bindir="@bindir@" | |
80 | libexecdir="@libexecdir@" | |
81 | -datadir="@datadir@" | |
82 | +certsdir="@certsdir@" | |
f3928986 JB |
83 | localstatedir="@localstatedir@" |
84 | webadmin="${libexecdir}/courier/webmail/webadmin" | |
c2c7a750 | 85 | |
f3928986 | 86 | @@ -102,7 +102,7 @@ start) |
c2c7a750 AA |
87 | then |
88 | # If we do not have a certificate, make one up. | |
89 | ||
90 | - if test ! -f ${datadir}/esmtpd.pem | |
91 | + if test ! -f ${certsdir}/esmtpd.pem | |
92 | then | |
93 | if test -x $COURIERTLS | |
94 | then | |
f3928986 | 95 | @@ -169,7 +169,7 @@ start) |
c2c7a750 AA |
96 | then |
97 | # If we do not have a certificate, make one up. | |
98 | ||
99 | - if test ! -f ${datadir}/pop3d.pem | |
100 | + if test ! -f ${certsdir}/pop3d.pem | |
101 | then | |
102 | echo -n " generating-POP3-SSL-certificate..." | |
103 | ||
f3928986 | 104 | @@ -199,7 +199,7 @@ start) |
c2c7a750 AA |
105 | then |
106 | # If we do not have a certificate, make one up. | |
107 | ||
108 | - if test ! -f ${datadir}/imapd.pem | |
109 | + if test ! -f ${certsdir}/imapd.pem | |
110 | then | |
111 | echo -n " generating-IMAP-SSL-certificate..." | |
112 |