README and patchlevel.h for krb5-1.5.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@19684 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/README b/README
index fa5e8fef171b0b8abba1ef752f99e92d95fb8bf4..34b1c43283d532b62c1132a0a14bb6b119b9aba9 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                  Kerberos Version 5, Release 1.5.3
+                  Kerberos Version 5, Release 1.5.4
 
                             Release Notes
                         The MIT Kerberos Team
@@ -7,20 +7,20 @@ Unpacking the Source Distribution
 ---------------------------------
 
 The source distribution of Kerberos 5 comes in a gzipped tarfile,
-krb5-1.5.3.tar.gz.  Instructions on how to extract the entire
+krb5-1.5.4.tar.gz.  Instructions on how to extract the entire
 distribution follow.
 
 If you have the GNU tar program and gzip installed, you can simply do:
 
-        gtar zxpf krb5-1.5.3.tar.gz
+        gtar zxpf krb5-1.5.4.tar.gz
 
 If you don't have GNU tar, you will need to get the FSF gzip
 distribution and use gzcat:
 
-        gzcat krb5-1.5.3.tar.gz | tar xpf -
+        gzcat krb5-1.5.4.tar.gz | tar xpf -
 
-Both of these methods will extract the sources into krb5-1.5.3/src and
-the documentation into krb5-1.5.3/doc.
+Both of these methods will extract the sources into krb5-1.5.4/src and
+the documentation into krb5-1.5.4/doc.
 
 Building and Installing Kerberos 5
 ----------------------------------
@@ -60,6 +60,20 @@ http://krbdev.mit.edu/rt/
 
 and logging in as "guest" with password "guest".
 
+Major changes in krb5-1.5.4
+---------------------------
+
+[5591]  (krb5-1.5.x) fix MITKRB5-SA-2007-004 [CVE-2007-2442/VU#356961,
+        CVE-2007-2443/VU#365313]
+[5592]  (krb5-1.5.x) fix MITKRB5-SA-2007-005 [CVE-2007-2798/VU#554257]
+
+krb5-1.5.4 changes by ticket ID
+-------------------------------
+
+5591    (krb5-1.5.x) fix MITKRB5-SA-2007-004 [CVE-2007-2442/VU#356961,
+        CVE-2007-2443/VU#365313]
+5592    (krb5-1.5.x) fix MITKRB5-SA-2007-005 [CVE-2007-2798/VU#554257]
+
 Major changes in krb5-1.5.3
 ---------------------------
 
@@ -76,11 +90,11 @@ Major changes in krb5-1.5.3
 krb5-1.5.3 changes by ticket ID
 -------------------------------
 
-5512   (krb5-1.5.x) MITKRB5-SA-2007-001: telnetd allows login as
+5512    (krb5-1.5.x) MITKRB5-SA-2007-001: telnetd allows login as
         arbitrary user
-5513   (krb5-1.5.x) MITKRB5-SA-2007-002: buffer overflow in
+5513    (krb5-1.5.x) MITKRB5-SA-2007-002: buffer overflow in
         krb5_klog_syslog
-5520   (krb5-1.5.x) MITKRB5-SA-2007-003: double-free in kadmind
+5520    (krb5-1.5.x) MITKRB5-SA-2007-003: double-free in kadmind
 
 Major changes in krb5-1.5.2
 ---------------------------

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 65552b52fb2cb73f35835cd7ef74b25cee83aca8..58864aa27d10e341213faa9544cc7a4d8d33e7ed 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,7 +52,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 5
-#define KRB5_PATCHLEVEL 3
-#undef KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 4
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "branches/krb5-1-5"
+#define KRB5_RELTAG "tags/krb5-1-5-4-final"