[packages/courier.git] / courier-certs.patch

--- courier-0.78.2.orig/courier/configure.ac	2010-01-09 22:13:40.000000000 +0100
+++ courier-0.78.2/courier/configure.ac	2010-05-08 23:31:10.355976183 +0200
@@ -480,6 +480,12 @@
 eval "datarootdir=$datarootdir"
 eval "bindir=$bindir"
 eval "localstatedir=$localstatedir"
+eval "datadir=$datadir"
+
+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
+certsdir="$withval", certsdir=$datadir)
+
+AC_SUBST(certsdir)
 
 MAILDROP="$bindir/maildrop"
 AC_SUBST(MAILDROP)
--- courier-1.0.3/courier/imapd-ssl.rc.in.orig	2018-11-24 08:32:30.698359598 +0100
+++ courier-1.0.3/courier/imapd-ssl.rc.in	2018-11-24 08:46:40.145016565 +0100
@@ -27,6 +27,12 @@
 
 case $1 in
 start)
+	# If we do not have a certificate, make one up.
+	if test ! -f @certsdir@/imapd.pem
+	then
+		@sbindir@/mkimapdcert
+	fi
+
 	if test "$TLS_CACHEFILE" != ""
 	then
 		rm -f "$TLS_CACHEFILE"
--- courier-0.78.2.orig/courier/module.esmtp/configure.ac	2008-07-12 22:17:24.000000000 +0200
+++ courier-0.78.2/courier/module.esmtp/configure.ac	2010-05-08 23:31:10.355976183 +0200
@@ -287,6 +287,11 @@
 AC_SUBST(mydatadir)   # Quell automake warning
 
 
+AC_ARG_WITH(certsdir, [  --with-certsdir Directory where certs are created ],
+certsdir="$withval", certsdir=$datadir)
+
+AC_SUBST(certsdir)
+
 dnl
 dnl  Check what libraries are available
 dnl
--- courier-0.78.2.orig/courier/module.esmtp/esmtpd.dist.in	2010-02-02 23:30:00.000000000 +0100
+++ courier-0.78.2/courier/module.esmtp/esmtpd.dist.in	2010-05-08 23:31:10.355976183 +0200
@@ -242,7 +242,7 @@
 #
 # This is an experimental feature.
 
-TLS_CERTFILE=@mydatadir@/esmtpd.pem
+TLS_CERTFILE=@certsdir@/esmtpd.pem
 
 ##NAME: TLS_TRUSTCERTS:0
 #
--- courier-0.78.2.orig/courier/module.esmtp/esmtpd-ssl.dist.in	2010-02-02 23:30:00.000000000 +0100
+++ courier-0.78.2/courier/module.esmtp/esmtpd-ssl.dist.in	2010-05-08 23:31:10.355976183 +0200
@@ -269,7 +269,7 @@
 #
 # This is an experimental feature.
 
-TLS_CERTFILE=@mydatadir@/esmtpd.pem
+TLS_CERTFILE=@certsdir@/esmtpd.pem
 
 ##NAME: TLS_TRUSTCERTS:0
 #
--- courier-0.78.2.orig/courier/module.esmtp/esmtpd-ssl.in	2010-05-08 23:30:54.612778263 +0200
+++ courier-0.78.2/courier/module.esmtp/esmtpd-ssl.in	2010-05-08 23:31:10.355976183 +0200
@@ -25,6 +25,10 @@
 
 case $1 in
 start)
+	# If we do not have a certificate, make one up.
+	if [ ! -f @certsdir@/esmtpd.pem ]; then
+	@sbindir@/mkesmtpdcert
+	fi
 	;;
 stop)
 	${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop
--- courier-0.78.2/courier/module.esmtp/mkesmtpdcert.in.orig	2018-03-25 10:15:59.986631408 +0200
+++ courier-0.78.2/courier/module.esmtp/mkesmtpdcert.in	2018-03-25 11:27:37.983248999 +0200
@@ -11,7 +11,7 @@
 PEMFILE="$1"
 
 if [ -z "$PEMFILE" ]; then
-	PEMFILE=@mydatadir@/esmtpd.pem
+	PEMFILE=@certsdir@/esmtpd.pem
 fi
 
 if test "@ssllib@" = "openssl"
@@ -35,7 +35,7 @@
 	exit 1
 }
 
