Updates for krb5-1.12-beta1

diff --git a/README b/README
index 83767b6c58d0de5391e7bb71087e5dd11fa4359e..5aedab25af596215c4f35c0c0d98256295f15312 100644 (file)
--- a/README
+++ b/README
@@ -77,8 +77,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.12
----------------------
+Major changes in 1.12 (2013-11-08)
+----------------------------------
 
 Developer experience:
 
@@ -206,6 +206,21 @@ krb5-1.12 changes by ticket ID
 7709    Wrong order in kdc_check_transited_list()
 7712    KDC Audit infrastructure and plugin implementation
 7713    Fix audit test module initialization
+7715    Change KRB5KDC_ERR_NO_ACCEPTABLE_KDF to 100
+7718    Use protocol error for PKINIT cert expiry
+7719    Discuss cert expiry, no-key princs in PKINIT docs
+7722    Add missing entries to tests/gssapi Makefile.in
+7730    Fix typos in kdb5_util master key command outputs
+7732    Document master key rollover
+7733    afs3 salt contaminates later enctypes in the list at key
+        generation time
+7738    Fix decoding of mkey kvno in mkey_aux tl-data
+7739    Improve LDAP KDB initialization error messages
+7740    Accept anonymous GSS names in kadmind
+7741    Use correct default principal for kadmin -n
+7751    Clarify kpropd standalone mode documentation
+7755    Multi-realm KDC null deref [CVE-2013-1418]
+7759    Clarify realm and dbmodules configuration docs
 
 Acknowledgements
 ----------------
@@ -370,6 +385,7 @@ reports, suggestions, and valuable resources:
     Joel Johnson
     W. Trevor King
     Mikkel Kruse
+    Reinhard Kugler
     Volker Lendecke
     Jan iankko Lieskovsky
     Oliver Loch

diff --git a/src/patchlevel.h b/src/patchlevel.h
index fec2a5d2d85c6fa5797880b7924bb253e6dbc940..c653d25b5f67442e8474372b6c74719a8d887204 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,6 +52,6 @@
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 12
 #define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "alpha1-postrelease"
+#define KRB5_RELTAIL "beta1"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.12"
+#define KRB5_RELTAG "krb5-1.12-beta1"