Hello community,

here is the log from the commit of package krb5 for openSUSE:Factory checked in 
at 2014-01-29 07:15:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/krb5 (Old)
 and      /work/SRC/openSUSE:Factory/.krb5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "krb5"

Changes:
--------
--- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes   2014-01-23 
15:46:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes      2014-01-29 
07:15:28.000000000 +0100
@@ -1,0 +2,21 @@
+Tue Jan 21 14:28:05 UTC 2014 - [email protected]
+
+- update to version 1.12.1
+  * Make KDC log service principal names more consistently during
+    some error conditions, instead of "<unknown server>"
+  * Fix several bugs related to building AES-NI support on less
+    common configurations
+  * Fix several bugs related to keyring credential caches
+- upstream obsoletes:
+  krb5-1.12-copy_context.patch
+  krb5-1.12-enable-NX.patch
+  krb5-1.12-pic-aes-ni.patch
+  krb5-master-no-malloc0.patch
+  krb5-master-ignore-empty-unnecessary-final-token.patch
+  krb5-master-gss_oid_leak.patch
+  krb5-master-keytab_close.patch
+  krb5-master-spnego_error_messages.patch
+- Fix Get time offsets for all keyring ccaches
+  krb5-master-keyring-kdcsync.patch (RT#7820)
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/krb5/krb5.changes        2014-01-23 
15:46:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes   2014-01-29 
07:15:28.000000000 +0100
@@ -1,0 +2,21 @@
+Tue Jan 21 14:23:37 UTC 2014 - [email protected]
+
+- update to version 1.12.1
+  * Make KDC log service principal names more consistently during
+    some error conditions, instead of "<unknown server>"
+  * Fix several bugs related to building AES-NI support on less
+    common configurations
+  * Fix several bugs related to keyring credential caches
+- upstream obsoletes:
+  krb5-1.12-copy_context.patch
+  krb5-1.12-enable-NX.patch
+  krb5-1.12-pic-aes-ni.patch
+  krb5-master-no-malloc0.patch
+  krb5-master-ignore-empty-unnecessary-final-token.patch
+  krb5-master-gss_oid_leak.patch
+  krb5-master-keytab_close.patch
+  krb5-master-spnego_error_messages.patch
+- Fix Get time offsets for all keyring ccaches
+  krb5-master-keyring-kdcsync.patch (RT#7820)
+
+-------------------------------------------------------------------

Old:
----
  krb5-1.12-copy_context.patch
  krb5-1.12-enable-NX.patch
  krb5-1.12-pic-aes-ni.patch
  krb5-1.12.tar.gz
  krb5-master-gss_oid_leak.patch
  krb5-master-ignore-empty-unnecessary-final-token.patch
  krb5-master-keytab_close.patch
  krb5-master-no-malloc0.patch
  krb5-master-spnego_error_messages.patch

New:
----
  krb5-1.12.1.tar.gz
  krb5-master-keyring-kdcsync.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ krb5-mini.spec ++++++
--- /var/tmp/diff_new_pack.7GRjiI/_old  2014-01-29 07:15:29.000000000 +0100
+++ /var/tmp/diff_new_pack.7GRjiI/_new  2014-01-29 07:15:29.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 %define build_mini 1
-%define srcRoot krb5-1.12
+%define srcRoot krb5-1.12.1
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
 
@@ -30,7 +30,7 @@
 BuildRequires:  libcom_err-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  ncurses-devel
-Version:        1.12
+Version:        1.12.1
 Release:        0
 Summary:        MIT Kerberos5 Implementation--Libraries
 License:        MIT
@@ -78,14 +78,7 @@
 Patch12:        krb5-1.12-selinux-label.patch
 Patch13:        krb5-1.9-debuginfo.patch
 Patch14:        krb5-kvno-230379.patch
-Patch15:        krb5-1.12-copy_context.patch
-Patch16:        krb5-1.12-enable-NX.patch
-Patch17:        krb5-1.12-pic-aes-ni.patch
-Patch18:        krb5-master-no-malloc0.patch
-Patch19:        krb5-master-ignore-empty-unnecessary-final-token.patch
-Patch20:        krb5-master-gss_oid_leak.patch
-Patch21:        krb5-master-keytab_close.patch
-Patch22:        krb5-master-spnego_error_messages.patch
+Patch15:        krb5-master-keyring-kdcsync.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -206,13 +199,6 @@
 %patch13 -p0
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
 
 %build
 # needs to be re-generated

++++++ krb5.spec ++++++
--- /var/tmp/diff_new_pack.7GRjiI/_old  2014-01-29 07:15:29.000000000 +0100
+++ /var/tmp/diff_new_pack.7GRjiI/_new  2014-01-29 07:15:29.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 %define build_mini 0
-%define srcRoot krb5-1.12
+%define srcRoot krb5-1.12.1
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
 
@@ -30,7 +30,7 @@
 BuildRequires:  libcom_err-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  ncurses-devel
-Version:        1.12
+Version:        1.12.1
 Release:        0
 Summary:        MIT Kerberos5 Implementation--Libraries
 License:        MIT
@@ -78,14 +78,7 @@
 Patch12:        krb5-1.12-selinux-label.patch
 Patch13:        krb5-1.9-debuginfo.patch
 Patch14:        krb5-kvno-230379.patch
-Patch15:        krb5-1.12-copy_context.patch
-Patch16:        krb5-1.12-enable-NX.patch
-Patch17:        krb5-1.12-pic-aes-ni.patch
-Patch18:        krb5-master-no-malloc0.patch
-Patch19:        krb5-master-ignore-empty-unnecessary-final-token.patch
-Patch20:        krb5-master-gss_oid_leak.patch
-Patch21:        krb5-master-keytab_close.patch
-Patch22:        krb5-master-spnego_error_messages.patch
+Patch15:        krb5-master-keyring-kdcsync.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -206,13 +199,6 @@
 %patch13 -p0
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
 
 %build
 # needs to be re-generated

++++++ krb5-1.12.tar.gz -> krb5-1.12.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/krb5/krb5-1.12.tar.gz 
/work/SRC/openSUSE:Factory/.krb5.new/krb5-1.12.1.tar.gz differ: char 5, line 1

++++++ krb5-master-keyring-kdcsync.patch ++++++
commit e99c688913a7761c6adea9488ea9355f43539883
Author: Greg Hudson <[email protected]>
Date:   Thu Jan 16 17:48:54 2014 -0500

    Get time offsets for all keyring ccaches
    
    Move the time offset lookup from krb5_krcc_resolve to make_cache, so
    that we fetch time offsets for caches created by
    krb5_krcc_ptcursor_next.
    
    ticket: 7820
    target_version: 1.12.2
    tags: pullup

diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c
index a0c8035..27bad9d 100644
--- a/src/lib/krb5/ccache/cc_keyring.c
+++ b/src/lib/krb5/ccache/cc_keyring.c
@@ -1077,11 +1077,13 @@ krb5_krcc_destroy(krb5_context context, krb5_ccache id)
 
 /* Create a cache handle for a cache ID. */
 static krb5_error_code
-make_cache(key_serial_t collection_id, key_serial_t cache_id,
-           const char *anchor_name, const char *collection_name,
-           const char *subsidiary_name, krb5_ccache *cache_out)
+make_cache(krb5_context context, key_serial_t collection_id,
+           key_serial_t cache_id, const char *anchor_name,
+           const char *collection_name, const char *subsidiary_name,
+           krb5_ccache *cache_out)
 {
     krb5_error_code ret;
+    krb5_os_context os_ctx = &context->os_context;
     krb5_ccache ccache = NULL;
     krb5_krcc_data *d;
     key_serial_t pkey = 0;
@@ -1108,6 +1110,18 @@ make_cache(key_serial_t collection_id, key_serial_t 
cache_id,
     ccache->data = d;
     ccache->magic = KV5M_CCACHE;
     *cache_out = ccache;
+
+    /* Lookup time offsets if necessary. */
+    if ((context->library_options & KRB5_LIBOPT_SYNC_KDCTIME) &&
+        !(os_ctx->os_flags & KRB5_OS_TOFFSET_VALID)) {
+        if (krb5_krcc_get_time_offsets(context, ccache,
+                                       &os_ctx->time_offset,
+                                       &os_ctx->usec_offset) == 0) {
+            os_ctx->os_flags &= ~KRB5_OS_TOFFSET_TIME;
+            os_ctx->os_flags |= KRB5_OS_TOFFSET_VALID;
+        }
+    }
+
     return 0;
 }
 
@@ -1134,7 +1148,6 @@ make_cache(key_serial_t collection_id, key_serial_t 
cache_id,
 static krb5_error_code KRB5_CALLCONV
 krb5_krcc_resolve(krb5_context context, krb5_ccache *id, const char *residual)
 {
-    krb5_os_context os_ctx = &context->os_context;
     krb5_error_code ret;
     key_serial_t collection_id, cache_id;
     char *anchor_name = NULL, *collection_name = NULL, *subsidiary_name = NULL;
@@ -1161,22 +1174,11 @@ krb5_krcc_resolve(krb5_context context, krb5_ccache 
*id, const char *residual)
     if (cache_id < 0)
         cache_id = 0;
 
-    ret = make_cache(collection_id, cache_id, anchor_name, collection_name,
-                     subsidiary_name, id);
+    ret = make_cache(context, collection_id, cache_id, anchor_name,
+                     collection_name, subsidiary_name, id);
     if (ret)
         goto cleanup;
 
-    /* Lookup time offsets if necessary. */
-    if ((context->library_options & KRB5_LIBOPT_SYNC_KDCTIME) &&
-        !(os_ctx->os_flags & KRB5_OS_TOFFSET_VALID)) {
-        if (krb5_krcc_get_time_offsets(context, *id,
-                                       &os_ctx->time_offset,
-                                       &os_ctx->usec_offset) == 0) {
-            os_ctx->os_flags &= ~KRB5_OS_TOFFSET_TIME;
-            os_ctx->os_flags |= KRB5_OS_TOFFSET_VALID;
-        }
-    }
-
 cleanup:
     free(anchor_name);
     free(collection_name);
@@ -1928,8 +1930,9 @@ krb5_krcc_ptcursor_next(krb5_context context, 
krb5_cc_ptcursor cursor,
         cache_id = keyctl_search(data->collection_id, KRCC_KEY_TYPE_KEYRING,
                                  first_name, 0);
         if (cache_id != -1) {
-            return make_cache(data->collection_id, cache_id, data->anchor_name,
-                              data->collection_name, first_name, cache_out);
+            return make_cache(context, data->collection_id, cache_id,
+                              data->anchor_name, data->collection_name,
+                              first_name, cache_out);
         }
     }
 
@@ -1967,7 +1970,7 @@ krb5_krcc_ptcursor_next(krb5_context context, 
krb5_cc_ptcursor cursor,
 
         /* We found a valid key */
         data->next_key++;
-        ret = make_cache(data->collection_id, key, data->anchor_name,
+        ret = make_cache(context, data->collection_id, key, data->anchor_name,
                          data->collection_name, subsidiary_name, cache_out);
         free(description);
         return ret;
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to