diff --git a/0003-krb5-include-backwards-compatible-declaration-of-krb.patch b/0003-krb5-include-backwards-compatible-declaration-of-krb.patch new file mode 100644 index 0000000..b6cf4db --- /dev/null +++ b/0003-krb5-include-backwards-compatible-declaration-of-krb.patch @@ -0,0 +1,52 @@ +From 4e78fab6a1b2e9653a7959cbdb7d54bb750041d0 Mon Sep 17 00:00:00 2001 +From: Jakub Hrozek +Date: Mon, 4 Feb 2013 11:30:48 -0500 +Subject: [PATCH] krb5: include backwards compatible declaration of + krb5_trace_info + +krb5-1.10 used to include "struct krb5_trace_info", now krb5-1.11 +includes a "krb5_trace_info" typedefed from "struct _krb5_trace_info". + +Do the same in the SSSD to allow compiling with both 1.10 and 1.11. +--- + src/external/krb5.m4 | 2 +- + src/util/sss_krb5.c | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/external/krb5.m4 b/src/external/krb5.m4 +index 5bc871128193e19038c7325b7dbab40e94128171..f1679a151b613b3f685953453a314f734419fa41 100644 +--- a/src/external/krb5.m4 ++++ b/src/external/krb5.m4 +@@ -37,7 +37,7 @@ SAVE_LIBS=$LIBS + CFLAGS="$CFLAGS $KRB5_CFLAGS" + LIBS="$LIBS $KRB5_LIBS" + AC_CHECK_HEADERS([krb5.h krb5/krb5.h]) +-AC_CHECK_TYPES([krb5_ticket_times, krb5_times], [], [], ++AC_CHECK_TYPES([krb5_ticket_times, krb5_times, krb5_trace_info], [], [], + [ #ifdef HAVE_KRB5_KRB5_H + #include + #else +diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c +index bb61d10938a74d768c31869cae79fa1e348d3693..ab0344c8048523e08dbe29a05aefbc45e2f7668e 100644 +--- a/src/util/sss_krb5.c ++++ b/src/util/sss_krb5.c +@@ -1001,9 +1001,15 @@ sss_krb5_residual_check_type(const char *full_location, + } + + #ifdef HAVE_KRB5_SET_TRACE_CALLBACK ++ ++#ifndef HAVE_KRB5_TRACE_INFO ++/* krb5-1.10 had struct krb5_trace_info, 1.11 has type named krb5_trace_info */ ++typedef struct krb5_trace_info krb5_trace_info; ++#endif /* HAVE_KRB5_TRACE_INFO */ ++ + static void + sss_child_krb5_trace_cb(krb5_context context, +- const struct krb5_trace_info *info, void *data) ++ const krb5_trace_info *info, void *data) + { + if (info == NULL) { + /* Null info means destroy the callback data. */ +-- +1.8.1.2 + diff --git a/sssd.spec b/sssd.spec index a9d90cf..7e8987d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -16,7 +16,7 @@ Name: sssd Version: 1.9.4 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/System Summary: System Security Services Daemon License: GPLv3+ @@ -27,6 +27,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ### Patches ### Patch0001: 0001-krb-recreate-ccache-if-it-was-deleted.patch Patch0002: 0002-Don-t-use-srcdir-with-tests.patch +Patch0003: 0003-krb5-include-backwards-compatible-declaration-of-krb.patch Patch0501: 0501-FEDORA-Switch-the-default-ccache-location.patch @@ -526,6 +527,9 @@ fi %postun -n libsss_sudo -p /sbin/ldconfig %changelog +* Mon Feb 11 2013 Jakub Hrozek - 1.9.4-6 +- Include upstream patch to build with krb5-1.11 + * Thu Feb 07 2013 Jakub Hrozek - 1.9.4-5 - Rebuild against new libldb