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

diff --git a/mail/dbmail/files/patch-0018-Add-definition-for-authldap_free b/mail/dbmail/files/patch-0018-Add-definition-for-authldap_free
new file mode 100644
index 000000000000..c0f86c1e3b2b
--- /dev/null
+++ b/mail/dbmail/files/patch-0018-Add-definition-for-authldap_free
@@ -0,0 +1,63 @@
+From cf3b24b2ea79c262c7827a954da9105a21b2c7d7 Mon Sep 17 00:00:00 2001
+From: Alan Hicks <ahicks@p-o.co.uk>
+Date: Fri, 14 Oct 2016 13:59:56 +0100
+Subject: [PATCH 18/33] Add definition for authldap_free
+
+---
+ src/modules/authldap.c | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git src/modules/authldap.c src/modules/authldap.c
+index 2bf3b95..065ee31 100644
+--- src/modules/authldap.c
++++ src/modules/authldap.c
+@@ -28,22 +28,7 @@
+ 
+ extern char configFile[PATH_MAX];
+ 
+-/*
+- signal-safe releasing of thread-local ldap connection
+-*/
+-static void authldap_free(gpointer data)
+-{
+-	LDAP *c = (LDAP *)data;
+-	struct sigaction act, oldact;
+-
+-	memset(&act, 0, sizeof(act));
+-	memset(&oldact, 0, sizeof(oldact));
+-	act.sa_handler = SIG_IGN;
+-	sigaction(SIGPIPE, &act, &oldact);
+-	ldap_unbind(c);
+-	sigaction(SIGPIPE, &oldact, 0);
+-}
+-
++static void authldap_free(gpointer data);
+ static GPrivate ldap_conn_key = G_PRIVATE_INIT (authldap_free);
+ static GOnce ldap_conn_once = G_ONCE_INIT;
+ static int authldap_connect(void);
+@@ -177,6 +162,22 @@ static LDAP * ldap_con_get(void)
+ }
+ 
+ /*
++ signal-safe releasing of thread-local ldap connection
++*/
++static void authldap_free(gpointer data)
++{
++	LDAP *c = (LDAP *)data;
++	struct sigaction act, oldact;
++
++	memset(&act, 0, sizeof(act));
++	memset(&oldact, 0, sizeof(oldact));
++	act.sa_handler = SIG_IGN;
++	sigaction(SIGPIPE, &act, &oldact);
++	ldap_unbind(c);
++	sigaction(SIGPIPE, &oldact, 0);
++}
++
++/*
+  * auth_ldap_bind()
+  *
+  * Bind to server using config credentials
+-- 
+2.10.1 (Apple Git-78)
+