10 files changed, 194 insertions, 44 deletions

diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile
index 1e56cfa239ef..a621af6a7248 100644
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.3/
 
 MAINTAINER=	mark_sf@kikg.ifmo.ru
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
+LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
 LIB_DEPENDS+=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
 LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
+LIB_DEPENDS+=	zdb-2.3:${PORTSDIR}/databases/libzdb
 
 CONFLICTS=	dbmail-*-2.0.* dbmail-2.1.* dbmail-2.2.*
 
@@ -40,7 +42,7 @@ CONFIGURE_ARGS+=--with-pkglibdir=${LOCALBASE}/lib/dbmail \
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
 
 MAIN_DOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
-		THANKS UPGRADING VERSION \
+		THANKS UPGRADING ChangeLog \
 		dbmail.schema
 ADDITIONAL_DOCS=README.aliases README.exim README.ldap \
 		README.postfix README.qmail README.sieve \
diff --git a/mail/dbmail23/distinfo b/mail/dbmail23/distinfo
index 7bdc474b7676..76e0806fba13 100644
--- a/mail/dbmail23/distinfo
+++ b/mail/dbmail23/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbmail-2.3.2.tar.gz) = bfa92e7a3f74be6a779c6ea9b730f114
-SHA256 (dbmail-2.3.2.tar.gz) = 38739e32e209d30c8c4efdde4a7737d4c40fb36dd30b0e2dfd65993843b39fcb
-SIZE (dbmail-2.3.2.tar.gz) = 921616
+MD5 (dbmail-2.3.5.tar.gz) = a3d4a9ab37686e2f62726083b075ac61
+SHA256 (dbmail-2.3.5.tar.gz) = 1fba44a0a41c324e60e01af5bffa388b0219491e6438135518241b24de205187
+SIZE (dbmail-2.3.5.tar.gz) = 902269
diff --git a/mail/dbmail23/files/patch-config.in b/mail/dbmail23/files/patch-config.in
new file mode 100644
index 000000000000..c05e70145967
--- /dev/null
+++ b/mail/dbmail23/files/patch-config.in
@@ -0,0 +1,12 @@
+--- config.in.orig	Tue Jan  6 14:55:07 2009
++++ config.in	Sun Jan 25 19:59:19 2009
+@@ -3,6 +3,9 @@
+ /* Define if LDAP will be used. */
+ #undef AUTHLDAP
+ 
++/* Includes the micro version */
++#undef DBMAIL_VERSION
++
+ /* Define to 1 if you have the <ConnectionPool.h> header file. */
+ #undef HAVE_CONNECTIONPOOL_H
+ 
diff --git a/mail/dbmail23/files/patch-configure b/mail/dbmail23/files/patch-configure
new file mode 100644
index 000000000000..04677dcb150a
--- /dev/null
+++ b/mail/dbmail23/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	Sun Jan 25 20:02:47 2009
++++ configure	Sun Jan 25 20:09:32 2009
+@@ -1852,6 +1852,11 @@
+ _ACEOF
+ 
+ 
++cat >>confdefs.h <<_ACEOF
++#define DBMAIL_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
diff --git a/mail/dbmail23/files/patch-dbmail.h.in b/mail/dbmail23/files/patch-dbmail.h.in
index aa628223e15b..db41ba4b2378 100644
--- a/mail/dbmail23/files/patch-dbmail.h.in
+++ b/mail/dbmail23/files/patch-dbmail.h.in
@@ -1,5 +1,5 @@
---- src/dbmail.h.in.orig	Mon Feb  4 17:37:40 2008
-+++ src/dbmail.h.in	Tue Feb  5 19:45:09 2008
+--- src/dbmail.h.in.orig	Sun Jan 25 18:53:26 2009
++++ src/dbmail.h.in	Sun Jan 25 18:53:12 2009
 @@ -72,6 +72,13 @@
  #include <time.h>
  #include <termios.h>
@@ -12,5 +12,5 @@
 +#undef PACKAGE_VERSION
 +#undef VERSION
  #include <mhash.h>
