From: Tom Yu <tlyu@mit.edu>
Date: Wed, 30 Nov 2016 23:39:32 +0000 (-0500)
Subject: Updates for krb5-1.15
X-Git-Tag: krb5-1.15-final
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3051931836c20208100b8f9d938145c6c5c702e8;p=thirdparty%2Fkrb5.git

Updates for krb5-1.15
---

diff --git a/README b/README
index 157e8e3970..4b4a7d6523 100644
--- a/README
+++ b/README
@@ -73,8 +73,8 @@ from using single-DES cryptosystems.  Among these is a configuration
 variable that enables "weak" enctypes, which defaults to "false"
 beginning with krb5-1.8.
 
-Major changes in 1.15
----------------------
+Major changes in 1.15 (2016-12-01)
+----------------------------------
 
 Administrator experience:
 
@@ -213,6 +213,8 @@ krb5-1.15 changes by ticket ID
 8513    Add doxygen comments for RFC 8009, RFC 4757
 8514    Make zap() more reliable
 8516    Fix declaration without type in t_shs3.c
+8520    Relicense ccapi/common/win/OldCC/autolock.hxx
+8521    Allow slapd path configuration in t_kdb.py
 
 
 Acknowledgements
diff --git a/src/patchlevel.h b/src/patchlevel.h
index 324c53e8f5..1f9c5653e4 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,6 +52,6 @@
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 15
 #define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "beta2-postrelease"
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.15"
+#define KRB5_RELTAG "krb5-1.15-final"
diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index b1fa3c3f55..e5983b654e 100644
--- a/src/po/mit-krb5.pot
+++ b/src/po/mit-krb5.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mit-krb5 1.15-beta2\n"
+"Project-Id-Version: mit-krb5 1.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-14 22:12-0500\n"
+"POT-Creation-Date: 2016-12-01 14:29-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"