From ebe04b876725b2be92e111f0c058d651dd34519c Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Mon, 6 Feb 2012 23:59:36 +0000
Subject: [PATCH] README and patchlevel.h for krb5-1.8.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@25675 dc483132-0cff-0310-8789-dd5450dbe970
---
 README           | 23 ++++++++++++++++++++++-
 src/patchlevel.h |  6 +++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/README b/README
index a8f8e015e..b658a74aa 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@
 Copyright and Other Notices
 ---------------------------
 
-Copyright (C) 1985-2011 by the Massachusetts Institute of Technology
+Copyright (C) 1985-2012 by the Massachusetts Institute of Technology
 and its contributors.  All rights reserved.
 
 Please see the file named NOTICE for additional notices.
@@ -82,6 +82,20 @@ additional measures include:
   crypto
 * easier kadmin history key changes
 
+Major changes in 1.8.6
+----------------------
+
+This is primarily a bugfix release.
+
+krb5-1.8.6 changes by ticket ID
+-------------------------------
+
+7010    Fix intermediate key length in hmac-md5 checksum
+7011    Exit on error in kadmind kprop child
+7012    Fix month/year units in getdate
+7041    Fix failure interval of 0 in LDAP lockout code
+7070    krb5_server_decrypt_ticket_keytab wrongly succeeds
+
 Major changes in 1.8.5
 ----------------------
 
@@ -498,6 +512,7 @@ reports, suggestions, and valuable resources:
     Michael B Allen
     Heinz-Ado Arnolds
     Derek Atkins
+    Mark Bannister
     David Bantz
     Alex Baule
     Arlene Berry
@@ -537,7 +552,9 @@ reports, suggestions, and valuable resources:
     Philip Guenther
     Dominic Hargreaves
     Jakob Haufe
+    Paul B. Henson
     Jeff Hodges
+    Christopher Hogan
     Love Hörnquist Åstrand
     Ken Hornstein
     Henry B. Hotz
@@ -557,6 +574,7 @@ reports, suggestions, and valuable resources:
     Nathaniel McCallum
     Greg McClement
     Cameron Meadors
+    Alexey Melnikov
     Franklyn Mendez
     Markus Moeller
     Kyle Moffett
@@ -569,6 +587,7 @@ reports, suggestions, and valuable resources:
     Andrej Ota
     Dmitri Pal
     Javier Palacios
+    Tom Parker
     Ezra Peisach
     W. Michael Petullo
     Mark Phalan
@@ -588,6 +607,8 @@ reports, suggestions, and valuable resources:
     Jorgen Wahlsten
     Max (Weijun) Wang
     John Washington
+    Kevin Wasserman
+    Margaret Wasserman
     Marcus Watts
     Simon Wilkinson
     Nicolas Williams
diff --git a/src/patchlevel.h b/src/patchlevel.h
index aed442454..5bb336111 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,7 +52,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 8
-#define KRB5_PATCHLEVEL 5
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 6
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "branches/krb5-1-8"
+#define KRB5_RELTAG "tags/krb5-1-8-6-final"
-- 
2.26.2