net-mail/dbmail: Version Bump to 2.2.2

svn path=/sunrise/; revision=2881

5 files changed, 175 insertions, 4 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 8af8eee21..620b098c1 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2007; Martin Hierling <mad@cc.fh-luh.de> +dbmail-2.2.2.ebuild,
+  +files/removeversion-2.2.2.patch:
+  Version Bump to 2.2.2
+
   02 Jan 2007; Martin Hierling <mad@cc.fh-luh.de>
   files/removeversion-2.2.1.patch:
   removed some verbose server ident strings Removed some verbose server ident
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index c498bba61..85dd1ee71 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -18,15 +18,24 @@ AUX removeversion-2.2.1.patch 2139 RMD160 a96785267e466bfff3113a2a859ad0ae2c8dda
 MD5 b1e1aa07de88a660197082299000a633 files/removeversion-2.2.1.patch 2139
 RMD160 a96785267e466bfff3113a2a859ad0ae2c8dda3a files/removeversion-2.2.1.patch 2139
 SHA256 38aa22962dda1cc7f81f1e73d64335965aee40ef4b0782fb86c5225b5e4b3a79 files/removeversion-2.2.1.patch 2139
+AUX removeversion-2.2.2.patch 2294 RMD160 518c02c0a5aa9e0a174be8ff5e89563c2c888b46 SHA1 ed466f8ce11c574ad661e885a2e825dff9a89975 SHA256 9a5e8bf87a9e9d7ef6660d1ddb9b2976395f5a4242e9d7671b98afd3e6b388d5
+MD5 8b2e881603d8e403b101b9e2b7f19857 files/removeversion-2.2.2.patch 2294
+RMD160 518c02c0a5aa9e0a174be8ff5e89563c2c888b46 files/removeversion-2.2.2.patch 2294
+SHA256 9a5e8bf87a9e9d7ef6660d1ddb9b2976395f5a4242e9d7671b98afd3e6b388d5 files/removeversion-2.2.2.patch 2294
 DIST dbmail-2.2.1.tar.gz 848546 RMD160 41c08eaaf3033d5006cd74a6c106c64716421baf SHA1 5747d2af512d4dae73c055676fc9b60cea29fdaf SHA256 dd783cc7cb344a64a34e73721cfc4d95b0458d5465167ff07a592767e9b02074
+DIST dbmail-2.2.2.tar.gz 855310 RMD160 956525839081813d0bfe97b4a82da1d56f86975a SHA1 66ae8debf38efa3309bf7a26536053e5970abfa4 SHA256 fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2
 EBUILD dbmail-2.2.1.ebuild 2664 RMD160 77ca509a074b9da306d5fa15d47271d63fcbc7ed SHA1 0ffbd241a4213372882a3e4fd7f2955f6ff9b0f4 SHA256 b0e43262ad5b94ae31996d0e4322454876734d57e8cbaac1fd56b70df0ecc5f6
 MD5 961a7e05e3872dbe2ebb4194b0c69c38 dbmail-2.2.1.ebuild 2664
 RMD160 77ca509a074b9da306d5fa15d47271d63fcbc7ed dbmail-2.2.1.ebuild 2664
 SHA256 b0e43262ad5b94ae31996d0e4322454876734d57e8cbaac1fd56b70df0ecc5f6 dbmail-2.2.1.ebuild 2664