-cd @mydatadir@
+cd @certsdir@
 umask 077
 BITS="$BITS"
 set -e
@@ -50,7 +50,7 @@
 		  -config @sysconfdir@/esmtpd.cnf -out "$PEMFILE" -keyout "$PEMFILE" || cleanup
 	@OPENSSL@ dhparam -2 -rand "$PEMFILE".rand 512 >>"$PEMFILE" || cleanup
 	@OPENSSL@ x509 -subject -dates -fingerprint -noout -in "$PEMFILE" || cleanup
-	rm -f @mydatadir@/esmtpd.rand
+	rm -f @certsdir@/esmtpd.rand
 else
 	if test "$BITS" = ""
 	then
--- courier-1.0.3/courier/pop3d-ssl.in.orig	2018-11-24 08:32:30.701692932 +0100
+++ courier-1.0.3/courier/pop3d-ssl.in	2018-11-24 08:47:26.655016034 +0100
@@ -28,6 +28,12 @@
 
 case $1 in
 start)
+	# If we do not have a certificate, make one up.
+	if test ! -f @certsdir@/pop3d.pem
+	then
+		@sbindir@/mkpop3dcert
+	fi
+
 	if test "$TLS_CACHEFILE" != ""
 	then
 		rm -f "$TLS_CACHEFILE"
--- courier-0.78.2.orig/courier.sysvinit.in	2010-05-08 23:30:54.612778263 +0200
+++ courier-0.78.2/courier.sysvinit.in	2010-05-08 23:31:10.355976183 +0200
@@ -18,7 +18,7 @@
 sbindir="@sbindir@"
 bindir="@bindir@"
 libexecdir="@libexecdir@"
-datadir="@datadir@"
+certsdir="@certsdir@"
 
 if test ! -f ${sysconfdir}/esmtpd
 then
@@ -85,7 +85,7 @@
 	then
 # If we do not have a certificate, make one up.
 
-		if test ! -f ${datadir}/esmtpd.pem
+		if test ! -f ${certsdir}/esmtpd.pem
 		then
 			if test -x $COURIERTLS
 			then
@@ -152,7 +152,7 @@
 			then
 # If we do not have a certificate, make one up.
 
-				if test ! -f ${datadir}/pop3d.pem
+				if test ! -f ${certsdir}/pop3d.pem
 				then
 					echo -n " generating-POP3-SSL-certificate..."
 
@@ -182,7 +182,7 @@
 			then
 # If we do not have a certificate, make one up.
 
-				if test ! -f ${datadir}/imapd.pem
+				if test ! -f ${certsdir}/imapd.pem
 				then
 					echo -n " generating-IMAP-SSL-certificate..."
Commit	Line	Data
9754ea44 JB	1	--- courier-0.78.2.orig/courier/configure.ac 2010-01-09 22:13:40.000000000 +0100
9754ea44 JB	2	+++ courier-0.78.2/courier/configure.ac 2010-05-08 23:31:10.355976183 +0200
d17b8ca4	3	@@ -480,6 +480,12 @@
5d26edcf	4	eval "datarootdir=$datarootdir"
c2c7a750	5	eval "bindir=$bindir"
5d26edcf	6	eval "localstatedir=$localstatedir"
69e1f9b1 AA	7	+eval "datadir=$datadir"
69e1f9b1 AA	8	+
c2c7a750	9	+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
69e1f9b1	10	+certsdir="$withval", certsdir=$datadir)
c2c7a750 AA	11	+
c2c7a750 AA	12	+AC_SUBST(certsdir)
69e1f9b1	13
c2c7a750 AA	14	MAILDROP="$bindir/maildrop"
c2c7a750 AA	15	AC_SUBST(MAILDROP)
6d61614b JB	16	--- courier-1.0.3/courier/imapd-ssl.rc.in.orig 2018-11-24 08:32:30.698359598 +0100
	17	+++ courier-1.0.3/courier/imapd-ssl.rc.in 2018-11-24 08:46:40.145016565 +0100
	18	@@ -27,6 +27,12 @@
