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

(Portage version: 2.1.9.18/cvs/Linux x86_64)

2 files changed, 163 insertions, 1 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/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
+}