[krb5] Update to 1.12 beta2

[Nalin Dahyabhai]

commit f002059e62561e7b9874feea85e111cf96716f97
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Mon Dec 2 11:47:40 2013 -0500

    Update to 1.12 beta2
    
    - drop obsolete backports for storing KDC time offsets and expiration times
      in keyring credential caches

 .gitignore                           |    3 +
 krb5-master-keyring-expiration.patch |  127 --------------
 krb5-master-keyring-offsets.patch    |  311 ----------------------------------
 krb5.spec                            |   19 +-
 sources                              |    6 +-
 5 files changed, 16 insertions(+), 450 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d4d1e76..17f91bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,6 @@ krb5-1.8.3-pdf.tar.gz
 /krb5-1.12-beta1.tar.gz
 /krb5-1.12-beta1.tar.gz.asc
 /krb5-1.12-beta1-pdf.tar.xz
+/krb5-1.12-beta2.tar.gz
+/krb5-1.12-beta2.tar.gz.asc
+/krb5-1.12-beta2-pdf.tar.xz
diff --git a/krb5.spec b/krb5.spec
index 1c6900b..33d75be 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -41,11 +41,11 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.12
-Release: 0%{?dist}.beta1.0
+Release: 0%{?dist}.beta2.0
 # Maybe we should explode from the now-available-to-everybody tarball instead?
-# http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12-beta1-signed.tar
-Source0: krb5-%{version}-beta1.tar.gz
-Source1: krb5-%{version}-beta1.tar.gz.asc
+# http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12-beta2-signed.tar
+Source0: krb5-%{version}-beta2.tar.gz
+Source1: krb5-%{version}-beta2.tar.gz.asc
 # Use a dummy krb5-%{version}-pdf.tar.xz the first time through, then
 #  tar cvJf $RPM_SOURCE_DIR/krb5-%%{version}-pdf.tar.xz build-pdf/*.pdf
 # after the build phase finishes.
@@ -90,8 +90,6 @@ Patch86: krb5-1.9-debuginfo.patch
 Patch105: krb5-kvno-230379.patch
 Patch129: krb5-1.11-run_user_0.patch
 Patch134: krb5-1.11-kpasswdtest.patch
-Patch138: krb5-master-keyring-offsets.patch
-Patch139: krb5-master-keyring-expiration.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -283,7 +281,7 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %prep
-%setup -q -n %{name}-%{version}-beta1 -a 3 -a 100
+%setup -q -n %{name}-%{version}-beta2 -a 3 -a 100
 ln -s NOTICE LICENSE
 
 %patch60 -p1 -b .pam
@@ -308,8 +306,6 @@ ln -s NOTICE LICENSE
 %patch129 -p1 -b .run_user_0
 
 %patch134 -p1 -b .kpasswdtest
-%patch138 -p1 -b .keyring-offsets
-%patch139 -p1 -b .keyring-expiration
 
 # Take the execute bit off of documentation.
 chmod -x doc/krb5-protocol/*.txt
@@ -958,6 +954,11 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Mon Dec  2 2013 Nalin Dahyabhai <nalin at redhat.com> - 1.12-beta2.0
+- update to beta2
+  - drop obsolete backports for storing KDC time offsets and expiration times
+    in keyring credential caches
+
 * Tue Nov 19 2013 Nalin Dahyabhai <nalin at redhat.com> - 1.12-beta1.0
 - rebase to master
 - update to beta1
diff --git a/sources b/sources
index c4a2d5e..f232621 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-f0f5329199f62d9fcf68e02780c8e2e3  krb5-1.12-beta1.tar.gz
-1d812e9438bcc73e8d15ed8836cb1510  krb5-1.12-beta1.tar.gz.asc
-8b4dc313aded04f51f16605c898005d6  krb5-1.12-beta1-pdf.tar.xz
+a57f18b52d7c4003597149a6bf234eaf  krb5-1.12-beta2.tar.gz
+c2ec45e0d4716c2c7b5fee439c518574  krb5-1.12-beta2.tar.gz.asc
+a180d63232603651ce1cedb5f216b388  krb5-1.12-beta2-pdf.tar.xz
 0d676f5babfc3c5f9e685d6538850021  nss_wrapper-0.0-20130719153839Z.git6cb59864.bz2