From c8d52a009aa7bc80a1380adec35085755d389ea7 Mon Sep 17 00:00:00 2001
From: Phil Pennock <pdp@exim.org>
Date: Fri, 6 May 2011 06:24:14 -0400
Subject: [PATCH] Prep for 4.76 release. Version bumps, ChangeLog update.

---
 doc/doc-docbook/filter.xfpt | 6 +++---
 doc/doc-docbook/spec.xfpt   | 8 ++++----
 doc/doc-txt/ChangeLog       | 6 ++++++
 src/src/version.h           | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/doc/doc-docbook/filter.xfpt b/doc/doc-docbook/filter.xfpt
index 54b145944..42d2910a1 100644
--- a/doc/doc-docbook/filter.xfpt
+++ b/doc/doc-docbook/filter.xfpt
@@ -65,8 +65,8 @@
 <author><firstname>Philip</firstname><surname>Hazel</surname></author>
 <authorinitials>PH</authorinitials>
 <revhistory><revision>
-  <revnumber>4.75</revnumber>
-  <date>21 Feb 2011</date>
+  <revnumber>4.76</revnumber>
+  <date>06 May 2011</date>
   <authorinitials>PH</authorinitials>
 </revision></revhistory>
 <copyright><year>2010</year><holder>University of Cambridge</holder></copyright>
@@ -80,7 +80,7 @@
 .chapter "Forwarding and filtering in Exim" "CHAPforandfilt"
 This document describes the user interfaces to Exim's in-built mail filtering
 facilities, and is copyright &copy; University of Cambridge 2007. It
-corresponds to Exim version 4.75.
+corresponds to Exim version 4.76.
 
 
 
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 5cfa344c0..fb2721818 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -48,7 +48,7 @@
 . /////////////////////////////////////////////////////////////////////////////
 
 .set previousversion "4.75"
-.set version "4.75"
+.set version "4.76"
 
 .set ACL "access control lists (ACLs)"
 .set I   "&nbsp;&nbsp;&nbsp;&nbsp;"
@@ -172,12 +172,12 @@
 <bookinfo>
 <title>Specification of the Exim Mail Transfer Agent</title>
 <titleabbrev>The Exim MTA</titleabbrev>
-<date>21 Jan 2011</date>
+<date>06 May 2011</date>
 <author><firstname>Exim</firstname><surname>Maintainers</surname></author>
 <authorinitials>EM</authorinitials>
 <revhistory><revision>
-  <revnumber>4.75</revnumber>
-  <date>21 Feb 2011</date>
+  <revnumber>4.76</revnumber>
+  <date>06 May 2011</date>
   <authorinitials>EM</authorinitials>
 </revision></revhistory>
 <copyright><year>2011</year><holder>University of Cambridge</holder></copyright>
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 7bf9ebbed..98f5949a1 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -21,12 +21,18 @@ PP/05 Don't segfault on misconfiguration of ref:name exim-user as uid.
 PP/06 Extra paranoia around buffer usage at the STARTTLS transition.
       nb: Exim is not vulnerable to http://www.kb.cert.org/vuls/id/555316
 
+TK/01 Updated PolarSSL code to 0.14.2.
+      Bugzilla 1097. Patch from Andreas Metzler.
+
 PP/07 Catch divide-by-zero in ${eval:...}.
       Fixes bugzilla 1102.
 
 PP/08 Condition negation of bool{}/bool_lax{} did not negate.  Fixed.
       Bugzilla 1104.
 
+TK/02 Bugzilla 1106: CVE-2011-1764 - DKIM log line was subject to a
+      format-string attack.
+
 
 Exim version 4.75
 -----------------
diff --git a/src/src/version.h b/src/src/version.h
index b84d108c3..6c1cc556f 100644
--- a/src/src/version.h
+++ b/src/src/version.h
@@ -6,7 +6,7 @@
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This is bumped by the Exim Maintainers, the release engineer: */
-#define EXIM_RELEASE_VERSION_STR        "4.75"
+#define EXIM_RELEASE_VERSION_STR        "4.76"
 /* If you apply extensive local patches, consider putting -foo into here */
 #define EXIM_VARIANT_VERSION            ""
 
-- 
2.25.1