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

diff --git a/mail/dbmail/files/patch-0016-Remove-redundant-event_assign b/mail/dbmail/files/patch-0016-Remove-redundant-event_assign
new file mode 100644
index 000000000000..c306826b06d1
--- /dev/null
+++ b/mail/dbmail/files/patch-0016-Remove-redundant-event_assign
@@ -0,0 +1,30 @@
+From 5be7e049c56442111a0a6ffa1d82b66a8547e6a8 Mon Sep 17 00:00:00 2001
+From: Alan Hicks <ahicks@p-o.co.uk>
+Date: Thu, 13 Oct 2016 16:09:49 +0100
+Subject: [PATCH 16/33] Remove redundant event_assign
+
+---
+ src/server.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git src/server.c src/server.c
+index ba8e5c5..a940030 100644
+--- src/server.c
++++ src/server.c
+@@ -826,13 +826,11 @@ int server_run(ServerConfig_T *conf)
+ 			for (i = 0; i < conf->socketcount; i++) {
+ 				TRACE(TRACE_DEBUG, "Adding event for plain socket [%d] [%d/%d]", conf->listenSockets[i], i+1, total);
+ 				evsock[i] = event_new(evbase, conf->listenSockets[i], EV_READ, server_sock_cb, NULL);
+-				event_assign(evsock[i], evbase, conf->listenSockets[i], EV_READ, server_sock_cb, evsock[i]);
+ 				event_add(evsock[i], NULL);
+ 			}
+ 			for (k = i, i = 0; i < conf->ssl_socketcount; i++, k++) {
+ 				TRACE(TRACE_DEBUG, "Adding event for ssl socket [%d] [%d/%d]", conf->ssl_listenSockets[i], k+1, total);
+ 				evsock[k] = event_new(evbase, conf->ssl_listenSockets[i], EV_READ, server_sock_ssl_cb, NULL);
+-				event_assign(evsock[k], evbase, conf->ssl_listenSockets[i], EV_READ, server_sock_ssl_cb, evsock[k]);
+ 				event_add(evsock[k], NULL);
+ 			}
+ 		}
+-- 
+2.10.1 (Apple Git-78)
+