courier: fix location of webmaild executable in initscript

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc5 x86_64

4 files changed, 195 insertions, 12 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index f82126a08423..7f1b30d7bd34 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.113 2008/08/23 01:50:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.114 2008/11/20 13:26:32 hanno Exp $
+
+  20 Nov 2008; Hanno Boeck <hanno@gentoo.org> +files/courier-init-r2,
+  courier-0.60.0.ebuild:
+  Fix location of webmaild in init script, thanks to Mike Bryce in #225093.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index d167aeac8c03..64ff34d3587e 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -6,6 +6,7 @@ AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33c
 AUX courier-0.59.0-asneeded.patch 534 RMD160 fe2f28235842220d999dc77ed22857dd99c648a2 SHA1 5ae8a8cefbbd91f2146988c9095ac0e3668c1135 SHA256 802ae0431c9d2b55cdda4602522058874765170d12f4e2fcdd064971f8d31991
 AUX courier-init 5182 RMD160 7c5d80d7fdd4e09418461a746f6642f2a276b88b SHA1 beef0a5742fe31388947e945b4646c1dbe5627f1 SHA256 4b1a030bbba852c9c2c8d50e58c43c8e97b5a1ac29a04974a1f097362929e126
 AUX courier-init-r1 5252 RMD160 2c770526b4fd2e342c904289573c4f8cb19ca6df SHA1 ac67cd4a9664b1010322b5260f84d017ee06736b SHA256 e74fc291b49dace3ffb3af1844b976255c0c7a34aa0e2d87b5c05f672db9058a
+AUX courier-init-r2 4877 RMD160 bc1bf99be4e032a0e52bba71801c89f9a6cd4383 SHA1 a9e8329fb0582fc0cf0341de4e054096587f2790 SHA256 d6a53142751f71f3a6287806259a640fdc1c8807003510d775b0239e8410d02a
 AUX dot_courier 26 RMD160 cf20012379abbb63f78e1eb0f9cbaefff6d1048d SHA1 8e5e09e167035d100859b42311b6dda2842f4d67 SHA256 8c585031b4356ca1f887e0823fd9b365fff57a5f9cc32541eccfc1542d5d3763
 AUX locallowercase 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf095797e8c526dc5fec59d9d89d51f318cd28a SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47
@@ -15,13 +16,13 @@ AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7
 DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21caaf SHA1 6870d2b12f1c93d5ede12f2a5c9c1107a7fb647c SHA256 e488cc920ed970c6d38496dba21359b50c6032ff4f2f91432b5d23db261578ec
 DIST courier-0.60.0.tar.bz2 7067430 RMD160 f35a9329e87a948ca9abf6bd7fcc42e4bfe3adac SHA1 13be35f2631830ea2bf66831ea492d83b8247464 SHA256 c13da0a0b76c4a59aa219d037129b8305293d1091143027f2dfd631b9e470e64
 EBUILD courier-0.59.0.ebuild 10180 RMD160 0bcd931b501817ffdacfcf2684763ade3c264376 SHA1 b73c6503fe10122d24ea45082a39efd0b156ac51 SHA256 6d78cd3a0037475b12a8c7247ad2c443887de326f2ef18804bc7ee65bcb9c837