- 
- #ifdef AUTHLDAP
+ #include <event.h>
+ #include <math.h>
diff --git a/mail/dbmail23/files/patch-dm_db.c b/mail/dbmail23/files/patch-dm_db.c
new file mode 100644
index 000000000000..2daeb25fb510
--- /dev/null
+++ b/mail/dbmail23/files/patch-dm_db.c
@@ -0,0 +1,114 @@
+--- src/dm_db.c.orig	Tue Jan  6 14:51:55 2009
++++ src/dm_db.c	Sun Jan 25 19:25:06 2009
+@@ -312,8 +312,9 @@
+ 	TRACE(TRACE_DATABASE,"[%p] [%s]", c, query);
+ 	TRY
+ 		gettimeofday(&before, NULL);
+-		result = Connection_execute(c, query);
++		Connection_execute(c, query);
+ 		gettimeofday(&after, NULL);
++		result = TRUE;
+ 	CATCH(SQLException)
+ 		LOG_SQLERROR;
+ 		TRACE(TRACE_ERR,"failed query [%s]", query);
+@@ -395,26 +396,51 @@
+ int db_stmt_set_str(S s, int index, const char *x)
+ {
+ 	TRACE(TRACE_DATABASE,"[%p] %d:[%s]", s, index, x);
+-	return PreparedStatement_setString(s, index, x);
++	TRY
++		PreparedStatement_setString(s, index, x);
++		return TRUE;
++	CATCH(SQLException)
++		return FALSE;
++	END_TRY;
+ }
+ int db_stmt_set_int(S s, int index, int x)
+ {
+ 	TRACE(TRACE_DATABASE,"[%p] %d:[%d]", s, index, x);
+-	return PreparedStatement_setInt(s, index, x);
++	TRY
++		PreparedStatement_setInt(s, index, x);
++		return TRUE;
++	CATCH(SQLException)
++		return FALSE;
++	END_TRY;
+ }
+ int db_stmt_set_u64(S s, int index, u64_t x)
+ {	
+ 	TRACE(TRACE_DATABASE,"[%p] %d:[%llu]", s, index, x);
+-	return PreparedStatement_setLLong(s, index, (long long)x);
++	TRY
++		PreparedStatement_setLLong(s, index, (long long)x);
++		return TRUE;
++	CATCH(SQLException)
++		return FALSE;
++	END_TRY;
+ }
+ int db_stmt_set_blob(S s, int index, const void *x, int size)
+ {
+ //	TRACE(TRACE_DATABASE,"[%p] %d:[%s]", s, index, (const char *)x);
+-	return PreparedStatement_setBlob(s, index, x, size);
++	TRY
++		PreparedStatement_setBlob(s, index, x, size);
++		return TRUE;
++	CATCH(SQLException)
++		return FALSE;
++	END_TRY;
+ }
+ gboolean db_stmt_exec(S s)
+ {
+-	return PreparedStatement_execute(s);
++	TRY
++		PreparedStatement_execute(s);
++		return TRUE;
++	CATCH(SQLException)
++		return FALSE;
++	END_TRY;
+ }
+ R db_stmt_query(S s)
+ {
+@@ -474,28 +500,36 @@
+ int db_begin_transaction(C c)
+ {
+ 	TRACE(TRACE_DATABASE,"BEGIN");
+-	if (! Connection_beginTransaction(c))
++	TRY
++		Connection_beginTransaction(c);
++		return DM_SUCCESS;
++	CATCH(SQLException)
+ 		return DM_EQUERY;
+-	return DM_SUCCESS;
++	END_TRY;
+ }
+ 
+ int db_commit_transaction(C c)
+ {
+ 	TRACE(TRACE_DATABASE,"COMMIT");
+-	if (! Connection_commit(c)) {
++	TRY
++		Connection_commit(c);
++		return DM_SUCCESS;
++	CATCH(SQLException)
+ 		db_rollback_transaction(c);
+ 		return DM_EQUERY;
+-	}
+-	return DM_SUCCESS;
++	END_TRY;
+ }
+ 
+ 
+ int db_rollback_transaction(C c)
+ {
+ 	TRACE(TRACE_DATABASE,"ROLLBACK");
+-	if (! Connection_rollback(c))
++	TRY
++		Connection_rollback(c);
++		return DM_SUCCESS;
++	CATCH(SQLException)
+ 		return DM_EQUERY;
+-	return DM_SUCCESS;
++	END_TRY;
+ }
+ 
+ int db_savepoint(C UNUSED c, const char UNUSED *id)
diff --git a/mail/dbmail23/files/patch-imap4.c b/mail/dbmail23/files/patch-imap4.c
index 5177bb23f056..e3c1aab352dc 100644
--- a/mail/dbmail23/files/patch-imap4.c
+++ b/mail/dbmail23/files/patch-imap4.c
@@ -1,11 +1,11 @@
---- src/imap4.c.orig	Mon Feb  4 17:37:40 2008
-+++ src/imap4.c	Tue Feb  5 19:20:34 2008
-@@ -120,7 +120,7 @@
- 	} else {
- 		if (dbmail_imap_session_printf(session,
- 			     "* OK dbmail imap (protocol version 4r1) server %s "
--			     "ready to run\r\n", VERSION) < 0) {
-+			     "ready to run\r\n", DBMAIL_VERSION) < 0) {
- 			dbmail_imap_session_delete(session);
- 			return EOF;
- 		}
+--- src/imap4.c.orig	Tue Jan  6 14:51:55 2009
++++ src/imap4.c	Sun Jan 25 18:35:09 2009
+@@ -172,7 +172,7 @@
+ 	if (strlen(banner) > 0)
+ 		imap_session_printf(session, "* OK %s\r\n", banner);
+ 	else
+-		imap_session_printf(session, "* OK imap 4r1 server (dbmail %s)\r\n", VERSION);
++		imap_session_printf(session, "* OK imap 4r1 server (dbmail %s)\r\n", DBMAIL_VERSION);
+ 	dbmail_imap_session_set_state(session,IMAPCS_NON_AUTHENTICATED);
+ }
+ 
diff --git a/mail/dbmail23/files/patch-server.c b/mail/dbmail23/files/patch-server.c
new file mode 100644
index 000000000000..1ea63856e5c0
--- /dev/null
+++ b/mail/dbmail23/files/patch-server.c
@@ -0,0 +1,18 @@
+--- src/server.c.orig	Tue Jan  6 14:51:55 2009
++++ src/server.c	Sun Jan 25 19:39:58 2009
+@@ -423,7 +423,6 @@
+                 int serr=errno;
+                 switch(serr) {
+                         case ECONNABORTED:
+-                        case EPROTO:
+                         case EINTR:
+                                 TRACE(TRACE_DEBUG, "%s", strerror(serr));
+                                 break;
+@@ -462,7 +461,6 @@
+                 int serr=errno;
+                 switch(serr) {
+                         case ECONNABORTED:
+-                        case EPROTO:
+                         case EINTR:
+                                 TRACE(TRACE_DEBUG, "%s", strerror(serr));
+                                 break;
diff --git a/mail/dbmail23/files/patch-timsieve.c b/mail/dbmail23/files/patch-timsieve.c
index a8ddf0540305..62005ee1f3c5 100644
--- a/mail/dbmail23/files/patch-timsieve.c
+++ b/mail/dbmail23/files/patch-timsieve.c
@@ -1,11 +1,11 @@
---- src/timsieve.c.orig	Mon Feb  4 17:37:40 2008
-+++ src/timsieve.c	Tue Feb  5 19:19:12 2008
-@@ -40,7 +40,7 @@
- 	  if (strlen(banner) > 0) \
-             ci_write(stream, "\"IMPLEMENTATION\" \"%s\"\r\n", banner); \
- 	  else \
--            ci_write(stream, "\"IMPLEMENTATION\" \"DBMail timsieved v%s\"\r\n", VERSION); \
-+            ci_write(stream, "\"IMPLEMENTATION\" \"DBMail timsieved v%s\"\r\n", DBMAIL_VERSION); \
-           ci_write(stream, "\"SASL\" \"PLAIN\"\r\n"); \
-           ci_write(stream, "\"SIEVE\" \"%s\"\r\n", sieve_extensions); \
-           ci_write(stream, "OK\r\n")
+--- src/timsieve.c.orig	Tue Jan  6 14:51:55 2009
++++ src/timsieve.c	Sun Jan 25 18:38:52 2009
+@@ -69,7 +69,7 @@
+ 	if (strlen(banner) > 0)
+ 		ci_write(session->ci, "\"IMPLEMENTATION\" \"%s\"\r\n", banner);
+ 	else
+-		ci_write(session->ci, "\"IMPLEMENTATION\" \"DBMail timsieved %s\"\r\n", VERSION);
++		ci_write(session->ci, "\"IMPLEMENTATION\" \"DBMail timsieved %s\"\r\n", DBMAIL_VERSION);
+ 	ci_write(session->ci, "\"SASL\" \"PLAIN\"\r\n");
+ 	ci_write(session->ci, "\"SIEVE\" \"%s\"\r\n", sieve_extensions);
+ 	ci_write(session->ci, "OK\r\n");
diff --git a/mail/dbmail23/pkg-plist b/mail/dbmail23/pkg-plist
index f4958e25ea38..9416f9d27df7 100644
--- a/mail/dbmail23/pkg-plist
+++ b/mail/dbmail23/pkg-plist
@@ -14,22 +14,10 @@ lib/dbmail/libdbmail.a
 lib/dbmail/libdbmail.la
 lib/dbmail/libdbmail.so
 lib/dbmail/libdbmail.so.0
-%%MYSQL%%lib/dbmail/libmysql.a
-%%MYSQL%%lib/dbmail/libmysql.la
-%%MYSQL%%lib/dbmail/libmysql.so
-%%MYSQL%%lib/dbmail/libmysql.so.0
-%%PGSQL%%lib/dbmail/libpgsql.a
-%%PGSQL%%lib/dbmail/libpgsql.la
-%%PGSQL%%lib/dbmail/libpgsql.so
-%%PGSQL%%lib/dbmail/libpgsql.so.0
 %%SIEVE%%lib/dbmail/libsort_sieve.a
 %%SIEVE%%lib/dbmail/libsort_sieve.la
 %%SIEVE%%lib/dbmail/libsort_sieve.so
 %%SIEVE%%lib/dbmail/libsort_sieve.so.0
-%%SQLITE%%lib/dbmail/libsqlite.a
-%%SQLITE%%lib/dbmail/libsqlite.la
-%%SQLITE%%lib/dbmail/libsqlite.so
-%%SQLITE%%lib/dbmail/libsqlite.so.0
 @dirrm lib/dbmail
 sbin/dbmail-deliver
 sbin/dbmail-export
@@ -38,7 +26,6 @@ sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
 %%SIEVE%%sbin/dbmail-sievecmd
 %%SIEVE%%sbin/dbmail-timsieved
-sbin/dbmail-top
 sbin/dbmail-users
 sbin/dbmail-util
 @exec mkdir -p %D/share/%%PORTNAME%%
@@ -46,6 +33,7 @@ sbin/dbmail-util
 %%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/2_2_5-2_3_0.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/2_3_0-2_3_2.mysql
+%%MYSQL%%share/%%PORTNAME%%/mysql/2_3_4-2_3_5.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/fix_foreign_keys.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
@@ -55,6 +43,7 @@ sbin/dbmail-util
 %%PGSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/postgresql
 %%PGSQL%%share/%%PORTNAME%%/postgresql/2_1_7-2_2_0.pgsql
 %%PGSQL%%share/%%PORTNAME%%/postgresql/2_2_5-2_3_0.pgsql
+%%PGSQL%%share/%%PORTNAME%%/postgresql/2_3_4-2_3_5.pgsql
 %%PGSQL%%share/%%PORTNAME%%/postgresql/create_tables.pgsql
 %%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_1.x_to_2.0.pgsql
 %%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_2.0_to_2.2.pgsql
@@ -62,6 +51,7 @@ sbin/dbmail-util
 %%SQLITE%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/sqlite
 %%SQLITE%%share/%%PORTNAME%%/sqlite/2_1_7-2_2_0.sqlite
 %%SQLITE%%share/%%PORTNAME%%/sqlite/2_2_5-2_3_0.sqlite
+%%SQLITE%%share/%%PORTNAME%%/sqlite/2_3_4-2_3_5.sqlite
 %%SQLITE%%share/%%PORTNAME%%/sqlite/create_tables.sqlite
 %%SQLITE%%share/%%PORTNAME%%/sqlite/trigger.tmpl.sql
 %%SQLITE%%@dirrm share/%%PORTNAME%%/sqlite