c2c7a750 AA	19
	20	case $1 in
	21	start)
6d61614b JB	22	+ # If we do not have a certificate, make one up.
	23	+ if test ! -f @certsdir@/imapd.pem
	24	+ then
	25	+ @sbindir@/mkimapdcert
	26	+ fi
c2c7a750	27	+
6d61614b JB	28	if test "$TLS_CACHEFILE" != ""
	29	then
	30	rm -f "$TLS_CACHEFILE"
9754ea44 JB	31	--- courier-0.78.2.orig/courier/module.esmtp/configure.ac 2008-07-12 22:17:24.000000000 +0200
9754ea44 JB	32	+++ courier-0.78.2/courier/module.esmtp/configure.ac 2010-05-08 23:31:10.355976183 +0200
d17b8ca4	33	@@ -287,6 +287,11 @@
5d26edcf	34	AC_SUBST(mydatadir) # Quell automake warning
5d26edcf	35
c2c7a750 AA	36
c2c7a750 AA	37	+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
b3795f4c	38	+certsdir="$withval", certsdir=$datadir)
c2c7a750 AA	39	+
	40	+AC_SUBST(certsdir)
	41	+
	42	dnl
	43	dnl Check what libraries are available
	44	dnl
9754ea44 JB	45	--- courier-0.78.2.orig/courier/module.esmtp/esmtpd.dist.in 2010-02-02 23:30:00.000000000 +0100
9754ea44 JB	46	+++ courier-0.78.2/courier/module.esmtp/esmtpd.dist.in 2010-05-08 23:31:10.355976183 +0200
d17b8ca4	47	@@ -242,7 +242,7 @@
3d35ebab	48	#
5d26edcf	49	# This is an experimental feature.
	50
	51	-TLS_CERTFILE=@mydatadir@/esmtpd.pem
3d35ebab AA	52	+TLS_CERTFILE=@certsdir@/esmtpd.pem
3d35ebab AA	53
d17b8ca4	54	##NAME: TLS_TRUSTCERTS:0
3d35ebab	55	#
9754ea44 JB	56	--- courier-0.78.2.orig/courier/module.esmtp/esmtpd-ssl.dist.in 2010-02-02 23:30:00.000000000 +0100
9754ea44 JB	57	+++ courier-0.78.2/courier/module.esmtp/esmtpd-ssl.dist.in 2010-05-08 23:31:10.355976183 +0200
d17b8ca4	58	@@ -269,7 +269,7 @@
c2c7a750	59	#
5d26edcf	60	# This is an experimental feature.
	61
	62	-TLS_CERTFILE=@mydatadir@/esmtpd.pem
c2c7a750 AA	63	+TLS_CERTFILE=@certsdir@/esmtpd.pem
	64
	65	##NAME: TLS_TRUSTCERTS:0
	66	#
9754ea44 JB	67	--- courier-0.78.2.orig/courier/module.esmtp/esmtpd-ssl.in 2010-05-08 23:30:54.612778263 +0200
9754ea44 JB	68	+++ courier-0.78.2/courier/module.esmtp/esmtpd-ssl.in 2010-05-08 23:31:10.355976183 +0200
c2c7a750 AA	69	@@ -25,6 +25,10 @@
	70
	71	case $1 in
	72	start)
	73	+ # If we do not have a certificate, make one up.
	74	+ if [ ! -f @certsdir@/esmtpd.pem ]; then
	75	+ @sbindir@/mkesmtpdcert
	76	+ fi
	77	;;
	78	stop)
	79	${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop
9754ea44 JB	80	--- courier-0.78.2/courier/module.esmtp/mkesmtpdcert.in.orig 2018-03-25 10:15:59.986631408 +0200
	81	+++ courier-0.78.2/courier/module.esmtp/mkesmtpdcert.in 2018-03-25 11:27:37.983248999 +0200
	82	@@ -11,7 +11,7 @@
	83	PEMFILE="$1"
	84
	85	if [ -z "$PEMFILE" ]; then
	86	- PEMFILE=@mydatadir@/esmtpd.pem
	87	+ PEMFILE=@certsdir@/esmtpd.pem
5d26edcf	88	fi
69e1f9b1	89
9754ea44 JB	90	if test "@ssllib@" = "openssl"
9754ea44 JB	91	@@ -35,7 +35,7 @@
69e1f9b1 AA	92	exit 1
	93	}
	94