-EBUILD courier-0.60.0.ebuild 10112 RMD160 46e93f8bca7a8eee888048d9edadbbbfe057625e SHA1 07b25c963b7094e3ad804b705bb038293a0fe844 SHA256 04e3d55de3c0fcb9abd0e4ee66852f39cffc3eaf8101ff0efe063d3c009ef818
-MISC ChangeLog 29654 RMD160 71350b454fd5eb00e37a2c30dffc1432c5800bde SHA1 850a2da115a54831e008ad54d46cca8684832302 SHA256 d6831c5017ae9f9b65bbc95b146eb2c1749d51bf61edee63df4b60cfe669c177
+EBUILD courier-0.60.0.ebuild 10055 RMD160 7de8555d4e7287ed2171a779e95851fcdc73ad25 SHA1 0e43ae4359cf395e28515e20395d941afbd7f615 SHA256 3c447554f71ccb1e170cce6f5b15c4efc067058b8f877e0d5de8bf868579df11
+MISC ChangeLog 29825 RMD160 97c5b22bdd1d5b5952011706de79a4f187e02e43 SHA1 4aefdbe9a4d7dbe97590d98a19bd18a167f1c275 SHA256 d9dd68f092873ce73e1f8e5f9a5d3b1e33601bf5f5f155c1a6b47f031c279ded
 MISC metadata.xml 687 RMD160 753323e40a9add2b07fd1f138c672ce283d2f255 SHA1 2e8255902a9e0394bd27e13e488e84ba70f05845 SHA256 ea417e66d396e793212529ed20f5570b0c97eb666a5ba52bb3202bbfbc022be1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkivbO8ACgkQoeSe8B0zEfy9oACfflr8Jpu47TNRU11GCJ1n/Y/8
