removed 3.0.2, added 3.1.12 + new init scripts

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

7 files changed, 263 insertions, 171 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 12df9eca8fff..7b05da789aec 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.59 2014/03/03 23:53:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.60 2014/03/07 18:48:33 lordvan Exp $
+
+*dbmail-3.1.12 (07 Mar 2014)
+
+  07 Mar 2014; Thomas Raschbacher <lordvan@gentoo.org> +dbmail-3.1.12.ebuild,
+  files/dbmail-imapd.initd, files/dbmail-lmtpd.initd, files/dbmail-pop3d.initd,
+  files/dbmail-timsieved.initd, -dbmail-3.0.2.ebuild:
+  new init scripts (seperate for each service again)
+  version bump and removed 3.0.2
 
   03 Mar 2014; Pacho Ramos <pacho@gentoo.org> dbmail-3.1.9.ebuild:
   amd64 stable, bug #498954
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index bfdbac583ec1..1172e7c9753e 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX dbmail-imapd.initd 730 SHA256 f8c16208f31495d2557e6ac101f1dd9f18636268511c889a0ad4dee0c56612da SHA512 f7841d64447630b771d4c3b0885d188d143959f00db1caf08ac4cd32d8610ad2b9221114f08bb456c9ad99529c66a52c5b2403c96ffe62549e28dc64ff9b6f7b WHIRLPOOL 9b9cb243d70e00f744e9bd4eeab887eb525643fe77cfe3e8c1f01c376edff165052f82965a7486d630d5fac22500641745a0e88b33303bc56e6780e351eaaba3
-AUX dbmail-lmtpd.initd 730 SHA256 2aedd5fecc1ef28289c870030c31f8ecaded4f2651be355a40216262a8a4d4a3 SHA512 201161e87a5b14c4637c16bddd07ab2907d95a997b39bb4d40d6ad21d67588149d7d900d364ce7a28006e0fea2bf48ff11ceae83c05a292d80603ed9300e1357 WHIRLPOOL af80c16be5f3119a88871b007936c5cd3e2b4e9399b89eec832b13f587de48e563a0a024259fa463f514461b7f56693d4ced02e084c4954dbb5f0994f42bd1c3
-AUX dbmail-pop3d.initd 730 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52 SHA512 b2df02acc6c941d195f8122ef79dc19b4b105f6cd7813969dc291a55350ae02a9cfaae16bc698da93d771a4b07aff5f6cda579b8ed597f41bba124ecdd4cc53d WHIRLPOOL 1000280545cdd50c5e90ba504a2d87f77b9fdae7db79fdba4fb4d7d745295d438893f1b7f5837af1976e3690a37defcf1f41543cd45ba744db061f1de094580b
-AUX dbmail-timsieved.initd 716 SHA256 c92cd221b37391703ec7aaff2eb3b33ed2b9b699a281f318f54ba6efd6e69224 SHA512 04f66443573fde84d220a0d808f98295a8931990a0d7bad13c0c86bfe7b2d95c3311f7fdbc6b4068223601286c34e97cb17b0f5fbc28ca05991d0cdc13d250f5 WHIRLPOOL 8f3c2a53f084861f63db8056b4b2ac82fb9e2ef6e0cf519073368c6bf59b8e2026872af0c847011bd6ac237e94dc7ac280805a3200ec738a96c8dfc50e0bc238
-DIST dbmail-3.0.2.tar.gz 867560 SHA256 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e SHA512 ca1d30a114c1b2b8968227ed678e3857c6d5cb98eb9e7086d45c32b4e957396971bd76cfe2e278fe904fbe8a8ded53199ded76da300d9835b324839e42532834 WHIRLPOOL a79d8b344361bd032446e99bbbb865e798db54e60a730cb7191112e4320ca130d194d8a1ad2d676673b2bb06e50e9cc1ccc78a8a1fc7edcb2a9b3eeeb7841500
+AUX dbmail-imapd.initd 1542 SHA256 ea8100471b06543b65dc35485c0d07bb0d47ff5a51624ac4b892bf10ea287a85 SHA512 517a751efa6f844bf0a4e4c8e012cc5e0229e2b497a99ba52ab62f53b7ea3e2e1c4ad47941efda51807db1fe7bd5b9976384a38a1b559bd16104dbf364e64781 WHIRLPOOL e078a6c4f4f6ec261707fdd622e0bc0b9ecd42a7c33e3a182e994db6e906f9944780ca62d538d665591c1d58413d11deb2192f9fd49d0defeaf6a1ac82c26df5
+AUX dbmail-lmtpd.initd 1542 SHA256 971118743b2322c69774f7d310292ec6aae392dbb6eb770a5cd01abf81ecc664 SHA512 2926b5b9afc64956e53bfa139f811ec0f3fdec409ef83f7cc15b47718d3c1f0b00a9a254d77957013338b2a447b5952d36f2b3e653cf461e7ff2b39307f883fb WHIRLPOOL 7148cb049b983ba255a18f49b6d28c6fdcdf18bb450a3f7128afd4671dce0dba38151eedcb25263a8b2f19ec7eb9e99bed30761b3cc10a8828242c502f1233b1
+AUX dbmail-pop3d.initd 1542 SHA256 79682143fdf7c9f883f39aae0c455b7dbe44caa14196e933d24042dadeefbc55 SHA512 e5afd8556c03ff1b79b67f5075f744fff466d60bfc4b5f51fb6c439c9de041a7c25b3b3ea8642dd517615ec7f46e9aa49938419112daaa109c2216153c207913 WHIRLPOOL f93ac418c13c337bafeef07dcbcf2e4a2f4669dfd5ea7a6aff87fcf659b29780a94f398b42ad76cff01e0f5a68d76e4e5d34d03aefee84996aab7b2a474bf364
+AUX dbmail-timsieved.initd 1557 SHA256 012e1f286f11c06cbdc5422fc5dc813f5d6b7a18bee789beabb98f9848f901c4 SHA512 bdf633348a7944157f7ddaab7ad418b905b47bbba094d60bf758ad4f7a48ce2ea222be429751411904e9a8456e50bb3c7405b81f6eb64dfa53979d521518375f WHIRLPOOL 676238837736f26546a041eb90d01fade5419dd47a10a28343a551cc12c09abeeb07e99a52c0c744815829e8e02534b5d8a304deb6baa14375cd43a2ba81400a
 DIST dbmail-3.1.10.tar.gz 2397512 SHA256 7a5b82eb8feb45faf215bebee7fb648092e5eaa71b2d5acd5826ca36d8e63f4f SHA512 d90964f61058435b65be38ba4e04a45a9751eb5e294f983e8f215f9361e542d0e7af464a977e8eac6e0b9ef5380106f5ab0ed5c94125ea9bd7a7d31791e5a09e WHIRLPOOL 3b878fe4a82eacb24bcdbd795146812d6d56960a686a12e168164514fe4e68314d1e0c0de6f434e2d8d98f8ef8910d1679b214a7fbb501bb440a34e843e3b3d0
 DIST dbmail-3.1.11.tar.gz 2399545 SHA256 8c1b11f604447944ec23985a1ff30869a2cf58fb918f47d53bd7db4c610856d7 SHA512 bff44b18b6453716f30a486a606319c8c371677ba45bbd93df99945b877ae4635e5300851641af2e223a3246308a637054b4f3c49b0fb27c601dbbd341d34fc6 WHIRLPOOL 70bc3a22b3b104a4d6aad058b71cc5de27479a74c9b0cffdd86c64a9790b114748bb4ea6dfc6e573f829e81c80ea1087b8327b09cdf1723ee18e09850eca01cb
