From 9eff14e4885b86d6f5a8b35c69ebaabd9e74df06 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Fri, 24 Feb 2017 21:15:52 +0000 Subject: 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 --- ...ch-0027-ensure-mailbox2dbmail-is-using-Python-2 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 mail/dbmail/files/patch-0027-ensure-mailbox2dbmail-is-using-Python-2 (limited to 'mail/dbmail/files/patch-0027-ensure-mailbox2dbmail-is-using-Python-2') diff --git a/mail/dbmail/files/patch-0027-ensure-mailbox2dbmail-is-using-Python-2 b/mail/dbmail/files/patch-0027-ensure-mailbox2dbmail-is-using-Python-2 new file mode 100644 index 000000000000..7077be3c31a5 --- /dev/null +++ b/mail/dbmail/files/patch-0027-ensure-mailbox2dbmail-is-using-Python-2 @@ -0,0 +1,22 @@ +From 650dd4bd29c245a290a9e3f2dc4b0f734de22b69 Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Sat, 23 Jul 2016 17:32:43 +0100 +Subject: [PATCH 27/33] ensure mailbox2dbmail is using Python 2 + +--- + contrib/mailbox2dbmail/mailbox2dbmail | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git contrib/mailbox2dbmail/mailbox2dbmail contrib/mailbox2dbmail/mailbox2dbmail +index 6babffd..fa5c59d 100755 +--- contrib/mailbox2dbmail/mailbox2dbmail ++++ contrib/mailbox2dbmail/mailbox2dbmail +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + # Copyright (C) 2004 Dan Weber + # Copyright (C) 2012 Paul J Stevens +-- +2.10.1 (Apple Git-78) + -- cgit v1.2.3