Attachment 97909 Details for Bug 136724 – file.diff

[patch] file.diff

file.diff (text/plain), 4.55 KB, created by Mark Starovoytov on 2009-07-13 19:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Starovoytov

Created: 2009-07-13 19:20:03 UTC

Size: 4.55 KB

patch

obsolete

>diff -urN dbmail23.orig/Makefile dbmail23/Makefile
>--- dbmail23.orig/Makefile	Fri Jul 10 01:04:28 2009
>+++ dbmail23/Makefile	Mon Jul 13 21:17:29 2009
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	dbmail
>-PORTVERSION=	2.3.5
>-PORTREVISION=	3
>+PORTVERSION=	2.3.6
> CATEGORIES=	mail
> MASTER_SITES=	http://www.dbmail.org/download/2.3/
> 
>diff -urN dbmail23.orig/distinfo dbmail23/distinfo
>--- dbmail23.orig/distinfo	Tue Jan 27 01:03:54 2009
>+++ dbmail23/distinfo	Mon Jul 13 21:20:33 2009
>@@ -1,3 +1,3 @@
>-MD5 (dbmail-2.3.5.tar.gz) = a3d4a9ab37686e2f62726083b075ac61
>-SHA256 (dbmail-2.3.5.tar.gz) = 1fba44a0a41c324e60e01af5bffa388b0219491e6438135518241b24de205187
>-SIZE (dbmail-2.3.5.tar.gz) = 902269
>+MD5 (dbmail-2.3.6.tar.gz) = a2bbd25dde8774df7caefeda080569a9
>+SHA256 (dbmail-2.3.6.tar.gz) = 711816180faca944495a93355313311d8c8edb41d7d182179361802e7dd28e8b
>+SIZE (dbmail-2.3.6.tar.gz) = 916908
>diff -urN dbmail23.orig/files/patch-dm_db.c dbmail23/files/patch-dm_db.c
>--- dbmail23.orig/files/patch-dm_db.c	Mon Jan 26 03:03:48 2009
>+++ dbmail23/files/patch-dm_db.c	Thu Jan  1 03:00:00 1970
>@@ -1,114 +0,0 @@
>---- 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 -urN dbmail23.orig/files/patch-imap4.c dbmail23/files/patch-imap4.c
>--- dbmail23.orig/files/patch-imap4.c	Tue Jan 27 01:03:54 2009
>+++ dbmail23/files/patch-imap4.c	Mon Jul 13 21:27:37 2009
>@@ -1,11 +1,11 @@
>---- 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 @@
>+--- src/imap4.c.orig	Sun Jun 28 17:48:24 2009
>++++ src/imap4.c	Mon Jul 13 21:25:51 2009
>+@@ -204,7 +204,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);
>+ 	dbmail_imap_session_set_state(session,CLIENTSTATE_NON_AUTHENTICATED);
>  }

Actions: View | Diff

Attachments on bug 136724: 97909