removed 3.0.2, added 3.1.12 + new init scripts

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

6 files changed, 256 insertions, 154 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/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 $?
+#}