net-mail/dbmail: version bump, message patch not needed anymore

svn path=/sunrise/; revision=3103

4 files changed, 17 insertions, 48 deletions

diff --git a/net-mail/dbmail/files/dbmail-2.2.2-messages.patch b/net-mail/dbmail/files/dbmail-2.2.2-messages.patch
deleted file mode 100644
index 3d85fc6bd..000000000
--- a/net-mail/dbmail/files/dbmail-2.2.2-messages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/dbmail-message.c b/dbmail-message.c
-index 21d5bcc..2feb35a 100644
---- a/dbmail-message.c
-+++ b/dbmail-message.c
-@@ -885,10 +885,14 @@ static int _header_get_id(const struct D
- 	u64_t tmp;
- 	gpointer cacheid;
- 	gchar *safe_header;
-+	gchar *tmpheader;
- 
--	if (! (safe_header = dm_strnesc(header,CACHE_WIDTH_NAME)))
-+	if (! (tmpheader = dm_strnesc(header,CACHE_WIDTH_NAME)))
- 		return -1;
- 
-+	safe_header = g_ascii_strdown(tmpheader,-1);
-+	g_free(tmpheader);
-+
- 	cacheid = g_hash_table_lookup(self->header_dict, (gconstpointer)safe_header);
- 	if (cacheid) {
- 		*id = GPOINTER_TO_UINT(cacheid);
-@@ -897,7 +901,7 @@ static int _header_get_id(const struct D
- 	}
- 		
- 	GString *q = g_string_new("");
--	g_string_printf(q, "SELECT id FROM %sheadername WHERE headername='%s'", DBPFX, safe_header);
-+	g_string_printf(q, "SELECT id FROM %sheadername WHERE lower(headername)='%s'", DBPFX, safe_header);
- 	if (db_query(q->str) == -1) {
- 		g_string_free(q,TRUE);
- 		g_free(safe_header);
diff --git a/net-mail/dbmail/files/dbmail-2.2.2-removeversion.patch b/net-mail/dbmail/files/dbmail-2.2.3-removeversion.patch
index 49d551708..4af96cbf2 100644
--- a/net-mail/dbmail/files/dbmail-2.2.2-removeversion.patch
+++ b/net-mail/dbmail/files/dbmail-2.2.3-removeversion.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ru dbmail-2.2.3.orig/imap4.c dbmail-2.2.3/imap4.c
+--- dbmail-2.2.3.orig/imap4.c	2007-02-28 11:34:28.000000000 +0100
++++ dbmail-2.2.3/imap4.c	2007-02-28 18:30:58.000000000 +0100
+@@ -117,8 +117,8 @@
  
  	/* greet user */
  	if (dbmail_imap_session_printf(session,
@@ -12,10 +12,10 @@ diff -ru dbmail-2.2.2.orig/imap4.c dbmail-2.2.2/imap4.c
  		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
+Only in dbmail-2.2.3/: imap4.c.orig
+diff -ru dbmail-2.2.3.orig/imapcommands.c dbmail-2.2.3/imapcommands.c
+--- dbmail-2.2.3.orig/imapcommands.c	2007-02-08 13:52:22.000000000 +0100
++++ dbmail-2.2.3/imapcommands.c	2007-02-28 18:30:58.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);
@@ -25,10 +25,9 @@ diff -ru dbmail-2.2.2.orig/imapcommands.c dbmail-2.2.2/imapcommands.c
  
  	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
+diff -ru dbmail-2.2.3.orig/lmtp.c dbmail-2.2.3/lmtp.c
+--- dbmail-2.2.3.orig/lmtp.c	2006-11-06 09:32:31.000000000 +0100
++++ dbmail-2.2.3/lmtp.c	2007-02-28 18:30:58.000000000 +0100
 @@ -134,7 +134,7 @@
  
  	if (ci->tx) {
@@ -38,9 +37,9 @@ diff -ru dbmail-2.2.2.orig/lmtp.c dbmail-2.2.2/lmtp.c
  		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
+diff -ru dbmail-2.2.3.orig/pop3.c dbmail-2.2.3/pop3.c
+--- dbmail-2.2.3.orig/pop3.c	2007-02-26 09:23:25.000000000 +0100
++++ dbmail-2.2.3/pop3.c	2007-02-28 18:30:58.000000000 +0100
 @@ -97,7 +97,7 @@
  
  	if (ci->tx) {
@@ -59,4 +58,3 @@ diff -ru dbmail-2.2.2.orig/pop3.c dbmail-2.2.2/pop3.c
  			fflush(ci->tx);
  			break;
  
-Only in dbmail-2.2.2: pop3.c.orig
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.2-r1 b/net-mail/dbmail/files/digest-dbmail-2.2.2-r1
deleted file mode 100644
index e68d6bb94..000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-dbmail-2.2.3 b/net-mail/dbmail/files/digest-dbmail-2.2.3
new file mode 100644
index 000000000..a916076aa
--- /dev/null
+++ b/net-mail/dbmail/files/digest-dbmail-2.2.3
@@ -0,0 +1,3 @@
+MD5 495c1ed9cc5645f2d4f2ff8aa7b389e7 dbmail-2.2.3.tar.gz 861514
+RMD160 8851e171093cb433faaa22034cf3624942c9589c dbmail-2.2.3.tar.gz 861514
+SHA256 dbbcc9af0ff20aebed956870db5fd499faa08a0486ff755e9d8901885e4d22b8 dbmail-2.2.3.tar.gz 861514