From 1509d3a863c6aef224bf694dfadd3a5844b08a3e Mon Sep 17 00:00:00 2001
From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Tue, 6 Sep 2005 13:21:06 +0000
Subject: [PATCH] Dragonfly config files + several changes in ChangeLog.

---
 doc/doc-txt/ChangeLog     | 16 ++++++++++++++--
 src/OS/Makefile-DragonFly | 32 ++++++++++++++++++++++++++++++++
 src/OS/os.h-DragonFly     | 12 ++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 src/OS/Makefile-DragonFly
 create mode 100644 src/OS/os.h-DragonFly

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index e2720feac..67ca2e71b 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.215 2005/09/01 08:40:54 tom Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.216 2005/09/06 13:21:06 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -124,7 +124,8 @@ PH/29 Added "crypteq" to the list of supported features that Exim outputs when
 
 PH/30 Fixed (presumably very longstanding) bug in exim_dbmbuild: if it failed
       because an input line was too long, either on its own, or by virtue of
-      too many continuations, the temporary file was not being removed.
+      too many continuations, the temporary file was not being removed, and the
+      return code was incorrect.
 
 PH/31 Missing "BOOL" in function definition in filtertest.c.
 
@@ -132,6 +133,17 @@ PH/32 Applied Sieve patches from the maintainer.
 
 TK/05 Domainkeys: Accomodate for a minor API change in libdomainkeys 0.67.
 
+PH/33 Added "verify = not_blind".
+
+PH/34 There are settings for CHOWN_COMMAND and MV_COMMAND that can be used in
+      Local/Makefile (with some defaults set). These are used in built scripts
+      such as exicyclog, but they have never been used in the exim_install
+      script (though there are many overriding facilities there). I have
+      arranged that the exim_install script now takes note of these two
+      settings.
+
+PH/35 Installed configuration files for Dragonfly.
+
 
 Exim version 4.52
 -----------------
diff --git a/src/OS/Makefile-DragonFly b/src/OS/Makefile-DragonFly
new file mode 100644
index 000000000..c5e9aac4b
--- /dev/null
+++ b/src/OS/Makefile-DragonFly
@@ -0,0 +1,32 @@
+# $Cambridge: exim/src/OS/Makefile-DragonFly,v 1.1 2005/09/06 13:21:07 ph10 Exp $
+
+# Exim: OS-specific make file for DragonFly
+# There's no setting of CFLAGS here, to allow the system default
+# for "make" to be the default.
+
+CHOWN_COMMAND=/usr/sbin/chown
+
+HAVE_SA_LEN=YES
+
+# crypt() is in a separate library
+LIBS=-lcrypt -lm
+
+# DragonFly always ships with Berkeley DB
+USE_DB=yes
+
+# X11 may be under /usr/pkg/xorg/ for example.
+# X11=/usr/X11R6
+X11=$(X11BASE)
+
+XINCLUDE=-I$(X11)/include
+XLFLAGS=-L$(X11)/lib
+XLFLAGS+=-Wl,-rpath,${X11BASE}/lib
+X11_LD_LIB=$(X11)/lib
+
+EXIWHAT_PS_ARG=-ax
+EXIWHAT_EGREP_ARG='/exim( |$$)'
+EXIWHAT_MULTIKILL_CMD='killall -m'
+EXIWHAT_MULTIKILL_ARG='^exim($$|-[0-9.]+-[0-9]+$$)'
+EXIWHAT_KILL_SIGNAL=-USR1
+
+# End
diff --git a/src/OS/os.h-DragonFly b/src/OS/os.h-DragonFly
new file mode 100644
index 000000000..0821c481a
--- /dev/null
+++ b/src/OS/os.h-DragonFly
@@ -0,0 +1,12 @@
+/* $Cambridge: exim/src/OS/os.h-DragonFly,v 1.1 2005/09/06 13:21:07 ph10 Exp $ */
+
+/* Exim: OS-specific C header file for DragonFly */
+
+#define HAVE_BSD_GETLOADAVG
+#define HAVE_MMAP
+#define HAVE_SYS_MOUNT_H
+#define SIOCGIFCONF_GIVES_ADDR
+
+typedef struct flock flock_t;
+
+/* End */
-- 
2.25.1