From 2496d7a5c9d9252fe4916998b898463de5abe7ce Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Tue, 20 Dec 2011 13:18:27 -0500
Subject: [PATCH] - update to alpha 2 - drop a couple of patches which were
 integrated for alpha 2

---
 .gitignore |  2 ++
 krb5.spec  | 21 +++++++++------------
 sources    |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff1d43a..cc71c3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,5 @@ krb5-1.8.3-pdf.tar.gz
 /krb5-1.10-alpha1.tar.gz
 /krb5-1.10-alpha1.tar.gz.asc
 /krb5-1.10-pdf.tar.bz2
+/krb5-1.10-alpha2.tar.gz
+/krb5-1.10-alpha2.tar.gz.asc
diff --git a/krb5.spec b/krb5.spec
index 00aa160..e764a81 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -15,11 +15,11 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.10
-Release: 0%{?dist}.alpha1.3
+Release: 0%{?dist}.alpha2.1
 # Maybe we should explode from the now-available-to-everybody tarball instead?
-# http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-alpha1-signed.tar
-Source0: krb5-%{version}-alpha1.tar.gz
-Source1: krb5-%{version}-alpha1.tar.gz.asc
+# http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-alpha2-signed.tar
+Source0: krb5-%{version}-alpha2.tar.gz
+Source1: krb5-%{version}-alpha2.tar.gz.asc
 Source2: kprop.service
 Source4: kadmin.service
 Source5: krb5kdc.service
@@ -57,8 +57,6 @@ Patch63: krb5-1.10-selinux-label.patch
 Patch71: krb5-1.9-dirsrv-accountlock.patch
 Patch75: krb5-pkinit-debug.patch
 Patch86: krb5-1.9-debuginfo.patch
-Patch92: krb5-1.10-alpha1-uninit.patch
-Patch93: http://web.mit.edu/kerberos/advisories/2011-007-patch.txt
 Patch100: krb5-trunk-7046.patch
 Patch101: krb5-trunk-7047.patch
 Patch102: krb5-trunk-7048.patch
@@ -205,7 +203,7 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %prep
-%setup -q -a 23 -n krb5-%{version}-alpha1
+%setup -q -a 23 -n krb5-%{version}-alpha2
 ln -s NOTICE LICENSE
 
 %patch60 -p1 -b .pam
@@ -227,14 +225,9 @@ ln -s NOTICE LICENSE
 %patch71 -p1 -b .dirsrv-accountlock
 #%patch75 -p1 -b .pkinit-debug
 %patch86 -p0 -b .debuginfo
-%patch93 -p1 -b .2011-007
 %patch100 -p1 -b .7046
 %patch101 -p1 -b .7047
 %patch102 -p1 -b .7048
-# XXX Temporary, backported from trunk.
-%patch92 -p1 -b .uninit
-# XXX Temporary, fixed properly in trunk.
-ln -s /usr/include/et/com_err.h src/include
 
 gzip doc/*.ps
 
@@ -745,6 +738,10 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Tue Dec 20 2011 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.alpha2.1
+- update to alpha 2
+- drop a couple of patches which were integrated for alpha 2
+
 * Tue Dec 13 2011 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.alpha1.3
 - pull in patch for RT#7046: tag a ccache containing credentials obtained via
   S4U2Proxy with the principal name of the proxying principal (part of #761317)
diff --git a/sources b/sources
index 36c92ae..6a3c615 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-fff5dd2e8833f8711ae67f07d7a446a4  krb5-1.10-alpha1.tar.gz
-cf2659adc8ddd8db9eca035a8f3bd58b  krb5-1.10-alpha1.tar.gz.asc
 75395af76f40b71834166770a663a64d  krb5-1.10-pdf.tar.bz2
+2686c4b7793fc643a9b6041e34ca532b  krb5-1.10-alpha2.tar.gz
+fa4e738b259d095de856a0a13af9d4b8  krb5-1.10-alpha2.tar.gz.asc