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

diff --git a/mail/dbmail/files/patch-0028-tidy-mailbox2dbmail-man-page b/mail/dbmail/files/patch-0028-tidy-mailbox2dbmail-man-page
new file mode 100644
index 000000000000..7df8a75bf692
--- /dev/null
+++ b/mail/dbmail/files/patch-0028-tidy-mailbox2dbmail-man-page
@@ -0,0 +1,57 @@
+From 82b4d7ac22cccd411568e7ad471fc3aee93ef7a5 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Sat, 23 Jul 2016 17:33:25 +0100
+Subject: [PATCH 28/33] tidy mailbox2dbmail man page
+
+---
+ contrib/mailbox2dbmail/mailbox2dbmail.1  | 8 ++++----
+ contrib/mailbox2dbmail/mailbox2dbmail.yo | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git contrib/mailbox2dbmail/mailbox2dbmail.1 contrib/mailbox2dbmail/mailbox2dbmail.1
+index 0d35702..402ff34 100644
+--- contrib/mailbox2dbmail/mailbox2dbmail.1
++++ contrib/mailbox2dbmail/mailbox2dbmail.1
+@@ -9,15 +9,15 @@ Version info
+ .IP "\fB-h,--help\fP" 
+ Help Display
+ .IP "\fB-b,--box\fP" 
+-IMAP folder to stick mail in under user (Default: Inbox)
++IMAP folder to stick mail in under user (default: Inbox)
+ .IP "\fB-m,--mail\fP" 
+-Location of Mailbox(required)
++Location of Mailbox (required)
+ .IP "\fB-u,--user\fP" 
+-Username(required)
++Username (required)
+ .IP "\fB-t,--type\fP" 
+ Type of Mailbox: mbox, maildir, mhdir (required)
+ .IP "\fB-p,--path\fP" 
+-Path to dbmail-deliver(default: /usr/sbin/dbmail-deliver)
++Path to dbmail-deliver (default: /usr/sbin/dbmail-deliver)
+ .PP 
+ .SH "SEE ALSO" 
+ \fBpython(1)\fP, and \fBpydoc mailbox\fP
+diff --git contrib/mailbox2dbmail/mailbox2dbmail.yo contrib/mailbox2dbmail/mailbox2dbmail.yo
+index 46ad068..88c5fb1 100644
+--- contrib/mailbox2dbmail/mailbox2dbmail.yo
++++ contrib/mailbox2dbmail/mailbox2dbmail.yo
+@@ -6,11 +6,11 @@ manpageoptions()
+ startdit()
+ dit(bf(-v,--version)) Version info
+ dit(bf(-h,--help)) Help Display
+-dit(bf(-b,--box)) IMAP folder to stick mail in under user (Default: Inbox)
+-dit(bf(-m,--mail)) Location of Mailbox(required)
+-dit(bf(-u,--user)) Username(required)
++dit(bf(-b,--box)) IMAP folder to stick mail in under user (default: Inbox)
++dit(bf(-m,--mail)) Location of Mailbox (required)
++dit(bf(-u,--user)) Username (required)
+ dit(bf(-t,--type)) Type of Mailbox: mbox, maildir, mhdir (required)
+-dit(bf(-p,--path)) Path to dbmail-deliver(default: /usr/sbin/dbmail-deliver)
++dit(bf(-p,--path)) Path to dbmail-deliver (default: /usr/sbin/dbmail-deliver)
+ enddit()
+ 
+ manpageseealso()
+-- 
+2.10.1 (Apple Git-78)
+