-MISC ChangeLog 2054 RMD160 383d237bf1950511344c6e6f31468fa706321cdf SHA1 68b56b466c0db66a9c8629441fe04ad6cf2ee68a SHA256 d29167d73dc0a4d61ff24d71de87097194c0b9f2d974d27255085b814c15fc5f
-MD5 fb7b43d9874c4feccb272612531b6dde ChangeLog 2054
-RMD160 383d237bf1950511344c6e6f31468fa706321cdf ChangeLog 2054
-SHA256 d29167d73dc0a4d61ff24d71de87097194c0b9f2d974d27255085b814c15fc5f ChangeLog 2054
+EBUILD dbmail-2.2.2.ebuild 2664 RMD160 77ca509a074b9da306d5fa15d47271d63fcbc7ed SHA1 0ffbd241a4213372882a3e4fd7f2955f6ff9b0f4 SHA256 b0e43262ad5b94ae31996d0e4322454876734d57e8cbaac1fd56b70df0ecc5f6
+MD5 961a7e05e3872dbe2ebb4194b0c69c38 dbmail-2.2.2.ebuild 2664
+RMD160 77ca509a074b9da306d5fa15d47271d63fcbc7ed dbmail-2.2.2.ebuild 2664
+SHA256 b0e43262ad5b94ae31996d0e4322454876734d57e8cbaac1fd56b70df0ecc5f6 dbmail-2.2.2.ebuild 2664
+MISC ChangeLog 2187 RMD160 49f3e09ace71011285500e9d85177bd93d640357 SHA1 a31f80330fac041581544ce7b1b5e130dd39094d SHA256 a260be17073defb80e11d9339c634f078fc8c62c3fca99e146470e4a8e534d9d
+MD5 ecd580d7b0be458ad64c0310fb4b5e84 ChangeLog 2187
+RMD160 49f3e09ace71011285500e9d85177bd93d640357 ChangeLog 2187
+SHA256 a260be17073defb80e11d9339c634f078fc8c62c3fca99e146470e4a8e534d9d ChangeLog 2187
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -34,3 +43,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 4246d40cb7075fe6088535b853dd98f6 files/digest-dbmail-2.2.1 238
 RMD160 e574001abbead03c4d9a333c0b81f97eb022d0fe files/digest-dbmail-2.2.1 238
 SHA256 86419db59f0505b592baabb5ec5d8db0b18c521c9d59ef967f1666008a8d0262 files/digest-dbmail-2.2.1 238
