version bump to 2.2.17 + bugfixes from Eray Aslan fixes bugs #260122 and #330073

Package-Manager: portage-2.1.9.18/cvs/Linux x86_64

3 files changed, 166 insertions, 2 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 553a5e2d8cf1..ad7b7dacd0e4 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.40 2010/06/17 21:53:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.41 2010/10/14 13:36:07 lordvan Exp $
+
+*dbmail-2.2.17 (14 Oct 2010)
+
+  14 Oct 2010; <lordvan@gentoo.org> +dbmail-2.2.17.ebuild:
+  added dbmail-2.2.17 (fixes bug #260122 and bug #330073)
+  Thanks to Eray Aslan <eray.aslan@caf.com.tr> for the ebuild fixes
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> dbmail-2.2.9.ebuild,
   dbmail-2.2.11.ebuild, dbmail-2.2.15.ebuild:
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index a0b2acdcb9f6..fe91c0732b05 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -4,9 +4,11 @@ AUX dbmail-pop3d.initd 730 RMD160 f8376e0dfa1a721cd4d99b3797f92c4c30285fd8 SHA1
 AUX dbmail-timsieved.initd 716 RMD160 563e506fd21e97bc722aee4b0ccfe59846713440 SHA1 b1f93ac69a423d3a43cc1d5ffc942f58b60d6877 SHA256 c92cd221b37391703ec7aaff2eb3b33ed2b9b699a281f318f54ba6efd6e69224
 DIST dbmail-2.2.11.tar.gz 901705 RMD160 e8a506b850d1610b66059b685b7a2318ce5e37a9 SHA1 7b9c19de7ca14d849e8388377b8aa941f3f3538b SHA256 7d61ce32b5f1cbbc42fa39e3c1cc10659c524a7d3135555efe4b272064939148
 DIST dbmail-2.2.15.tar.gz 875592 RMD160 b0f2beb37566b9b2a650b90f5d8f011c93cd8be5 SHA1 d8b036edc6c39586d326cfa5b1c615e2edc71ff9 SHA256 ca88e4a3bc1360b3621ffd8567103668a896ecb22102d3886ab5e59e7747217b
+DIST dbmail-2.2.17.tar.gz 896838 RMD160 3014e82fc960a6e3896f9cecc4233b99ac2640f6 SHA1 be9b2bd2d2bd375a162a214cf51fbf8d4b0cf096 SHA256 11d457b0114047185aff4249afb6b91baf843b393e73ecbb147549960d7eaefd
 DIST dbmail-2.2.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
 EBUILD dbmail-2.2.11.ebuild 4853 RMD160 13a3c961bd644c7caf4872c96b4eb9328df2acf2 SHA1 ae1a6b7bdb45e0008a243240aff2fea3e4dc7c0f SHA256 2e0430c2bbd0b3ac57e63586d94c170102c3c0fa5a9719df4e32a964e8c7c0e5
 EBUILD dbmail-2.2.15.ebuild 4867 RMD160 720d09b7fa40820f7baed57509170fe73af18d64 SHA1 e057aed59bde2552e6cd3962f8358899f7e25862 SHA256 5e20e748506549806a9e59ce523ccb7093d6e14c667e29da1e79cee2b8a26583
+EBUILD dbmail-2.2.17.ebuild 4893 RMD160 39ad0744d9c84c2225f216b9d7bc5b03bf051238 SHA1 0b9375476144f8c66a85ef8af3f6c841e6d30577 SHA256 70a314778c083470797ed813e4c64c2348274283fabc8b6559995a95480254ab
 EBUILD dbmail-2.2.9.ebuild 3561 RMD160 e2287969280ea668e460c48ee241f7b754c9d458 SHA1 ff5e8dae99a4dbd6984f41fea676f0f4e3015248 SHA256 d3c8047d118921d089ac344dee4e9a6ea1e7544752cd13b81774260d373ac62c
-MISC ChangeLog 8417 RMD160 3c017833357900eaea0b7f4bcaad29494e6bb3ba SHA1 6cf2f414325d68eced6072983e7a22a7926c4b1f SHA256 07c7f49360286be898b637bea9fbe1dced550b72e421354b70dcbf021e00a4a0
+MISC ChangeLog 8633 RMD160 7550d87b9b9cef11ef2721fecf3a97550c2e5bc0 SHA1 64edd12d29bb3fd5ba342a8071fbb2357a2daf57 SHA256 bfb88d458e39d629b0265090a5b6d5aec4eb24c2569e1d984c282a0958431876
 MISC metadata.xml 580 RMD160 e824692f7f60c50f5afffb04e3ef2eb47c44efaf SHA1 96720e52cc8f2387b57f3db2e55e87a660aa1815 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14
diff --git a/net-mail/dbmail/dbmail-2.2.17.ebuild b/net-mail/dbmail/dbmail-2.2.17.ebuild
new file mode 100644
index 000000000000..ae491e54046e
--- /dev/null
+++ b/net-mail/dbmail/dbmail-2.2.17.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.17.ebuild,v 1.1 2010/10/14 13:36:07 lordvan Exp $
+
+EAPI="2"
+inherit eutils multilib python
+
+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/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap mysql postgres sieve +sqlite static python"
+
+DEPEND="postgres? ( dev-db/postgresql-server )
+	mysql? ( >=virtual/mysql-4.1 )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	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
+	sys-libs/zlib
+	>=dev-libs/gmime-2.2.10:0
+	>=dev-libs/glib-2.8"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+	if ! use postgres && ! use mysql && ! use sqlite; then
+		ewarn "No database backend selected.  Sqlite will be turned on..."
+	fi
+}
+
+src_configure() {
+	local myconf=""
+	if ! use postgres && ! use mysql && ! use sqlite; then
+		myconf="${myconf} --with-sqlite"
+	fi
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable static) \
+		$(use_with sieve) \
+		$(use_with postgres pgsql) \
+		$(use_with mysql) \
+		$(use_with sqlite) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING VERSION
+
+	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/quota_warn.pl
+
+	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
+
+	# 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
+	newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
+	newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+	doman man/*.{1,5,8}
+
+	# ldap schema
+	if use ldap; then
+	   insinto /etc/openldap/schema
+	   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
+}
+
+pkg_postinst() {
+	if use python; then
+	   python_mod_optimize $(python_get_sitedir)/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 "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite 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."
+	echo
+	elog "We are now using the init script from upstream."
+	elog "Please edit /etc/conf.d/dbmail to set which services to start"
+	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
+	elog "forget to rc-update del dbmail-* first)"
+}
+
+pkg_postrm() {
+	     python_mod_cleanup $(python_get_sitedir)/dbmail
+}