added esmtpd-ssl to init script, closes bug 32267

4 files changed, 22 insertions, 6 deletions

diff --git a/net-mail/courier/ChangeLog b/net-mail/courier/ChangeLog
index 38ced4cd7175..716f0c799c79 100644
--- a/net-mail/courier/ChangeLog
+++ b/net-mail/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.33 2003/09/29 02:18:48 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.34 2003/10/29 19:23:57 iggy Exp $
+
+  29 Oct 2003; Brian Jackson <iggy@gentoo.org> courier-0.43.2.ebuild,
+  files/courier-init:
+  added esmtpd-ssl to init script, closes bug 32267
 
 *courier-0.43.2 (28 Sep 2003)
 
diff --git a/net-mail/courier/Manifest b/net-mail/courier/Manifest
index 9b1c963f6112..a6505adefaf9 100644
--- a/net-mail/courier/Manifest
+++ b/net-mail/courier/Manifest
@@ -1,9 +1,9 @@
 MD5 b1d39d50a898441cbe6590276f71f036 courier-0.43.1.ebuild 10194
 MD5 f9ab3698136d0e13d7e2a387be9c86b7 courier-0.42.2.ebuild 9527
 MD5 64f591bfd683293bd225248014cfb742 courier-0.42.2-r3.ebuild 10069
-MD5 ef015efd993dc5e6e543e5acc2626a2f ChangeLog 5676
+MD5 78cbdad532263b0396f6b604c6479b62 ChangeLog 5821
 MD5 891fa054ac6cfcaee491ccaae9b84a85 metadata.xml 463
-MD5 afc56dcf532ff5b22ea5540a55e8ecb5 courier-0.43.2.ebuild 10195
+MD5 38bb4e4a81582e35d461a5beeb7c28da courier-0.43.2.ebuild 10195
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
 MD5 c90d29ee6fb093c3a57dd6085a8463b3 files/courier-imapd 431
@@ -20,7 +20,7 @@ MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2 68
 MD5 f30eaa96d798eb05f3aafc60a44304ae files/digest-courier-0.43.1 68
 MD5 07811e054f4f8eb642d6cca22c960c6a files/digest-courier-0.43.2 68
 MD5 aba961cc052d0c255f4e1deb65945153 files/courier-0.42.2-gentoo.diff.bz2 378
-MD5 957bb3471d7c3c669a9e35475091a35b files/courier-init 4112
+MD5 249ceebfffaef283a84a1d49393db8f8 files/courier-init 4392
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
 MD5 d587a072860886d2896d8b5a8c118951 files/courier-esmtpd-msa 438
 MD5 8be77f68229aebdc27b53660a6431e8c files/courier-esmtpd-ssl 456
diff --git a/net-mail/courier/courier-0.43.2.ebuild b/net-mail/courier/courier-0.43.2.ebuild
index 411532def5c0..7cfa02cb5ff9 100644
--- a/net-mail/courier/courier-0.43.2.ebuild
+++ b/net-mail/courier/courier-0.43.2.ebuild
@@ -287,10 +287,10 @@ pkg_postinst() {
 	ewarn "need to edit the following files in /etc/courier to enable"
 	ewarn "the different services:"
 	ewarn "imapd"
+	ewarn "imapd-ssl"
 	ewarn "pop3d"
 	ewarn "pop3d-ssl"
 	ewarn "esmtpd"
-	ewarn "imapd-ssl"
 	ewarn "esmtpd-msa"
 	ewarn "esmtpd-ssl"
 	ewarn "hint: look for a line at the bottom of the file that looks like so"
diff --git a/net-mail/courier/files/courier-init b/net-mail/courier/files/courier-init
index eac111061dba..17fcea4e360e 100644
--- a/net-mail/courier/files/courier-init
+++ b/net-mail/courier/files/courier-init
@@ -85,6 +85,15 @@ start() {
 		;;
 	esac
 
+	# start esmtpd-ssl if so written
+	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl
+	case x$ESMTPDSTART in
+	x[yY]*)
+		ebegin " Starting esmtpd-ssl"
+		${sbindir}/esmtpd-ssl start
+		;;
+	esac
+
 	# start pop3d if so written
 	[ -f ${sysconfdir}/pop3d ] && source ${sysconfdir}/pop3d
 	case x$POP3DSTART in
@@ -98,7 +107,7 @@ start() {
 	[ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl
 	case x$POP3DSTART in
 	x[yY]*)
-		ebegin " courier-pop3d"
+		ebegin " courier-pop3d-ssl"
 		${sbindir}/courier-pop3d-ssl start
 		;;
 	esac
@@ -131,6 +140,9 @@ stop() {
 	ebegin " Stopping courier-esmtpd-msa"
 	${sbindir}/esmtpd-msa stop
 
+	ebegin " Stopping courier-esmtpd-ssl"
+	${sbindir}/esmtpd-ssl stop
+
 	[ -x ${sbindir}/courier-pop3d ] && \
 		ebegin " Stopping courier-pop3d" && ${sbindir}/courier-pop3d stop