+DIST dbmail-3.1.12.tar.gz 2399757 SHA256 9156a77d272e6c5924ccdefa2b25beadbb2ab27f3debd11c5ffb6f8904b0196c SHA512 50c9c6c40730c074c1c3e9c7b7a78b78875638d38f1d2cfe22bf6ce837f2ef8ab5929b688081b6c17bf79347899c4f3cf7e75e6853b8ef7c17ce08f66d5e583b WHIRLPOOL b2fba37229f5043a3174b4fa7199481aeaa14cb6919109b8b13d8e24c01141d031afe1a3ffd831b2162a5fe4e8a5143f337aec2268231391f701ab7638a6511e
 DIST dbmail-3.1.9.tar.gz 2397293 SHA256 665f42700654aae767d24647dde284a4df7aec1702a00d1122d55b3f9f4318dd SHA512 99b0c915256a1849fe41963e8ce64905e9a4533fa8821a98c2bc3ad0824b6417f370fe7c2411721480a93631db67be08e558b5282a29c3cb04a69ac358ab4775 WHIRLPOOL 2732a92b880440e4c98f6b305e8fd6b399bdaac097d284f4e69c493844977b558f6f06723f69ec0bdd5339784ce6feb58b17538eac877c2726d581e2c3931ee4
-EBUILD dbmail-3.0.2.ebuild 4911 SHA256 370222620c4674b6788295aae68c3418d5a703d22b550ecad4ac2968852ab5cd SHA512 f375a440feaa842499da6c1abb2e820e892333f1a912e41b1f969575bca1dacdf6aa8def389a5554af021a787e6cd04a00d195b6aecde7f7675eadaa6821cb70 WHIRLPOOL ce522bec13b2d8eab1452d66f91743eef828bcc523fa2a07f8b950dfed5db716a271fc3cc7f065a96ed60f6f2ba8cce593c5822dc276ee29837ab3857c2188ef
 EBUILD dbmail-3.1.10.ebuild 4246 SHA256 a0f091ecc6287da0b065cea33e6a3181dd314b007dcf0f3feb8a61a3eef9bc22 SHA512 e08377f7d2ea560bbc777fca763c4945fbb7de98d9a0c03c5e8e929490679cf4bebd4d29b9f446deb504956c5a659990f46f5ab4642474444f985d224e863d82 WHIRLPOOL 5bec4611a0ca6d114d581016c3d18b754eeb1fc7edc5aeabdb523375ddf3c90f7895d18e0c3b86d488b81dc73382b9ba55582b673c4f57af4432a2fd820129aa
 EBUILD dbmail-3.1.11.ebuild 4246 SHA256 0043bbab8e7bb87de63d40186e20b3c4cd7d6a1879ccaf1dd483357a42e7d789 SHA512 5dc77b5b9280514e43864cd6f20c3bcc250c0d6303c68882aece39efff03c0522a590cc712996b0b368b9470a073a1f540a3831d3f2bdb4f4771d9a258f261fa WHIRLPOOL 45a14bf69e4bc552fdd980393f3ad5fbef037d5d04682f6ac4e4d6a66631ae902a9a92af48c4deab83e0e065bf8f0427825de66382d2868134d3e4b6f4db7c3f
