[krb5] Update to 1.12 beta

[Nalin Dahyabhai]

commit 88c0c528bdd9ba718bde927febc03766e4e7b2d5
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Tue Nov 19 18:08:43 2013 -0500

    Update to 1.12 beta

 .gitignore                              |    3 +
 krb5-1.12-alpha-gss-ccache-import.patch |  129 -------------------------------
 krb5.spec                               |   19 +++--
 sources                                 |    6 +-
 4 files changed, 17 insertions(+), 140 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 377c28a..d4d1e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,6 @@ krb5-1.8.3-pdf.tar.gz
 /krb5-1.11.4.tar.gz
 /krb5-1.11.4.tar.gz.asc
 /krb5-1.11.4-pdf.tar.xz
+/krb5-1.12-beta1.tar.gz
+/krb5-1.12-beta1.tar.gz.asc
+/krb5-1.12-beta1-pdf.tar.xz
diff --git a/krb5.spec b/krb5.spec
index 19282a6..1c6900b 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -41,15 +41,15 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.12
-Release: 0%{?dist}.alpha1.0
+Release: 0%{?dist}.beta1.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-alpha1-signed.tar
-Source0: krb5-%{version}-alpha1.tar.gz
-Source1: krb5-%{version}-alpha1.tar.gz.asc
+# 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
 # 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.
-Source3: krb5-%{version}-alpha1-pdf.tar.xz
+Source3: krb5-%{version}-beta1-pdf.tar.xz
 Source2: kprop.service
 Source4: kadmin.service
 Source5: krb5kdc.service
@@ -92,7 +92,6 @@ 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
-Patch140: krb5-1.12-alpha-gss-ccache-import.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -284,7 +283,7 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %prep
-%setup -q -n %{name}-%{version}-alpha1 -a 3 -a 100
+%setup -q -n %{name}-%{version}-beta1 -a 3 -a 100
 ln -s NOTICE LICENSE
 
 %patch60 -p1 -b .pam
@@ -311,7 +310,6 @@ ln -s NOTICE LICENSE
 %patch134 -p1 -b .kpasswdtest
 %patch138 -p1 -b .keyring-offsets
 %patch139 -p1 -b .keyring-expiration
-%patch140 -p1 -b .gss-ccache-import
 
 # Take the execute bit off of documentation.
 chmod -x doc/krb5-protocol/*.txt
@@ -960,6 +958,11 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Tue Nov 19 2013 Nalin Dahyabhai <nalin at redhat.com> - 1.12-beta1.0
+- rebase to master
+- update to beta1
+  - drop obsolete backport of fix for RT#7706
+
 * Mon Nov 18 2013 Nalin Dahyabhai <nalin at redhat.com> - 1.11.4-2
 - pull in fix to store KDC time offsets in keyring credential caches (RT#7768,
   #1030607)
diff --git a/sources b/sources
index d2fa168..c4a2d5e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-81d38859182c1388c7126bdb975c678b  krb5-1.11.4.tar.gz
-1ac1512ea788e1747464d250d7734f1d  krb5-1.11.4.tar.gz.asc
-bcbc071bd1267fef501cf5c95d399305  krb5-1.11.4-pdf.tar.xz
+f0f5329199f62d9fcf68e02780c8e2e3  krb5-1.12-beta1.tar.gz
+1d812e9438bcc73e8d15ed8836cb1510  krb5-1.12-beta1.tar.gz.asc
+8b4dc313aded04f51f16605c898005d6  krb5-1.12-beta1-pdf.tar.xz
 0d676f5babfc3c5f9e685d6538850021  nss_wrapper-0.0-20130719153839Z.git6cb59864.bz2