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-0029-update-description-of-pid-file-location-in-server-man-page b/mail/dbmail/files/patch-0029-update-description-of-pid-file-location-in-server-man-page
new file mode 100644
index 000000000000..7b88c134e424
--- /dev/null
+++ b/mail/dbmail/files/patch-0029-update-description-of-pid-file-location-in-server-man-page
@@ -0,0 +1,34 @@
+From 17c7e5f34b66cdfc4e9621cb69431ee657cfb346 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Fri, 22 Jul 2016 20:38:00 +0100
+Subject: [PATCH 29/33] update description of pid file location in server man
+ pages
+
+---
+ man/serveropts.txt | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git man/serveropts.txt man/serveropts.txt
+index b01400d..5e14527 100644
+--- man/serveropts.txt
++++ man/serveropts.txt
+@@ -3,10 +3,12 @@ OPTIONS
+ -------
+ 
+ -p pidfile::
+-  Specify an alternate pid file. The daemons are currently hardcoded
+-  to use /var/run/dbmail-<daemon> for their pid files, and will halt
+-  if the pid file cannot be written. Use the -p pidfile option to
+-  place the pid file in your system's preferred location.
++  Specify an alternate pid file. By default the daemons use dbmail-<daemon>.pid
++  for their pid files, saving them in the directory specified by the
++  pid_directory entry in dbmail.conf or if that does not exist the value set by
++  the configuration option --localstatedir, and will halt if the pid file
++  cannot be written. Use the -p pidfile option to place the pid file in
++  your system's preferred location.
+ 
+ -n::
+   No daemonize: inetd mode. The program remains attached to the console from
+-- 
+2.10.1 (Apple Git-78)
+