+EBUILD dbmail-3.1.12.ebuild 4934 SHA256 1547a291afa49f850665e4550a2b64567272e71bf55274f8844ab47f854bd4a3 SHA512 21b602b76f832986ba590eeb1100aebb83a96ebdbbdea31c0459472004e3129998ce214a5a7929345701352c3311fdd35fa2ed64658cf699a2f23e5649b0ddb8 WHIRLPOOL d91856da1c0cb193b9105aba334399104e704ada678ff76b77bc0ba6a019a6e73f28c90610a228f71e13f448f397a5d824ade726518f479eff912118cc1636c2
 EBUILD dbmail-3.1.9.ebuild 4241 SHA256 6ba0a8283fc0740fa8f041faff08751f589fb8a1f3c959886e69f30af02cea80 SHA512 78b5f4625366d92ba11ce2f3ae58f84c9a5420f4ea89fe30a1c1c3215365dbd46c38cdcdd79580c9f208a59241395a5a0aa7ac998f732691e6e7a605e46f3e0e WHIRLPOOL 9669cbf6d8f9234d682cf5d1a6cc26d13678061fdc52cf92d62290c234fbcef86c0cf03ddb3042a8f29d7cd425e7d3ce2869a896c5d19ade9bade62a0be12248
-MISC ChangeLog 10957 SHA256 667c08eab6dd5a4d06070e963954922a2e17f24fa002c674f5507f07991a0768 SHA512 2df05c3a56ad6d3ae589656af6121957b6ee3c5ac0ad4bfb73428f42b8440e26d1e4e358c9a03bd01bea4de668ccb0798e2c820da88216e0d38a6c0424eb3918 WHIRLPOOL 7b5e810ef6bf61a40f87c613dd46ab2605615fc12e805305857230173777729b619a1034a599ecb99248e7d229f740beb7740b3ab2e9914cbea8dee00d1845b8
+MISC ChangeLog 11288 SHA256 f14ea7a99887ba8195b88126d79742d4f7a41aafe691c4cbbbdb88f891e1c96a SHA512 5745036c1f99c46ad86a7788b368b82a6ebb9f36a1f1af7569bef08b051dfb6492e969ba8dae606845d8f4cab45607b92c4c5d10c7780617378310cf5600a73f WHIRLPOOL 3719ed111c7ac525ce92c913125d6b1860748b9bfd9311346e6768110614bbd0618f889cf5ecd57fe6185b3ab6391f7e6fe23d1890a2fdf2195e4234211ace68
 MISC metadata.xml 580 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14 SHA512 4533cb22ee9b8cec8565bde5ebbcb7ac1f9bbbac49cb38af370e3e6325a6a7a31d04adb301ccf23c53c0478bf692466a9599c8bf8ed2715be9a3d28741f6f6f7 WHIRLPOOL c920b009c23cfedf06ecf9814de3e71314153c8879b14891e2f39580cffa100f8544684d60d7802558f383778900f914598bb9ee9cd0b52f839ff4c7bad566b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMVFhIACgkQCaWpQKGI+9TTgwCfYGB7fcA78Cywpr+U9Mkmfbfj
