mail/dbmail: adopt latest fixes from git:

- login_disabled option before starttls for pop3
- fix compiler warnings for GCC5
- Fix IMAP mailbox maintanence
- prevent assertion in p_string_erase
- improve crypt authentication, also don't segfault when spasswd is empty
- simplify log_query_time duration logic
- Disconnect IMAP clients if only few free FDs left
- Add primary key constraint to dbmail_authlog
- Rework temporary connection failures
- Give sensible default for retry 120s
- Add retries for binding and searching
- Bump search timeout to 60s
- Increase ldap timeout to 600s 10 mins
- Refactor deprecated functions
- Get timeout from config
- Remove redundant event_assign
- Remove deprecated non functioning g_mem_profile
- Add definition for authldap_free
- Revert inadvertent event_assign removal
- Reduce failed LDAP connection for search to error
- Update LDAP to non deprecated search
- Clear the ldap connection
- Update ldap deprecated unbind
- Fix typo
- Update to ldap_unbind_ext_s and remove redundant sigaction
- Rebalance commit rollback
- Ensure mailbox2dbmail is using Python 2
- Tidy mailbox2dbmail man page
- Update description of pid file location in server man page
- Boundaries fixups ordering of parts do not add newline on
- Prepend headers during delivery
- Allow for systems that don't use proc

PR:		210274
Submitted by:	fluffy

1 files changed, 5 insertions, 5 deletions

diff --git a/mail/dbmail/files/patch-src_clientbase.c b/mail/dbmail/files/patch-src_clientbase.c
index 5bf60d5166b4..7363b1a736f0 100644
--- a/mail/dbmail/files/patch-src_clientbase.c
+++ b/mail/dbmail/files/patch-src_clientbase.c
@@ -1,6 +1,6 @@
---- src/clientbase.c.orig	2014-08-23 14:01:38.000000000 +0100
-+++ src/clientbase.c	2014-08-24 10:12:06.000000000 +0100
-@@ -151,7 +151,7 @@
+--- src/clientbase.c.orig	2015-01-25 10:20:50 UTC
++++ src/clientbase.c
+@@ -151,7 +151,7 @@ ClientBase_T * client_init(client_sock *
  		client->tx		= STDOUT_FILENO;
  	} else {
  		/* server-side */
@@ -9,7 +9,7 @@
  						NI_MAXHOST, client->dst_port, 
  						NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) {
  			TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ ClientBase_T * client_init(client_sock *
  
  		/* client-side */
  		if (server_conf->resolveIP) {
@@ -18,7 +18,7 @@
  						       	NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) {
  				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
  			} 
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ ClientBase_T * client_init(client_sock *
  					client->clientname[0] ? client->clientname : "Lookup failed");
  		} else {