From 9eff14e4885b86d6f5a8b35c69ebaabd9e74df06 Mon Sep 17 00:00:00 2001
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
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
---
 ...atch-0099-Allow-for-systems-that-don-t-use-proc | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 mail/dbmail/files/patch-0099-Allow-for-systems-that-don-t-use-proc

(limited to 'mail/dbmail/files/patch-0099-Allow-for-systems-that-don-t-use-proc')

diff --git a/mail/dbmail/files/patch-0099-Allow-for-systems-that-don-t-use-proc b/mail/dbmail/files/patch-0099-Allow-for-systems-that-don-t-use-proc
new file mode 100644
index 000000000000..13ae81dc7d2a
--- /dev/null
+++ b/mail/dbmail/files/patch-0099-Allow-for-systems-that-don-t-use-proc
@@ -0,0 +1,35 @@
+From 6169c48e7815f7e999e23f65c91ab7299f437b7a Mon Sep 17 00:00:00 2001
+From: Alan Hicks <ahicks@p-o.co.uk>
+Date: Sun, 15 Jan 2017 14:29:20 +0000
+Subject: [PATCH 27/27] Allow for systems that don't use proc
+
+---
+ src/dm_misc.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git src/dm_misc.c src/dm_misc.c
+index e795de1..1599c64 100644
+--- src/dm_misc.c
++++ src/dm_misc.c
+@@ -106,6 +106,10 @@ int drop_privileges(char *newuser, char *newgroup)
+ 
+ int get_opened_fd_count(void)
+ {
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__SUNPRO_C)
++	// BSD like systems don't use proc
++	return 0;
++#else
+ 	DIR* dir = NULL;
+ 	struct dirent* entry = NULL;
+ 	char buf[32];
+@@ -122,6 +126,7 @@ int get_opened_fd_count(void)
+ 	closedir(dir);
+ 
+ 	return fd_count - 2; /* exclude '.' and '..' entries */
++#endif
+ }
+ 
+ void create_unique_id(char *target, uint64_t message_idnr)
+-- 
+2.10.1 (Apple Git-78)
+
-- 
cgit v1.2.3