added 2.2.11_rc1 (bug # 233708) and 2.3.3

fixed init script for openrc (bug #225427)
fixed download url for 2.3.x
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.24-gentoo-r3 x86_64

6 files changed, 243 insertions, 8 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 19770bcc579f..3bab9abd7add 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.28 2008/05/21 18:57:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.29 2008/08/06 20:05:32 lordvan Exp $
+
+*dbmail-2.3.3 (06 Aug 2008)
+*dbmail-2.2.11_rc1 (06 Aug 2008)
+
+  06 Aug 2008; Thomas Raschbacher <lordvan@gentoo.org>
+  files/dbmail-timsieved.initd, +dbmail-2.2.11_rc1.ebuild,
+  dbmail-2.3.2.ebuild, +dbmail-2.3.3.ebuild:
+  Added 2.2.11 rc1 (Bug #233708 thanks to svrmarty <svrmarty@gmx.net>)
+  Added 2.3.3 devel release and fixed download url in 2.3.x
+  Fixed init script (Bug #225427 thanks to Chris Mayo
+  <mayo@clara.co.uk>)
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> dbmail-2.2.7.ebuild,
   dbmail-2.2.8.ebuild, dbmail-2.2.9.ebuild, dbmail-2.2.10.ebuild,
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index de70a57a1383..7ca1673498aa 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,16 +1,20 @@
 AUX dbmail-imapd.initd 730 RMD160 c6da3a0cda2e767853c0c3239287dd347bed6ccc SHA1 37679fabcf02e277d660fe57a41b9b54d7de963e SHA256 f8c16208f31495d2557e6ac101f1dd9f18636268511c889a0ad4dee0c56612da
 AUX dbmail-lmtpd.initd 730 RMD160 c0d1d8dee950e7e30deddd5df9772881154430db SHA1 60a1a2e8828cfbb3ef48e38a472f4ddc01c3cfb1 SHA256 2aedd5fecc1ef28289c870030c31f8ecaded4f2651be355a40216262a8a4d4a3
 AUX dbmail-pop3d.initd 730 RMD160 f8376e0dfa1a721cd4d99b3797f92c4c30285fd8 SHA1 35c6b6e2f40e42b61e3add7f4f4d5f231904c851 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52
-AUX dbmail-timsieved.initd 744 RMD160 0b733fba999532536b07a9ec5b572c362ed96f08 SHA1 5076a33925b43898e6f12cdc1c73e76fa406d6b8 SHA256 572358fcddea2981f29cd267c55e6de8e840f5442bcc8520ad40edfaed71577d
+AUX dbmail-timsieved.initd 716 RMD160 563e506fd21e97bc722aee4b0ccfe59846713440 SHA1 b1f93ac69a423d3a43cc1d5ffc942f58b60d6877 SHA256 c92cd221b37391703ec7aaff2eb3b33ed2b9b699a281f318f54ba6efd6e69224
 DIST dbmail-2.2.10.tar.gz 900636 RMD160 64eaa94824fe27f485de7bb8578c8656c4417e22 SHA1 421c39e49669677a4876f4faf57bbec14b4cd348 SHA256 f890167073498d87ea0ce374af2cf0498cfd7aa1af7aeb330726d1910de951b6
+DIST dbmail-2.2.11-rc1.tar.gz 900883 RMD160 37c4b85dac754f67520acfe1b3a79b6001a5ecdd SHA1 b43649abbb3079c4ec7793ef3b75a55fe59c217b SHA256 628dc9681339361f799dbdd8648689891ae76f0a1946e6d62ae4905bfdc50af3
 DIST dbmail-2.2.7.tar.gz 895586 RMD160 aac1d5a7d049b7384455b37e8380d4e57eae5164 SHA1 15d3bbd945ee09fdc36da6f988f2b4723bd1cc28 SHA256 9e2ab6d45eb841fc08b8d38a1a08fb95b3fdeae3fbc00c50b8acba624ff565e6
 DIST dbmail-2.2.8.tar.gz 898224 RMD160 ad740224581ee753354a629514ef09c42b06adaa SHA1 83927a431d8c7da47ab004ea4839dfe432095fab SHA256 d23649a9ccea9086943000fe7a74cead38544a2d19e721995772dcc57a4f5aeb
 DIST dbmail-2.2.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
 DIST dbmail-2.3.2.tar.gz 921616 RMD160 491008d66f9431ea66d2a79eb8fbf4215187adb3 SHA1 61578397f4a90f4f1d4bdc5c5a0574d36db96c49 SHA256 38739e32e209d30c8c4efdde4a7737d4c40fb36dd30b0e2dfd65993843b39fcb
+DIST dbmail-2.3.3.tar.gz 889218 RMD160 947653cd449037d99b70a30fa2ae71f7dfb54c49 SHA1 f6c42a4dc8d0cb402a9921ccdc0a231f2d2ca3d7 SHA256 9dd41b2910650661d1f439d21f2eee7d9ef4dc2043637d53eccaa7f52ae929cc
 EBUILD dbmail-2.2.10.ebuild 3476 RMD160 12c470583c968ca173fd9ca4b9f396e0f90fad72 SHA1 b3414abb98b152c49a78a75a124bd7299776869a SHA256 fd9f57192ac837b315f5d00ad411d1e2f12ffbefbfbca6eb810b16f5dabc38b3
+EBUILD dbmail-2.2.11_rc1.ebuild 3519 RMD160 849313c2c5de2ba977457042b3baa2898386f86e SHA1 e9c5231942f0e6ea812ef1a47653c424fb2ec0ae SHA256 85484bfb09144e69daa932e4135240c4b6b07dd7550b71460a117ec77777207c
 EBUILD dbmail-2.2.7.ebuild 3476 RMD160 0d5075ae02dab423cae06d21063f515dde9efed7 SHA1 dfc2c0f04b7f3902b103067714145070ce91627c SHA256 8cbd5cd152d147a96eaab5a23857dd08e49e5edd8e467154b8a9bd6f433653d3
 EBUILD dbmail-2.2.8.ebuild 3473 RMD160 701289ceb2f70f3f61b410ba71903bc5e52c126d SHA1 dbeb4efb299a246fa8483ceb7808dff15fd81a08 SHA256 6901cfc90d38aebf92708c836ee91de9a1cc3b8abb4f5c9d1e4318454252adb1
 EBUILD dbmail-2.2.9.ebuild 3473 RMD160 1939a13f7d4199f79cddced64932b2ada8322e60 SHA1 24237e06ce4fba22492b9e81890050c2bef518bb SHA256 5be166227344b2572d185c65814ad0c2a19b20d3beab3eb0e9b68ab394b27079
-EBUILD dbmail-2.3.2.ebuild 3503 RMD160 3137461490ffca56d9e69347fe594b25f5a2952d SHA1 31e0aed81a3d2ffaddc6d5d4e0bbeab5dd8902d7 SHA256 e6f05a9df315ab4f058ed7d05f43d79590595ef6a5c46e9809fa283b8788ca71
-MISC ChangeLog 5336 RMD160 91523f28e9ca415327807a1938ec66d4f1899579 SHA1 4c16c2753a86c7a4759c79f98918e307226f20e2 SHA256 cc264b30ad5a914b057b65ffd11e7f982c99bb7eb07a2fcf95e3908194668b18
+EBUILD dbmail-2.3.2.ebuild 3560 RMD160 074653f315859b19b7081b2f19583f29d9d20a83 SHA1 0069f73587479bce286ef942d943aca75aef6070 SHA256 6e33dacad1e5173cd946adc5ab67756985b3c2858851a6e3c54e27f56170d03a
+EBUILD dbmail-2.3.3.ebuild 3560 RMD160 e8cbaff7ed2b8894a2725f285aeae525e40c57e8 SHA1 d6a338a34cf37f30e260bd8ca96d58e428cfc5bf SHA256 5549f81aa0563224384d048d971bd58aaf566b2567f6279eb58d823f2bc98af9
+MISC ChangeLog 5764 RMD160 e7277a9a3862cf5a05f0cd1b6e3aa5e86fc01a85 SHA1 edae118b99b372fc08198a92c477a3412eaea13f SHA256 57d3534456c805d39191c1d568cf7fb3c4fb5893400a0b07a00907d6cc92e32e
 MISC metadata.xml 491 RMD160 7c82ebc22fb7f11153131770cb2da0c631e15166 SHA1 adbd2335fd20c417175644e3218d9f7d69a015c5 SHA256 970aa28bc8d7f62212d3e1fee873b8353cc5240d9d2233c9397492fb714f29eb
diff --git a/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild b/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild
new file mode 100644
index 000000000000..97210e49c851
--- /dev/null
+++ b/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild,v 1.1 2008/08/06 20:05:32 lordvan Exp $
+
+inherit eutils
+
+MY_P="${P/_/-}" # for rcX was without the - for versions < 2.2.6
+#MY_P="${P}" # releases
+DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap mysql postgres sieve sqlite3 ssl static"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	postgres? ( >=virtual/postgresql-server-7.4 )
+	mysql? ( >=virtual/mysql-4.1 )
+	sqlite3? ( >=dev-db/sqlite-3.0 )
+	!mysql? ( !postgres? ( !sqlite3? ( >=dev-db/sqlite-3.0 ) ) )
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	app-text/asciidoc
+	app-text/xmlto
+	sys-libs/zlib
+	>=dev-libs/gmime-2.1.18
+	>=dev-libs/glib-2.8"
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+}
+
+src_compile() {
+	use sqlite3 && myconf="--with-sqlite"
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		${myconf} \
+		$(use_enable static) \
+		$(use_with sieve) \
+		$(use_with ssl) \
+		$(use_with postgres pgsql) \
+		$(use_with mysql) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
+	dodoc sql/mysql/*
+	dodoc sql/postgresql/*
+	dodoc sql/sqlite/*
+
+	cp dbmail.conf.dist dbmail.conf
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup:dbmail:" dbmail.conf
+	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
+	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
+	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
+	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
+	elog "for remaining instructions on setting up dbmail users and "
+	elog "for finishing configuration to connect to your MTA and "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	echo
+	elog "Database schemes can be found in /usr/share/doc/${PF}/"
+	elog "You will also want to follow the installation instructions"
+	elog "on setting up the maintenance program to delete old messages."
+	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
+	echo
+	elog "For regular maintenance, add this to crontab:"
+	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
+	echo
+	elog "Please make sure to run etc-update."
+	elog "If you get an error message about plugins not found"
+	elog "please add the library_directory configuration switch to"
+	elog "dbmail.conf and set it to the correct path"
+	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
+	elog "A sample can be found in dbmail.conf.dist after etc-update."
+}
diff --git a/net-mail/dbmail/dbmail-2.3.2.ebuild b/net-mail/dbmail/dbmail-2.3.2.ebuild
index b60eb1e67807..bfc7a4944284 100644
--- a/net-mail/dbmail/dbmail-2.3.2.ebuild
+++ b/net-mail/dbmail/dbmail-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.3.2.ebuild,v 1.6 2008/05/21 18:57:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.3.2.ebuild,v 1.7 2008/08/06 20:05:32 lordvan Exp $
 
 inherit eutils
 
@@ -8,11 +8,11 @@ MY_P="${P/_/}" # for rcX
 #MY_P="${P}" # releases
 DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
 HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
+SRC_URI="http://www.dbmail.org/download/2.3/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-amd64 -x86"
+KEYWORDS="-x86 -amd64"
 IUSE="ldap mysql postgres sieve sqlite3 ssl static"
 
 DEPEND="ssl? ( dev-libs/openssl )
@@ -106,4 +106,6 @@ pkg_postinst() {
 	elog "dbmail.conf and set it to the correct path"
 	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
 	elog "A sample can be found in dbmail.conf.dist after etc-update."
+
+	ewarn "This is a Development release. use at own risk."
 }
diff --git a/net-mail/dbmail/dbmail-2.3.3.ebuild b/net-mail/dbmail/dbmail-2.3.3.ebuild
new file mode 100644
index 000000000000..5287f8d63499
--- /dev/null
+++ b/net-mail/dbmail/dbmail-2.3.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.3.3.ebuild,v 1.1 2008/08/06 20:05:32 lordvan Exp $
+
+inherit eutils
+
+MY_P="${P/_/}" # for rcX
+#MY_P="${P}" # releases
+DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="http://www.dbmail.org/download/2.3/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-x86 -amd64"
+IUSE="ldap mysql postgres sieve sqlite3 ssl static"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	postgres? ( >=virtual/postgresql-server-7.4 )
+	mysql? ( >=virtual/mysql-4.1 )
+	sqlite3? ( >=dev-db/sqlite-3.0 )
+	!mysql? ( !postgres? ( !sqlite3? ( >=dev-db/sqlite-3.0 ) ) )
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	app-text/asciidoc
+	app-text/xmlto
+	sys-libs/zlib
+	>=dev-libs/gmime-2.1.18
+	>=dev-libs/glib-2.8
+	>=app-crypt/mhash-0.9.9-r1"
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+}
+
+src_compile() {
+	use sqlite3 && myconf="--with-sqlite"
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		${myconf} \
+		$(use_enable static) \
+		$(use_with sieve) \
+		$(use_with ssl) \
+		$(use_with postgres pgsql) \
+		$(use_with mysql) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
+	dodoc sql/mysql/*
+	dodoc sql/postgresql/*
+	dodoc sql/sqlite/*
+
+	cp dbmail.conf.dist dbmail.conf
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup:dbmail:" dbmail.conf
+	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
+	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
+	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
+	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
+	elog "for remaining instructions on setting up dbmail users and "
+	elog "for finishing configuration to connect to your MTA and "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	echo
+	elog "Database schemes can be found in /usr/share/doc/${PF}/"
+	elog "You will also want to follow the installation instructions"
+	elog "on setting up the maintenance program to delete old messages."
+	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
+	echo
+	elog "For regular maintenance, add this to crontab:"
+	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
+	echo
+	elog "Please make sure to run etc-update."
+	elog "If you get an error message about plugins not found"
+	elog "please add the library_directory configuration switch to"
+	elog "dbmail.conf and set it to the correct path"
+	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
+	elog "A sample can be found in dbmail.conf.dist after etc-update."
+
+	ewarn "This is a Development release. use at own risk."
+}
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
index 3fc4e047cfd7..325badb29fd4 100644
--- a/net-mail/dbmail/files/dbmail-timsieved.initd
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -26,7 +26,6 @@ start() {
 	ebegin "Starting DBMail SIEVE daemon"
 	    start-stop-daemon --start --quiet \
 		--exec /usr/sbin/dbmail-timsieved \
-		--name dbmail-timsieved \
 		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
 	eend $?
 }