Browse code

Upgrade krb5 to 1.14

Change-Id: I92f3c1066795ddc5b7a0dbb255c93ae3233e9dbc
Reviewed-on: http://photon-jenkins.eng.vmware.com/398
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

suezzelur authored on 2016/01/22 08:37:52
Showing 2 changed files
1 1
deleted file mode 100644
... ...
@@ -1,22 +0,0 @@
1
-diff -rupN krb5-1.12.2/src/lib/gssapi/mechglue/g_init_sec_context.c krb5-1.12.2-1/src/lib/gssapi/mechglue/g_init_sec_context.c
2
-+++ krb5-1.12.2-1/src/lib/gssapi/mechglue/g_init_sec_context.c	2015-01-22 21:15:40.413357199 -0800
3
-@@ -204,6 +204,18 @@ OM_uint32 *		time_rec;
4
-     input_cred_handle = gssint_get_mechanism_cred(union_cred, selected_mech);
5
- 
6
-     /*
7
-+     * If the mechanism is SPNEGO, and a SPNEGO specific cred could not be
8
-+     * found, then pass the entire cred list through. SPNEGO will send the
9
-+     * right creds to the correct mechanism.
10
-+     */
11
-+    if (input_cred_handle == NULL &&
12
-+        selected_mech->length == 6 &&
13
-+        !memcmp(selected_mech->elements, "\x2b\x06\x01\x05\x05\x02", 6))
14
-+    {
15
-+        input_cred_handle = (gss_cred_id_t) union_cred;
16
-+    }
17
-+    
18
-+    /*
19
-      * now call the approprate underlying mechanism routine
20
-      */
21
- 
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:	The Kerberos newtork authentication system
2 2
 Name:		krb5
3
-Version:	1.12.2
3
+Version:	1.14
4 4
 Release:	1%{?dist}
5 5
 License:	MIT
6 6
 URL:		http://cyrusimap.web.cmu.edu/
... ...
@@ -8,7 +8,7 @@ Group:		System Environment/Security
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10 10
 Source0:	http://web.mit.edu/kerberos/www/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
11
-%define sha1 krb5=6f24800d48d36a33305387a9b6340884b05573b1
11
+%define sha1 krb5=02973f6605b1170bec812af9c8da4e447eeca9a9
12 12
 Requires:	openssl
13 13
 Requires:	e2fsprogs
14 14
 BuildRequires: 	openssl-devel
... ...
@@ -83,11 +83,12 @@ rm -rf %{buildroot}/*
83 83
 %{_mandir}/man5/*
84 84
 %{_mandir}/man8/*
85 85
 %{_datarootdir}/examples/*
86
-%{_datarootdir}/gnats/*
87 86
 %{_datarootdir}/locale/*
88 87
 %{_datarootdir}/man/man5/.k5identity.5.gz
89 88
 %{_datarootdir}/man/man5/.k5login.5.gz
90 89
 %{_docdir}/%{name}-%{version}
91 90
 %changelog
91
+*	Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 1.14-1
92
+-	Upgrade version
92 93
 *	Tue Oct 07 2014 Divya Thaluru <dthaluru@vmware.com> 1.12.2-1
93 94
 -	Initial build.	First version