-ly4AnjBnRbfJ+72cn64xEuo031fT4d/N
-=vFz/
+iEYEARECAAYFAkklZXUACgkQr2QksT29OyAjHQCeLglV+wSCYDRCLLiGJv5x1jee
+H+MAn18ntVTezuCWmwMtyIto2vnzRljb
+=6gDD
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.60.0.ebuild b/mail-mta/courier/courier-0.60.0.ebuild
index d30739454229..d301cb4b5dd8 100644
--- a/mail-mta/courier/courier-0.60.0.ebuild
+++ b/mail-mta/courier/courier-0.60.0.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.60.0.ebuild,v 1.1 2008/07/21 00:39:43 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.60.0.ebuild,v 1.2 2008/11/20 13:26:32 hanno Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 [ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -142,7 +139,7 @@ src_install() {
 		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
 	done
 
-	newinitd "${FILESDIR}/courier-init-r1" "courier"
+	newinitd "${FILESDIR}/courier-init-r2" "courier"
 	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
 
 	cd "${D}/etc/courier"
diff --git a/mail-mta/courier/files/courier-init-r2 b/mail-mta/courier/files/courier-init-r2
new file mode 100644
index 000000000000..e19add295133
--- /dev/null
+++ b/mail-mta/courier/files/courier-init-r2
@@ -0,0 +1,181 @@
+#!/sbin/runscript
+# Portions Copyright 2003 Gentoo Linux
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/files/courier-init-r2,v 1.1 2008/11/20 13:26:32 hanno Exp $
+#
+# script originally from Courier distfile original name = courier.sysvinit
+# adapted for Gentoo by Brian Jackson
+#
+# TODO
+# should we update all the .dat/.pem files when the source/config files are 
+#	newer than the .dat/.pem files?
+
+prefix="/usr"
+exec_prefix="/usr/bin"
+sysconfdir="/etc/courier"
+sbindir="/usr/sbin"
+libexecdir="/usr/lib/courier"
+datadir="/usr/share/courier"
+
+depend() {
+	need net
+	[ -d /etc/courier/authlib ] && need courier-authlib
+	grep -q "^IMAPDSTART=.*[Yy].*" /etc/courier/imapd && use famd
+	grep -q "^IMAPDSSLSTART=.*[Yy].*" /etc/courier/imapd-ssl && use famd
+}
+
+checkconfig() {
+
+	[ -f ${sysconfdir}/pop3d-ssl ] && . ${sysconfdir}/pop3d-ssl
+
+	# If we do not have a certificate, make one up.
+	[ ! -f "${datadir}/pop3d.pem" ] && \
+	ebegin " generating-POP3-SSL-certificate..." && "${sbindir}/mkpop3dcert"
+
+	[ -f ${sysconfdir}/imapd-ssl ] && . ${sysconfdir}/imapd-ssl
+
+	# If we do not have a certificate, make one up.
+	[ ! -f ${datadir}/imapd.pem ] && \
+	ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert"
+
+	[ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl
+
+	# If we do not have a certificate, make one up.
+	[ ! -f ${datadir}/esmtpd.pem ] && \
+	ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert"
+
+	# First time after install create aliases.dat and smtpaccess.dat
+
+	[ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases
+
+	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess
+
+	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa
+}
+
+start() {
+	# Start daemons.
+	ebegin "Starting Courier mail server:"
+
+	checkconfig || return 1
+
+	ebegin " Starting courierfilterd"
+	${sbindir}/courierfilter start
+
+	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
+	${libexecdir}/authlib/authdaemond start && ebegin " Starting authdaemond"
+
+	[ -x ${sbindir}/webmaild ] && \
+	  ${sbindir}/webmaild start && ebegin " Starting webmaild" 
+
+	[ -x ${sbindir}/courierldapaliasd ] && \
+	${sbindir}/courierldapaliasd start && ebegin " Starting courierldapaliasd"
+
+	ebegin " Starting courierd"
+	${sbindir}/courier start
+
+	# start esmtpd if so written
+	[ -f ${sysconfdir}/esmtpd ] && source ${sysconfdir}/esmtpd
+	case x$ESMTPDSTART in
+	x[yY]*)
+		ebegin " Starting esmtpd"
+		${sbindir}/esmtpd start
+		;;
+	esac
+
+	# start esmtpd-msa if so written
+	[ -f ${sysconfdir}/esmtpd-msa ] && source ${sysconfdir}/esmtpd-msa
+	case x$ESMTPDSTART in
+	x[yY]*)
+		ebegin " Starting esmtpd-msa"
+		${sbindir}/esmtpd-msa start
+		;;
+	esac
+
+	# start esmtpd-ssl if so written
+	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl
+	case x$ESMTPDSSLSTART 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
+	x[yY]*)
+		ebegin " courier-pop3d"
+		${sbindir}/courier-pop3d start
+		;;
+	esac
+
+	# start pop3d-ssl if so written
+	[ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl
+	case x$POP3DSSLSTART in
+	x[yY]*)
+		ebegin " courier-pop3d-ssl"
+		${sbindir}/courier-pop3d-ssl start
+		;;
+	esac
+
+	[ -f ${sysconfdir}/imapd ] && source ${sysconfdir}/imapd
+	case x$IMAPDSTART in
+	x[yY]*)
+		ebegin " courier-imapd"
+		${sbindir}/courier-imapd start
+		;;
+	esac
+
+	[ -f ${sysconfdir}/imapd-ssl ] && source ${sysconfdir}/imapd-ssl
+	case x$IMAPDSSLSTART in
+	x[yY]*)
+		ebegin " courier-imapd-ssl"
+		${sbindir}/courier-imapd-ssl start
+		;;
+	esac
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Courier mail server:"
+
+	ebegin " Stopping courier-esmtpd"
+	${sbindir}/esmtpd 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
+
+	[ -x ${sbindir}/courier-pop3d-ssl ] && \
+		ebegin " Stopping courier-pop3d-ssl" && ${sbindir}/courier-pop3d-ssl stop
+
+	[ -x ${sbindir}/courier-imapd ] && \
+		ebegin " Stopping courier-imapd" && ${sbindir}/courier-imapd stop
+
+
+	[ -x ${sbindir}/courier-imapd-ssl ] && \
+		ebegin " Stopping courier-imapd-ssl" && ${sbindir}/courier-imapd-ssl stop
+
+	ebegin " Stopping courierd"
+	${sbindir}/courier stop
+
+	[ -x ${sbindir}/courierldapaliasd ] && \
+	( ${sbindir}/courierldapaliasd stop ; ebegin " Stopping courierldapaliasd" )
+
+	[ -x ${sbindir}/webmaild ] && \
+	  ( ${sbindir}/webmaild stop ; ebegin " Stopping webmaild" )
+
+	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
+	( ${libexecdir}/authlib/authdaemond stop ; ebegin " Stopping authdaemond" )
+
+	${sbindir}/courierfilter stop
+	ebegin " Stopping courierfilterd"
+
+	eend $?
+}