From 712b0183e7a9cdf992092cb3670181b9d56c694a Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Mon, 20 Dec 2004 23:30:28 +0000
Subject: [PATCH] - 1.3.6 is out, obsoleting the patch. aargh! i mean, yay!

---
 .cvsignore |  2 ++
 krb5.spec  | 12 +++++-------
 sources    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ba95594..d1113eb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,5 @@
 krb5-1.3.4.tar.gz
 krb5-1.3.5.tar.gz
 krb5-1.3.5.tar.gz.asc
+krb5-1.3.6.tar.gz
+krb5-1.3.6.tar.gz.asc
diff --git a/krb5.spec b/krb5.spec
index cf929ff..aafe44a 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -6,8 +6,8 @@
 
 Summary: The Kerberos network authentication system.
 Name: krb5
-Version: 1.3.5
-Release: 7
+Version: 1.3.6
+Release: 0
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/www/dist/krb5/1.3/krb5-1.3.5.tar
 Source0: krb5-%{version}.tar.gz
@@ -58,8 +58,6 @@ Patch28: krb5-1.3.5-gethostbyname_r.patch
 Patch29: krb5-1.3.5-kprop-mktemp.patch
 Patch30: krb5-1.3.4-send-pr-tempfile.patch
 Patch31: krb5-1.3.5-krsh-deadlock.patch
-Patch32: http://web.mit.edu/kerberos/advisories/2004-004-patch_1.3.5.txt
-Patch33: http://web.mit.edu/kerberos/advisories/2004-004-patch_1.3.5.txt.asc
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
@@ -124,6 +122,9 @@ network uses Kerberos, this package should be installed on every
 workstation.
 
 %changelog
+* Mon Dec 20 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.6-1
+- update to 1.3.6, which includes the previous fix
+
 * Mon Dec 20 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.5-8
 - apply fix from Tom Yu for MITKRB5-SA-2004-004 (CAN-2004-1189)
 
@@ -776,9 +777,6 @@ workstation.
 %patch29 -p1 -b .kprop-mktemp
 %patch30 -p1 -b .send-pr-tempfile
 %patch31 -p1 -b .krsh-deadlock
-pushd src/lib/kadm5/srv
-%patch32 -p0 -b .2004-004
-popd
 cp src/krb524/README README.krb524
 find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
 gzip doc/*.ps
diff --git a/sources b/sources
index c169414..02f6542 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a60cd0b3453d960b5de2e060679ce1b5  krb5-1.3.5.tar.gz
-d10ce25419bffb22bf27e7f8373cf8b3  krb5-1.3.5.tar.gz.asc
+7974d0fc413802712998d5fc5eec2919  krb5-1.3.6.tar.gz
+d1f7009dbdefb81af13da3777feb9a09  krb5-1.3.6.tar.gz.asc