- update to 1.9.2, incorporating the recent security update and some of the things we were previously backporting, among other fixeskrb5-1.9.2-1.fc16

3 files changed, 12 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index a9eda7e..d483900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,6 @@ krb5-1.8.3-pdf.tar.gz
 /krb5-1.9.1.tar.gz
 /krb5-1.9.1.tar.gz.asc
 /krb5-1.9.1-pdf.tar.bz2
+/krb5-1.9.2.tar.gz
+/krb5-1.9.2.tar.gz.asc
+/krb5-1.9.2-pdf.tar.bz2
diff --git a/krb5.spec b/krb5.spec
index d670cb1..cbeea12 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -5,8 +5,8 @@
 
 Summary: The Kerberos network authentication system
 Name: krb5
-Version: 1.9.1
-Release: 19%{?dist}
+Version: 1.9.2
+Release: 1%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -53,17 +53,12 @@ Patch75: krb5-pkinit-debug.patch
 Patch77: krb5-1.9-paren.patch
 Patch78: krb5-trunk-chpw-err.patch
 Patch79: krb5-klist_s.patch
-Patch80: krb5-trunk-kadmin-oldproto.patch
-Patch81: krb5-1.9-canonicalize-fallback.patch
 Patch82: krb5-1.9.1-ai_addrconfig.patch
 Patch83: krb5-1.9.1-ai_addrconfig2.patch
 Patch84: krb5-1.9.1-sendto_poll.patch
-Patch85: krb5-trunk-gss_delete_sec.patch
 Patch86: krb5-1.9-debuginfo.patch
 Patch87: krb5-1.9.1-sendto_poll2.patch
-Patch88: krb5-1.9-crossrealm.patch
 Patch89: krb5-1.9.1-sendto_poll3.patch
-Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -214,17 +209,12 @@ ln -s NOTICE LICENSE
 %patch77 -p1 -b .paren
 %patch78 -p0 -b .chpw-err
 %patch79 -p1 -b .klist_s
-%patch80 -p0 -b .kadmin-oldproto
-%patch81 -p1 -b .canonicalize-fallback
 %patch82 -p0 -b .ai_addrconfig
 %patch83 -p0 -b .ai_addrconfig2
 %patch84 -p0 -b .sendto_poll
-%patch85 -p1 -b .gss_delete_sec
 %patch86 -p0 -b .debuginfo
 %patch87 -p1 -b .sendto_poll2
-%patch88 -p1 -b .crossrealm
 %patch89 -p1 -b .sendto_poll3
-%patch90 -p1 -b .2011-006
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -703,6 +693,10 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Wed Nov 15 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.2-9
+- update to 1.9.2, incorporating the recent security update and some of the
+  things we were previously backporting, among other fixes
+
 * Wed Nov 15 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-19
 - selinux: reset the creation context properly after expunging replay caches
   if they were previously set to the default value (#754001)
diff --git a/sources b/sources
index 3dcb78d..9c9e46f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-88d7bbb869849cd0cce1af3165ac0cc6  krb5-1.9.1.tar.gz
-a0bd0c8ff1a2d7e41be77b80e713c319  krb5-1.9.1.tar.gz.asc
-9d214707c921ba0887f92fb5408d0370  krb5-1.9.1-pdf.tar.bz2
+178dc5707db4139cbdf34b324dfbafb2  krb5-1.9.2.tar.gz
+687aa6ae280e6bded82f8c81eb12928b  krb5-1.9.2.tar.gz.asc
+016f9f00cd2426eb0c83077aa47bfae2  krb5-1.9.2-pdf.tar.bz2