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, 25 insertions, 0 deletions

diff --git a/mail/dbmail/files/patch-0020-Reduce-failed-LDAP-connection-for-search-to-error b/mail/dbmail/files/patch-0020-Reduce-failed-LDAP-connection-for-search-to-error
new file mode 100644
index 000000000000..16e0daed9619
--- /dev/null
+++ b/mail/dbmail/files/patch-0020-Reduce-failed-LDAP-connection-for-search-to-error
@@ -0,0 +1,25 @@
+From 7daaac91d559f15a476c39f52228cc643f4608ba Mon Sep 17 00:00:00 2001
+From: Alan Hicks <ahicks@p-o.co.uk>
+Date: Tue, 18 Oct 2016 13:38:04 +0100
+Subject: [PATCH 20/33] Reduce failed LDAP connection for search to error
+
+---
+ src/modules/authldap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/modules/authldap.c src/modules/authldap.c
+index 065ee31..fc9db8e 100644
+--- src/modules/authldap.c
++++ src/modules/authldap.c
+@@ -299,7 +299,7 @@ static LDAPMessage * authldap_search(const gchar *query)
+ 		sleep(1); // Search failed. Wait before trying again.
+ 	}
+ 
+-	TRACE(TRACE_EMERG,"unrecoverable error while talking to ldap server");
++	TRACE(TRACE_ERR,"unrecoverable error while talking to ldap server");
+ 	return NULL;
+ }
+ 
+-- 
+2.10.1 (Apple Git-78)
+