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

diff --git a/mail/dbmail/files/patch-0013-Increase-ldap-timeout-to-600s-10-mins b/mail/dbmail/files/patch-0013-Increase-ldap-timeout-to-600s-10-mins
new file mode 100644
index 000000000000..ee606d7204f7
--- /dev/null
+++ b/mail/dbmail/files/patch-0013-Increase-ldap-timeout-to-600s-10-mins
@@ -0,0 +1,34 @@
+From 9a13e4878b94b742e17519c2f4379ee5a3498a73 Mon Sep 17 00:00:00 2001
+From: Alan Hicks <ahicks@p-o.co.uk>
+Date: Tue, 11 Oct 2016 14:34:59 +0100
+Subject: [PATCH 13/33] Increase ldap timeout to 600s (10 mins)
+
+---
+ src/modules/authldap.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git src/modules/authldap.c src/modules/authldap.c
+index 2a39e0e..3f43a56 100644
+--- src/modules/authldap.c
++++ src/modules/authldap.c
+@@ -126,7 +126,7 @@ static LDAP * ldap_con_get(void)
+ 		return ld;
+ 	}
+ 	int c = 0;
+-	int c_tries = 120;
++	int c_tries = 600;
+ 	int err = -1; // Start wanting success
+ 	while (err != 0 && c++ < c_tries) {
+ 		// Loop until success or too many retries
+@@ -266,7 +266,7 @@ static LDAPMessage * authldap_search(const gchar *query)
+ 	char **_ldap_attrs = NULL;
+ 	int err = -1; // Start wanting success
+ 	int c = 0;
+-	int c_tries = 60;
++	int c_tries = 600;
+ 	LDAP *_ldap_conn;
+ 
+ 	g_return_val_if_fail(query!=NULL, NULL);
+-- 
+2.10.1 (Apple Git-78)
+