-ho4An2Tib6r+civsboKqt9F1onpB4z4I
-=EsSn
------END PGP SIGNATURE-----
diff --git a/net-mail/dbmail/dbmail-3.0.2.ebuild b/net-mail/dbmail/dbmail-3.1.12.ebuild
index e53e7e4588bd..a886fe590fbb 100644
--- a/net-mail/dbmail/dbmail-3.0.2.ebuild
+++ b/net-mail/dbmail/dbmail-3.1.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.0.2.ebuild,v 1.5 2014/01/08 06:40:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.12.ebuild,v 1.1 2014/03/07 18:48:33 lordvan Exp $
 
 EAPI="4"
-inherit eutils multilib python versionator user
+inherit eutils multilib versionator user
 
 DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database."
 HOMEPAGE="http://www.dbmail.org/"
@@ -11,13 +11,12 @@ SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap sieve +sqlite ssl static python"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap sieve +sqlite ssl static"
 
 DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33 )
-	python? ( net-zope/zope-interface )
 	app-text/asciidoc
 	app-text/xmlto
 	app-crypt/mhash
@@ -30,7 +29,6 @@ DEPEND="dev-db/libzdb
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	python_pkg_setup
 	enewgroup dbmail
 	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
 }
@@ -55,20 +53,6 @@ src_install() {
 
 	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
 
-#	docinto sql/mysql
-#	dodoc sql/mysql/*
-#	docinto sql/postgresql
-#	dodoc sql/postgresql/*
-#	docinto sql/sqlite
-#	dodoc sql/sqlite/*
-#	docinto test-scripts
-#	dodoc test-scripts/*
-#	docinto contrib/sql2sql
-#	dodoc contrib/sql2sql/*
-#	docinto contrib/mailbox2dbmail
-#	dodoc contrib/mailbox2dbmail/README
-#	docinto contrib
-#	dodoc contrib/dbmailclient.php
 	dodoc -r sql
 	dodoc -r test-scripts
 	dodoc -r contrib
@@ -84,10 +68,15 @@ src_install() {
 
 	# change config path to our default and use the conf.d and init.d files from the contrib dir
 	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
-	newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
+	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
 
 	dobin contrib/mailbox2dbmail/mailbox2dbmail
 	doman contrib/mailbox2dbmail/mailbox2dbmail.1
@@ -99,30 +88,15 @@ src_install() {
 	   doins "${S}/dbmail.schema"
 	fi
 
-	if use python; then
-	   insinto $(python_get_sitedir)/dbmail
-	   doins python/*.py
-	   insinto $(python_get_sitedir)/dbmail/app
-	   doins python/app/*.py
-	   insinto $(python_get_sitedir)/dbmail/bin
-	   doins python/bin/*.py
-	   insinto $(python_get_sitedir)/dbmail/lib
-	   doins python/lib/*.py
-	   insinto $(python_get_sitedir)/dbmail/tests
-	   doins python/tests/*.py
-	fi
-
 	keepdir /var/lib/dbmail
 	fperms 750 /var/lib/dbmail
 	fowners dbmail:dbmail /var/lib/dbmail
-	keepdir /var/run/dbmail
-	fowners dbmail:dbmail /var/run/dbmail
+	# create this through init-scripts instead of at installt ime (bug #455002)
+	#keepdir /var/run/dbmail
+	#fowners dbmail:dbmail /var/run/dbmail
 }
 
 pkg_postinst() {
-	if use python; then
-	   python_mod_optimize dbmail
-	fi
 	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
 	elog "for remaining instructions on setting up dbmail users and "
 	elog "for finishing configuration to connect to your MTA and "
@@ -152,8 +126,15 @@ pkg_postinst() {
 	elog "Changed pid directory to /var/run/dbmail (see"
 	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
 	echo
-}
-
-pkg_postrm() {
-	     python_mod_cleanup dbmail
+	ewarn "The database config has changed to support libzdb db URI"
+	ewarn "Please check the documentation (or Bug #479664)"
+	echo
+	ewarn "The database schema has changed since 3.0.x make sure"
+	ewarn "to run the migration script"
+	echo
+	ewarn "Please be aware, that the single init-script for all services"
+	ewarn "has been replaced with seperate init scripts for the individual services."
+	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
+	ewarn "and remove dbmail if you want to take advantage of this change."
+	echo
 }
diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd
index 8f6984feb06c..d0ede5aba2f2 100644
--- a/net-mail/dbmail/files/dbmail-imapd.initd
+++ b/net-mail/dbmail/files/dbmail-imapd.initd
@@ -1,40 +1,68 @@
 #!/sbin/runscript
 #
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-impad
+#
+
+
+PROGRAM=dbmail-imapd
 
-PIDFILE="/var/run/dbmail-imapd.pid"
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
 
 depend() {
-	need net
-	use mysql
-	use pgsql
-	after mta
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
 }
 
-checkconfig() {
-	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
-		eerror "You need to create apropriate config"
-		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
-		return 1
-	fi
-	# Avoid using root's TMPDIR
-	unset TMPDIR
-}
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
 
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
 
 start() {
-	checkconfig && \
-	ebegin "Starting DBMail IMAP daemon"
-	    start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dbmail-imapd \
-		--name dbmail-imapd \
-		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
-	eend $?
-}	
+	initService
+        ebegin "Starting DBMail IMAP daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
 
 stop() {
-	ebegin "Stopping DBMail IMAP daemon"
-	    start-stop-daemon --stop --quiet --retry 5 \
-		--pidfile ${PIDFILE}
-	eend $?
-}	
+        ebegin "Stopping DBMail IMAP daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
 
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail IMAP daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd
index cea3da6dd861..0495ba722d22 100644
--- a/net-mail/dbmail/files/dbmail-lmtpd.initd
+++ b/net-mail/dbmail/files/dbmail-lmtpd.initd
@@ -1,40 +1,68 @@
 #!/sbin/runscript
 #
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-lmtpd
+#
+
+
+PROGRAM=dbmail-lmtpd
 
-PIDFILE="/var/run/dbmail-lmtpd.pid"
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
 
 depend() {
-	need net
-	use mysql
-	use pgsql
-	after mta
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
 }
 
-checkconfig() {
-	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
-		eerror "You need to create apropriate config"
-		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
-		return 1
-	fi
-	# Avoid using root's TMPDIR
-	unset TMPDIR
-}
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
 
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
 
 start() {
-	checkconfig && \
-	ebegin "Starting DBMail LMTP daemon"
-	    start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dbmail-lmtpd \
-		--name dbmail-lmtpd \
-		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
-	eend $?
-}	
+	initService
+        ebegin "Starting DBMail LMTP daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
 
 stop() {
-	ebegin "Stopping DBMail LMTP daemon"
-	    start-stop-daemon --stop --quiet --retry 5 \
-		--pidfile ${PIDFILE}
-	eend $?
-}	
+        ebegin "Stopping DBMail LMTP daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
 
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail LMTP daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd
index 8c9e7b874a79..5f39bb211957 100644
--- a/net-mail/dbmail/files/dbmail-pop3d.initd
+++ b/net-mail/dbmail/files/dbmail-pop3d.initd
@@ -1,40 +1,68 @@
 #!/sbin/runscript
 #
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-pop3d
+#
+
+
+PROGRAM=dbmail-pop3d
 
-PIDFILE="/var/run/dbmail-pop3d.pid"
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
 
 depend() {
-	need net
-	use mysql
-	use pgsql
-	after mta
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
 }
 
-checkconfig() {
-	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
-		eerror "You need to create apropriate config"
-		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
-		return 1
-	fi
-	# Avoid using root's TMPDIR
-	unset TMPDIR
-}
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
 
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
 
 start() {
-	checkconfig && \
-	ebegin "Starting DBMail POP3 daemon"
-	    start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dbmail-pop3d \
-		--name dbmail-pop3d \
-		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
-	eend $?
-}	
+	initService
+        ebegin "Starting DBMail POP3 daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
 
 stop() {
-	ebegin "Stopping DBMail POP3 daemon"
-	    start-stop-daemon --stop --quiet --retry 5 \
-		--pidfile ${PIDFILE}
-	eend $?
-}	
+        ebegin "Stopping DBMail POP3 daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
 
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail POP3 daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
index 325badb29fd4..83674b8f2767 100644
--- a/net-mail/dbmail/files/dbmail-timsieved.initd
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -1,39 +1,68 @@
 #!/sbin/runscript
 #
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-timsieved
+#
+
+
+PROGRAM=dbmail-timsieved
+
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
 
-PIDFILE="/var/run/dbmail-timsieved.pid"
+## not in 3.1.x yet
+#extra_started_commands="reload"
 
 depend() {
-	need net
-	use mysql
-	use pgsql
-	after mta
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
 }
 
-checkconfig() {
-	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
-		eerror "You need to create apropriate config"
-		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
-		return 1
-	fi
-	# Avoid using root's TMPDIR
-	unset TMPDIR
-}
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
+    
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
 
+    RETVAL=0
+}
 
 start() {
-	checkconfig && \
-	ebegin "Starting DBMail SIEVE daemon"
-	    start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dbmail-timsieved \
-		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
-	eend $?
-}	
+	initService
+        ebegin "Starting DBMail SIEVE daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
 
 stop() {
-	ebegin "Stopping DBMail SIEVE daemon"
-	    start-stop-daemon --stop --quiet --retry 5 \
-		--pidfile ${PIDFILE}
-	eend $?
-}	
+        ebegin "Stopping DBMail SIEVE daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
 
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail SIEVE daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}