From 7c6d71af3bd2663fed446b87f9231f39e818d93b Mon Sep 17 00:00:00 2001
From: Nigel Metheringham <nigel@exim.org>
Date: Sat, 14 Nov 2009 20:35:54 +0000
Subject: [PATCH] Changes to work towards a 4.71 release

---
 doc/doc-docbook/spec.xfpt |  6 +++---
 doc/doc-txt/ChangeLog     |  8 +++++++-
 doc/doc-txt/NewStuff      | 10 +++++++---
 src/src/version.c         |  4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 6a671cd42..984d63408 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1,4 +1,4 @@
-. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.66 2009/11/05 19:37:00 nm4 Exp $
+. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.67 2009/11/14 20:35:54 nm4 Exp $
 .
 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -48,7 +48,7 @@
 . /////////////////////////////////////////////////////////////////////////////
 
 .set previousversion "4.69"
-.set version "4.70"
+.set version "4.71"
 
 .set ACL "access control lists (ACLs)"
 .set I   "&nbsp;&nbsp;&nbsp;&nbsp;"
@@ -176,7 +176,7 @@
 <author><firstname>Exim</firstname><surname>Maintainers</surname></author>
 <authorinitials>EM</authorinitials>
 <revhistory><revision>
-  <revnumber>4.70</revnumber>
+  <revnumber>4.71</revnumber>
   <date>5 November 2009</date>
   <authorinitials>EM</authorinitials>
 </revision></revhistory>
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f7035532e..fa71148fa 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,8 +1,14 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.593 2009/11/13 15:58:16 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.594 2009/11/14 20:35:55 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
+Exim version 4.71
+-----------------
+
+TK/01 Bugzilla 912: Fix DKIM segfault on empty headers/body
+
+
 Exim version 4.70
 -----------------
 
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 583fe92f1..74f31065b 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.159 2008/10/16 07:57:01 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.160 2009/11/14 20:35:55 nm4 Exp $
 
 New Features in Exim
 --------------------
@@ -8,11 +8,15 @@ Before a formal release, there may be quite a lot of detail so that people can
 test from the snapshots or the CVS before the documentation is updated. Once
 the documentation is updated, this file is reduced to a short list.
 
+Version 4.71
+------------
+
 Version 4.70
 ------------
 
- 1. Preliminary SPF Best Guess support.  Documentation for this is in
-    experimental-spec.txt.
+ 1. Native DKIM support without an external library.
+
+ 2. Experimental DCC support via dccifd (contributed by Wolfgang Breyha).
 
 
 Version 4.68
diff --git a/src/src/version.c b/src/src/version.c
index 2b6a491d5..5321738d9 100644
--- a/src/src/version.c
+++ b/src/src/version.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/version.c,v 1.26 2009/10/14 11:34:57 nm4 Exp $ */
+/* $Cambridge: exim/src/src/version.c,v 1.27 2009/11/14 20:35:55 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -12,7 +12,7 @@
 #include "exim.h"
 
 
-#define THIS_VERSION  "4.70"
+#define THIS_VERSION  "4.71"
 
 
 /* The header file cnumber.h contains a single line containing the
-- 
2.25.1