ports/187156: [maintainer-update] Update mail/dbmail to 3.1.11

[Alan Hicks]

>Number:         187156
>Category:       ports
>Synopsis:       [maintainer-update] Update mail/dbmail to 3.1.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 01 04:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Alan Hicks
>Release:        FreeBSD 9.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #0: Sat Jan 11 02:38:15 UTC 2014 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:
Upgrade mail/dbmail to 3.1.11
- fix caching of long (>255) UTF8 encoded headers
- actually allow setting sha512 passwords (bug #1040)
- fix a segfault in POP3 (bug #1043)
- improved handling of several network error conditions in the imap code
- fix a regression in handling of UTF7 encoded mailbox names
>How-To-Repeat:
>Fix:

Apply patch with --remove-empty-files as two previous patches are included

--- dbmail-3110-3111.diff begins here ---
diff -uNr /usr/ports/mail/dbmail/Makefile dbmail/Makefile
--- /usr/ports/mail/dbmail/Makefile	2014-02-25 18:39:00.000000000 +0000
+++ dbmail/Makefile	2014-02-28 10:57:56.000000000 +0000
@@ -2,8 +2,7 @@
 # $FreeBSD: head/mail/dbmail/Makefile 346059 2014-02-25 18:39:00Z pawel $
 
 PORTNAME=	dbmail
-PORTVERSION=	3.1.10
-PORTREVISION=	2
+PORTVERSION=	3.1.11
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/3.1/ \
 		http://git.dbmail.eu/paul/dbmail/snapshot/
diff -uNr /usr/ports/mail/dbmail/distinfo dbmail/distinfo
--- /usr/ports/mail/dbmail/distinfo	2014-01-23 22:52:32.000000000 +0000
+++ dbmail/distinfo	2014-02-28 10:58:20.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (dbmail-3.1.10.tar.gz) = 7a5b82eb8feb45faf215bebee7fb648092e5eaa71b2d5acd5826ca36d8e63f4f
-SIZE (dbmail-3.1.10.tar.gz) = 2397512
+SHA256 (dbmail-3.1.11.tar.gz) = 8c1b11f604447944ec23985a1ff30869a2cf58fb918f47d53bd7db4c610856d7
+SIZE (dbmail-3.1.11.tar.gz) = 2399545
diff -uNr /usr/ports/mail/dbmail/files/patch-src_db__dm.c dbmail/files/patch-src_db__dm.c
--- /usr/ports/mail/dbmail/files/patch-src_db__dm.c	2014-02-25 18:39:00.000000000 +0000
+++ dbmail/files/patch-src_db__dm.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-diff --git src/dm_db.c b/src/dm_db.c
-index 559d83c..529a48e 100644
---- src/dm_db.c
-+++ src/dm_db.c
-@@ -1832,7 +1832,9 @@ char * db_get_message_lines(uint64_t message_idnr, long lines)
- 		return NULL;
- 
- 	msg = dbmail_message_new(NULL);
--	msg = dbmail_message_retrieve(msg, physmessage_id);
-+	if (! (msg = dbmail_message_retrieve(msg, physmessage_id)))
-+		return NULL;
-+
- 	stream = msg->crlf;
- 
- 	if (lines >=0) {
diff -uNr /usr/ports/mail/dbmail/files/patch-src_pop3.c dbmail/files/patch-src_pop3.c
--- /usr/ports/mail/dbmail/files/patch-src_pop3.c	2014-02-25 18:39:00.000000000 +0000
+++ dbmail/files/patch-src_pop3.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-diff --git src/pop3.c src/pop3.c
-index 2b8792e..a09524e 100644
---- src/pop3.c
-+++ src/pop3.c
-@@ -302,7 +302,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...)
- 
- 	if (session->error_count >= MAX_ERRORS) {
- 		ci_write(ci, "-ERR too many errors\r\n");
--		client_session_bailout(&session);
- 		return -3;
- 	} 
- 	va_start(ap, formatstring);
-@@ -314,7 +313,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...)
- 	g_free(s);
- 
- 	if (ci->client_state & CLIENT_ERR) {
--		client_session_bailout(&session);
- 		return -3;
- 	}
- 
--- dbmail-3110-3111.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: