Package: courier / 1.0.6-1

0022-mkesmtpdcert-should-use-certsdir.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
From: "Stefan Hornburg (Racke)" <racke@linuxia.de>
Date: Thu, 31 Dec 2015 12:04:09 +0100
Subject: mkesmtpdcert should use certsdir

---
 courier/module.esmtp/esmtpd-ssl.dist.in    | 4 ++--
 courier/module.esmtp/esmtpd.cnf.openssl.in | 2 +-
 courier/module.esmtp/esmtpd.dist.in        | 2 +-
 courier/module.esmtp/mkesmtpdcert.in       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

--- a/courier/module.esmtp/esmtpd-ssl.dist.in
+++ b/courier/module.esmtp/esmtpd-ssl.dist.in
@@ -236,7 +236,7 @@
 # In all cases, $TLS_CERTFILE needs to be linked to one of the existing
 # certificate files.
 
-TLS_CERTFILE=@mydatadir@/esmtpd.pem
+TLS_CERTFILE=@certsdir@/esmtpd.pem
 
 ##NAME: TLS_PRIVATE_KEYFILE:0
 #
@@ -281,7 +281,7 @@
 #
 # TLS_DHPARAMS - DH parameter file.
 #
-TLS_DHPARAMS=@mydatadir@/dhparams.pem
+TLS_DHPARAMS=@certsdir@/dhparams.pem
 
 ##NAME: TLS_TRUSTCERTS:0
 #
--- a/courier/module.esmtp/esmtpd.cnf.openssl.in
+++ b/courier/module.esmtp/esmtpd.cnf.openssl.in
@@ -1,5 +1,5 @@
 
-RANDFILE = @mydatadir@/esmtpd.rand
+RANDFILE = @certsdir@/esmtpd.rand
 
 [ req ]
 default_bits = 4096
--- a/courier/module.esmtp/esmtpd.dist.in
+++ b/courier/module.esmtp/esmtpd.dist.in
@@ -217,7 +217,7 @@
 #
 # TLS_DHPARAMS - DH parameter file.
 #
-TLS_DHPARAMS=@mydatadir@/dhparams.pem
+TLS_DHPARAMS=@certsdir@/dhparams.pem
 
 ##NAME: TLS_TRUSTCERTS:0
 #
--- a/courier/module.esmtp/mkesmtpdcert.in
+++ b/courier/module.esmtp/mkesmtpdcert.in
@@ -37,7 +37,7 @@
 	exit 1
 }
 
-cd @mydatadir@
+cd @certsdir@
 umask 077
 BITS="$BITS"
 set -e