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

5 files changed, 25 insertions, 15 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/Manifest b/net-mail/cyrus-imapd/Manifest
index 00246ad87e4d..a144d51006c5 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8a3b7be7104b16ea09f3bbbea27983ff cyrus-imapd-2.2.10.ebuild 8796
-MD5 67c38e1e0ba17ab2434435cf9d1487e5 ChangeLog 12351
+MD5 ecda85040983b468b355cfe904ee8e21 cyrus-imapd-2.2.10.ebuild 8788
+MD5 db1cc3e8ade2ed78eef195cfd17286a3 ChangeLog 12526
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 375e343e1080fa924b085d5495e13588 files/cyrus.rc6 556
+MD5 756c504a8b0b90aaa0630c089ae42f50 files/cyrus.rc6 573
+MD5 08017debe8d02c695ec456e1165d920d files/cyrus.confd 279
 MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
 MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10 71
 MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBpu/P5FrxP71izLARAhzDAJ43saxjJn2BbsJVmhlCqkipQaUjbACfY1RU
-S60f/KapNArbAn0RphmHC6Y=
-=xCCO
+iD8DBQFB0lI6I1lqEGTUzyQRAk2/AJ9o4h85DzqKeleKjte9VKqCKbEmQgCfXWHr
+AXQ5krRybmdmJsnviQce3oU=
+=gMsg
 -----END PGP SIGNATURE-----
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 $?
 }