[krb5/master-f15-1.9: 18/19] - update to beta 2

[Nalin Dahyabhai]

commit 695c21dd421d99cfbbb90e1a2c3c92ab01d6f8e0
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Mon Dec 6 16:53:51 2010 -0500

    - update to beta 2

 .gitignore                                         |    3 +++
 ...rop-mktemp.patch => krb5-1.9-kprop-mktemp.patch |    4 ++--
 krb5-1.8-ksu-path.patch => krb5-1.9-ksu-path.patch |    8 ++++----
 krb5.spec                                          |   17 ++++++++++-------
 sources                                            |    6 +++---
 5 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b242701..c87fadb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ krb5-1.8.2-pdf.tar.gz
 krb5-1.8.3.tar.gz
 krb5-1.8.3.tar.gz.asc
 krb5-1.8.3-pdf.tar.gz
+/krb5-1.9-beta2.tar.gz
+/krb5-1.9-beta2.tar.gz.asc
+/krb5-1.9-beta2-pdf.tar.bz2
diff --git a/krb5-1.8-kprop-mktemp.patch b/krb5-1.9-kprop-mktemp.patch
similarity index 91%
rename from krb5-1.8-kprop-mktemp.patch
rename to krb5-1.9-kprop-mktemp.patch
index 1a2606b..e0d034e 100644
--- a/krb5-1.8-kprop-mktemp.patch
+++ b/krb5-1.9-kprop-mktemp.patch
@@ -7,8 +7,8 @@ diff -up krb5-1.8/src/slave/kprop.c.kprop-mktemp krb5-1.8/src/slave/kprop.c
  void get_tickets(context)
      krb5_context context;
  {
--    char   buf[BUFSIZ];
-+    char buf[] = "MEMORY:_kproptkt";
+-    char   buf[BUFSIZ], *def_realm;
++    char buf[] = "MEMORY:_kproptkt", *def_realm;
      krb5_error_code retval;
 -    static char tkstring[] = "/tmp/kproptktXXXXXX";
      krb5_keytab keytab = NULL;
diff --git a/krb5-1.8-ksu-path.patch b/krb5-1.9-ksu-path.patch
similarity index 64%
rename from krb5-1.8-ksu-path.patch
rename to krb5-1.9-ksu-path.patch
index 0f4611a..6c46178 100644
--- a/krb5-1.8-ksu-path.patch
+++ b/krb5-1.9-ksu-path.patch
@@ -1,10 +1,10 @@
 Set the default PATH to the one set by login.
 
-diff -up krb5-1.8/src/clients/ksu/Makefile.in.ksu-path krb5-1.8/src/clients/ksu/Makefile.in
---- krb5-1.8/src/clients/ksu/Makefile.in.ksu-path	2010-03-05 10:58:25.000000000 -0500
-+++ krb5-1.8/src/clients/ksu/Makefile.in	2010-03-05 10:58:25.000000000 -0500
+diff -up krb5-1.9/src/clients/ksu/Makefile.in.ksu-path krb5-1.9/src/clients/ksu/Makefile.in
+--- krb5-1.9/src/clients/ksu/Makefile.in.ksu-path	2010-03-05 10:58:25.000000000 -0500
++++ krb5-1.9/src/clients/ksu/Makefile.in	2010-03-05 10:58:25.000000000 -0500
 @@ -1,6 +1,6 @@
- mydir=clients/ksu
+ mydir=clients$(S)ksu
  BUILDTOP=$(REL)..$(S)..
 -DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
 +DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/local/sbin /usr/local/bin /sbin /usr/sbin /bin /usr/bin"'
diff --git a/krb5.spec b/krb5.spec
index 8e133e4..0175d60 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -6,11 +6,11 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.9
-Release: 0%{?dist}.beta1.1
+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.9/krb5-1.9-beta1-signed.tar
-Source0: krb5-%{version}-beta1.tar.gz
-Source1: krb5-%{version}-beta1.tar.gz.asc
+# http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9-beta2-signed.tar
+Source0: krb5-%{version}-beta2.tar.gz
+Source1: krb5-%{version}-beta2.tar.gz.asc
 Source2: kpropd.init
 Source4: kadmind.init
 Source5: krb5kdc.init
@@ -32,11 +32,11 @@ Source33: krb5kdc.logrotate
 Source34: kadmind.logrotate
 
 Patch5: krb5-1.8-ksu-access.patch
-Patch6: krb5-1.8-ksu-path.patch
+Patch6: krb5-1.9-ksu-path.patch
 Patch12: krb5-1.7-ktany.patch
 Patch16: krb5-1.7-buildconf.patch
 Patch23: krb5-1.3.1-dns.patch
-Patch29: krb5-1.8-kprop-mktemp.patch
+Patch29: krb5-1.9-kprop-mktemp.patch
 Patch30: krb5-1.3.4-send-pr-tempfile.patch
 Patch39: krb5-1.8-api.patch
 Patch53: krb5-1.7-nodeplibs.patch
@@ -161,7 +161,7 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %prep
-%setup -q -a 23 -n krb5-%{version}-beta1
+%setup -q -a 23 -n krb5-%{version}-beta2
 ln -s NOTICE LICENSE
 
 %patch60 -p1 -b .pam
@@ -631,6 +631,9 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Mon Dec  6 2010 Nalin Dahyabhai <nalin at redhat.com> 1.9-0.beta2.0
+- update to 1.9 beta 2
+
 * Tue Nov  9 2010 Nalin Dahyabhai <nalin at redhat.com> 1.9-0.beta1.1
 - drop not-needed-since-1.8 build dependency on rsh (ssorce)
 
diff --git a/sources b/sources
index 8a2301d..7999329 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-82ba4f2d0f1294c293c8950273699baf  krb5-1.9-beta1.tar.gz
-9cbfa9872d119d8d6b5257238aae4740  krb5-1.9-beta1.tar.gz.asc
-d35f2aab55fcef566bd4fc03c68c383c  krb5-1.9-beta1-pdf.tar.bz2
+9e0ba1897233f1a8501fd2b418c83045  krb5-1.9-beta2.tar.gz
+8b6b7c991f6dffa46770385f232b5b17  krb5-1.9-beta2.tar.gz.asc
+7779a8ea30f107dba24c60ae667e097d  krb5-1.9-beta2-pdf.tar.bz2