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, 4 insertions, 4 deletions

diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4
index fcec2a2bccca..1c95e299b6d5 100644
--- a/mail/dbmail/files/patch-acinclude.m4
+++ b/mail/dbmail/files/patch-acinclude.m4
@@ -1,6 +1,6 @@
---- acinclude.m4.orig
+--- acinclude.m4.orig	2015-01-25 10:20:50 UTC
 +++ acinclude.m4
-@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
+@@ -221,7 +221,7 @@ if ( test [ "x$lookforldap" != "xno" ] |
          dnl See if we already have the paths we need in the environment.
  	dnl ...but only if --with-ldap was given without a specific path.
          if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
@@ -9,7 +9,7 @@
              if test [ "x$LDAPLIB" != "xfailed" ]; then
                  break
              fi
-@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
+@@ -233,7 +233,7 @@ if ( test [ "x$lookforldap" != "xno" ] |
              SAVE_CFLAGS=$CFLAGS
  	    dnl The headers might be in a funny place, so we need to use -Ipath
              CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
@@ -18,7 +18,7 @@
              CFLAGS=$SAVE_CFLAGS
              if test [ "x$LDAPLIB" != "xfailed" ]; then
                  break 2
-@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
+@@ -247,7 +247,7 @@ if ( test [ "x$lookforldap" != "xno" ] |
          AC_MSG_ERROR([Could not find LDAP library.])
      else
          AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])