- bump to 1.6.1

3 files changed, 16 insertions, 17 deletions

diff --git a/.cvsignore b/.cvsignore
index 465c84a..5ad5d1a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,6 @@ krb5-1.5.tar.gz.asc
 krb5-1.6.tar.gz
 krb5-1.6.tar.gz.asc
 krb5-1.6-pdf.tar.gz
+krb5-1.6.1.tar.gz
+krb5-1.6.1.tar.gz.asc
+krb5-1.6.1-pdf.tar.gz
diff --git a/krb5.spec b/krb5.spec
index aa8ba5b..0df39c6 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -14,8 +14,8 @@
 
 Summary: The Kerberos network authentication system.
 Name: krb5
-Version: 1.6
-Release: 6
+Version: 1.6.1
+Release: 0
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -46,7 +46,7 @@ Source22: ekrb5-telnet.xinetd
 Source23: krb5-%{version}-pdf.tar.gz
 Source24: krb5-tex-pdf.sh
 
-Patch2: krb5-1.3-manpage-paths.patch
+Patch2: krb5-1.6-manpage-paths.patch
 Patch3: krb5-1.3-netkit-rsh.patch
 Patch4: krb5-1.3-rlogind-environ.patch
 Patch5: krb5-1.3-ksu-access.patch
@@ -74,14 +74,11 @@ Patch40: krb5-1.4.1-telnet-environ.patch
 Patch41: krb5-1.2.7-login-lpass.patch
 Patch44: krb5-1.4.3-enospc.patch
 Patch45: krb5-1.5-gssinit.patch
-Patch46: krb5-1.6-fix-sendto_kdc-memset.dif
 Patch47: krb5-1.6-sort-of-static.patch
-Patch48: krb5-1.6-CVE-2007-0956-prelim.patch
-Patch49: krb5-1.6-CVE-2007-0957-prelim.patch
-Patch50: krb5-1.6-CVE-2007-1216-prelim.patch
 Patch51: krb5-1.6-ldap-init.patch
 Patch52: krb5-1.6-ldap-man.patch
 Patch53: krb5-1.6-nodeplibs.patch
+Patch55: krb5-1.6.1-empty.patch
 
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
@@ -196,6 +193,11 @@ installed on systems which are meant provide these services.
 %endif
 
 %changelog
+* Wed May 23 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.1-1
+- update to 1.6.1
+  - drop no-longer-needed patches for CVE-2007-0956,CVE-2007-0957,CVE-2007-1216
+  - drop patch for sendto bug in 1.6, fixed in 1.6.1
+
 * Fri May 18 2007 Nalin Dahyabhai <nalin@redhat.com>
 - kadmind.init: don't fail outright if the default principal database
   isn't there if it looks like we might be using the kldap plugin
@@ -1109,16 +1111,13 @@ installed on systems which are meant provide these services.
 %patch41 -p1 -b .login-lpass
 %patch44 -p1 -b .enospc
 %patch45 -p1 -b .gssinit
-%patch46 -p0 -b .kpasswd
 %if %{build_static}
 %patch47 -p1 -b .sort-of-static
 %endif
-%patch48 -p0 -b .CVE-2007-0956
-%patch49 -p0 -b .CVE-2007-0957
-%patch50 -p0 -b .CVE-2007-1216
 %patch51 -p0 -b .ldap_init
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
+#%patch55 -p1 -b .empty
 cp src/krb524/README README.krb524
 gzip doc/*.ps
 
diff --git a/sources b/sources
index 4108339..8e99f9f 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,3 @@
-fe62bcd315fe4139e4fa05732ce8abde  krb5-1.5.tar.gz
-86a3c9ef729920279a45d0573055bf99  krb5-1.5.tar.gz.asc
-18da410f1e0a4500b0f3d4020567ce99  krb5-1.5-pdf.tar.gz
-b84d437c4a67240c70e370f557f561de  krb5-1.6.tar.gz
-4b79615e695c55216f25058a03f6dfde  krb5-1.6.tar.gz.asc
-64195de6ac63f8fe8ecfc6a410219c9d  krb5-1.6-pdf.tar.gz
+165bfd13e77d63e623810a3abe43ad61  krb5-1.6.1.tar.gz
+8249f522570f8b17f056bc8a5408678d  krb5-1.6.1.tar.gz.asc
+06835fe8a0ac3455dfaf9c6073f1f54c  krb5-1.6.1-pdf.tar.gz