+MD5 e64fe5bb4817c023f165c12671c99fd3 files/digest-dbmail-2.2.2 238
+RMD160 22e610bf69823bc5dcb2a07781a19467b1c09707 files/digest-dbmail-2.2.2 238
+SHA256 bc6a03dd8a741abb35402dfc1fc46755bb100527b2bd4066c7384803b57c941b files/digest-dbmail-2.2.2 238
diff --git a/net-mail/dbmail/dbmail-2.2.2.ebuild b/net-mail/dbmail/dbmail-2.2.2.ebuild
new file mode 100644
index 000000000..87c78daca
--- /dev/null
+++ b/net-mail/dbmail/dbmail-2.2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+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="~x86"
+IUSE="ldap mysql postgres sieve sqlite3 ssl static"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	postgres? ( >=dev-db/postgresql-7.4 )
+	mysql? ( >=virtual/mysql-4.1 )
+	sqlite3? ( >=dev-db/sqlite-3.0 )
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	app-text/asciidoc
+	app-text/xmlto
+	sys-libs/zlib
+	>=dev-libs/gmime-2.1
+	>=dev-libs/glib-2.8"
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1  /var/lib/dbmail dbmail
+}
+
+src_compile() {
+	epatch "${FILESDIR}/removeversion-${PV}.patch"
+
+	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) \
+		$(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/*
+
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup:dbmail:" 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 "If you update from 2.1.7 please apply 2_1_7-2_2_0.<YOUR_DB>.gz"
+	elog "to your dbmail database and run dbmail-util -by ."
+	einfo
+	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."
+	einfo
+	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. :)"
+	elog ">>> --- For maintenance ---"
+	elog ">>> add this to crontab: 0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1 "
+}
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.2 b/net-mail/dbmail/files/digest-dbmail-2.2.2
new file mode 100644
index 000000000..e68d6bb94
--- /dev/null
+++ b/net-mail/dbmail/files/digest-dbmail-2.2.2
@@ -0,0 +1,3 @@
+MD5 7a1a0940d3ec07dc55c7e49412298b0a dbmail-2.2.2.tar.gz 855310
+RMD160 956525839081813d0bfe97b4a82da1d56f86975a dbmail-2.2.2.tar.gz 855310
+SHA256 fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2 dbmail-2.2.2.tar.gz 855310
diff --git a/net-mail/dbmail/files/removeversion-2.2.2.patch b/net-mail/dbmail/files/removeversion-2.2.2.patch
new file mode 100644
index 000000000..49d551708
--- /dev/null
+++ b/net-mail/dbmail/files/removeversion-2.2.2.patch
@@ -0,0 +1,62 @@
+diff -ru dbmail-2.2.2.orig/imap4.c dbmail-2.2.2/imap4.c
+--- dbmail-2.2.2.orig/imap4.c	2007-01-10 09:17:20.000000000 +0100
++++ dbmail-2.2.2/imap4.c	2007-02-01 18:31:11.000000000 +0100
+@@ -116,8 +116,8 @@
+ 
+ 	/* greet user */
+ 	if (dbmail_imap_session_printf(session,
+-		     "* OK dbmail imap (protocol version 4r1) server %s "
+-		     "ready to run\r\n", IMAP_SERVER_VERSION) < 0) {
++		     "* OK imap (protocol version 4r1) server "
++		     "ready \r\n", IMAP_SERVER_VERSION) < 0) {
+ 		dbmail_imap_session_delete(session);
+ 		return EOF;
+ 	}
+Only in dbmail-2.2.2: imap4.c.orig
+diff -ru dbmail-2.2.2.orig/imapcommands.c dbmail-2.2.2/imapcommands.c
+--- dbmail-2.2.2.orig/imapcommands.c	2006-12-10 22:36:03.000000000 +0100
++++ dbmail-2.2.2/imapcommands.c	2007-02-01 18:31:11.000000000 +0100
+@@ -111,7 +111,7 @@
+ 	dbmail_imap_session_set_state(self,IMAPCS_LOGOUT);
+ 	TRACE(TRACE_MESSAGE, "user (id:%llu) logging out @ [%s]", ud->userid, timestring);
+ 
+-	dbmail_imap_session_printf(self, "* BYE dbmail imap server kisses you goodbye\r\n");
++	dbmail_imap_session_printf(self, "* BYE\r\n");
+ 
+ 	return 0;
+ }
+Only in dbmail-2.2.2: imapcommands.c.orig
+diff -ru dbmail-2.2.2.orig/lmtp.c dbmail-2.2.2/lmtp.c
+--- dbmail-2.2.2.orig/lmtp.c	2006-11-06 09:32:31.000000000 +0100
++++ dbmail-2.2.2/lmtp.c	2007-02-01 18:31:11.000000000 +0100
+@@ -134,7 +134,7 @@
+ 
+ 	if (ci->tx) {
+ 		/* sending greeting */
+-		ci_write(ci->tx, "220 %s DBMail LMTP service ready to rock\r\n", myhostname);
++		ci_write(ci->tx, "220 %s LMTP service ready\r\n", myhostname);
+ 		fflush(ci->tx);
+ 	} else {
+ 		TRACE(TRACE_MESSAGE, "TX stream is null!");
+diff -ru dbmail-2.2.2.orig/pop3.c dbmail-2.2.2/pop3.c
+--- dbmail-2.2.2.orig/pop3.c	2007-01-20 09:43:22.000000000 +0100
++++ dbmail-2.2.2/pop3.c	2007-02-01 18:32:11.000000000 +0100
+@@ -97,7 +97,7 @@
+ 
+ 	if (ci->tx) {
+ 		/* sending greeting */
+-		fprintf(ci->tx, "+OK DBMAIL pop3 server ready to rock %s\r\n",
++		fprintf(ci->tx, "+OK pop3 server ready\r\n",
+ 			session.apop_stamp);
+ 		fflush(ci->tx);
+ 	} else {
+@@ -177,7 +177,7 @@
+ 
+ 			/* if everything went well, write down everything and do a cleanup */
+ 			db_update_pop(&session);
+-			fprintf(ci->tx, "+OK see ya later\r\n");
++			fprintf(ci->tx, "+OK bye\r\n");
+ 			fflush(ci->tx);
+ 			break;
+ 
+Only in dbmail-2.2.2: pop3.c.orig