Added /etc/conf.d script for passing additional options.

4 files changed, 17 insertions, 8 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 0e1e2eb5fbd9..140c0efa4586 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.61 2004/11/26 07:57:51 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.62 2004/12/29 06:44:00 swegener Exp $
+
+  29 Dec 2004; Sven Wegener <swegener@gentoo.org> +files/cyrus.confd,
+  files/cyrus.rc6, cyrus-imapd-2.2.10.ebuild:
+  Added /etc/conf.d script for passing additional options.
 
   26 Nov 2004; Tuan Van <langthang@gentoo.org>
   -files/cyrus-imapd-2.2.8-db4.patch,
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.10.ebuild
index 0ea7ac510b09..359e80fa00da 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.10.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.10.ebuild,v 1.4 2004/11/24 18:37:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.10.ebuild,v 1.5 2004/12/29 06:44:00 swegener Exp $
 
 inherit eutils ssl-cert gnuconfig fixheadtails
 
@@ -227,11 +227,10 @@ src_install() {
 	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
 
 	insinto /etc
-	newins "${FILESDIR}/imapd.conf" imapd.conf
-	newins "${FILESDIR}/cyrus.conf" cyrus.conf
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/cyrus.rc6" cyrus
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
 
 	if use pam ; then
 		insinto /etc/pam.d
diff --git a/net-mail/cyrus-imapd/files/cyrus.confd b/net-mail/cyrus-imapd/files/cyrus.confd
new file mode 100644
index 000000000000..ca24b442cf9b
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.confd,v 1.1 2004/12/29 06:44:00 swegener Exp $
+
+# Additional options for the cyrus master
+CYRUS_OPTS=""
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6
index 88d44e4485fe..e2e573c9ce35 100644
--- a/net-mail/cyrus-imapd/files/cyrus.rc6
+++ b/net-mail/cyrus-imapd/files/cyrus.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.rc6,v 1.6 2004/07/14 23:49:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.rc6,v 1.7 2004/12/29 06:44:00 swegener Exp $
 
 depend() {
 	need net
@@ -12,7 +12,7 @@ depend() {
 start() {
 	ebegin "Starting cyrus imapd"
 	start-stop-daemon --start --quiet --background \
-		--exec /usr/lib/cyrus/master
+		--exec /usr/lib/cyrus/master -- ${CYRUS_OPTS}
 	eend $?
 }