5d26edcf	95	-cd @mydatadir@
5d26edcf	96	+cd @certsdir@
9754ea44 JB	97	umask 077
	98	BITS="$BITS"
	99	set -e
	100	@@ -50,7 +50,7 @@
	101	-config @sysconfdir@/esmtpd.cnf -out "$PEMFILE" -keyout "$PEMFILE" \|\| cleanup
	102	@OPENSSL@ dhparam -2 -rand "$PEMFILE".rand 512 >>"$PEMFILE" \|\| cleanup
	103	@OPENSSL@ x509 -subject -dates -fingerprint -noout -in "$PEMFILE" \|\| cleanup
5d26edcf	104	- rm -f @mydatadir@/esmtpd.rand
5d26edcf	105	+ rm -f @certsdir@/esmtpd.rand
5d26edcf	106	else
9754ea44 JB	107	if test "$BITS" = ""
9754ea44 JB	108	then
6d61614b JB	109	--- courier-1.0.3/courier/pop3d-ssl.in.orig 2018-11-24 08:32:30.701692932 +0100
	110	+++ courier-1.0.3/courier/pop3d-ssl.in 2018-11-24 08:47:26.655016034 +0100
	111	@@ -28,6 +28,12 @@
c2c7a750 AA	112
	113	case $1 in
	114	start)
6d61614b JB	115	+ # If we do not have a certificate, make one up.
	116	+ if test ! -f @certsdir@/pop3d.pem
	117	+ then
	118	+ @sbindir@/mkpop3dcert
	119	+ fi
c2c7a750	120	+
6d61614b JB	121	if test "$TLS_CACHEFILE" != ""
	122	then
	123	rm -f "$TLS_CACHEFILE"
9754ea44 JB	124	--- courier-0.78.2.orig/courier.sysvinit.in 2010-05-08 23:30:54.612778263 +0200
9754ea44 JB	125	+++ courier-0.78.2/courier.sysvinit.in 2010-05-08 23:31:10.355976183 +0200
5d26edcf	126	@@ -18,7 +18,7 @@
c2c7a750 AA	127	sbindir="@sbindir@"
	128	bindir="@bindir@"
	129	libexecdir="@libexecdir@"
	130	-datadir="@datadir@"
	131	+certsdir="@certsdir@"
	132
	133	if test ! -f ${sysconfdir}/esmtpd
	134	then
5d26edcf	135	@@ -85,7 +85,7 @@
c2c7a750 AA	136	then
	137	# If we do not have a certificate, make one up.
	138
	139	- if test ! -f ${datadir}/esmtpd.pem
	140	+ if test ! -f ${certsdir}/esmtpd.pem
	141	then
	142	if test -x $COURIERTLS
	143	then
5d26edcf	144	@@ -152,7 +152,7 @@
c2c7a750 AA	145	then
	146	# If we do not have a certificate, make one up.
	147
	148	- if test ! -f ${datadir}/pop3d.pem
	149	+ if test ! -f ${certsdir}/pop3d.pem
	150	then
	151	echo -n " generating-POP3-SSL-certificate..."
	152
5d26edcf	153	@@ -182,7 +182,7 @@
c2c7a750 AA	154	then
	155	# If we do not have a certificate, make one up.
	156
	157	- if test ! -f ${datadir}/imapd.pem
	158	+ if test ! -f ${certsdir}/imapd.pem
	159	then
	160	echo -n " generating-IMAP-SSL-certificate..."
	161