Fix build with mit-krb5-1.11.1, bug #463812. Thanks to slepnoga and Andrian Nord.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 60 insertions, 9 deletions

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index ecb0bd04f8ad..1cd97ddbeb31 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/sssd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.38 2013/04/05 07:16:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.39 2013/04/05 17:46:25 maksbotan Exp $
+
+  05 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org> +files/new_krb5.patch:
+  Fix build with mit-krb5-1.11.1, bug #463812. Thanks to slepnoga and Andrian
+  Nord.
 
 *sssd-1.9.4-r2 (05 Apr 2013)
 *sssd-1.8.6-r1 (05 Apr 2013)
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 71a5ca907822..c935dc2a75e1 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 0001_add_pthread_to_fix_as-needed.patch 744 SHA256 3d9f822d93555393c19fc9bdbface08092e78e640dd939424700f6403f11ac1f SHA512 fee020fa5f1ef22065c91e93178d99e3a451769cc5fb1ebdceef446a9bea5547727189c65310de2fe68a12f975eb1980af7a5b737882c0c6cdd5129b76659f82 WHIRLPOOL dac4c364fe617d23f0f66675bf98e8dd33c378709c997783df52007e33a89ba871e9f455a705da09e4d213c34707fed864fa5c46c8260c81e83db809a0c7f895
 AUX 0002_allow_xdm_openrc.patch 472 SHA256 9d0462096d7eb03489dbb4f5920c767828068cc87d2e41c75c37631f95850368 SHA512 c728b3619746902584d2f75ef57829a249c964139a24bd012530399ce3fb478fd2236efaa6c5313dd8132ea46ecb9a8c899f7a10c5b063da2a03ba9f9ba2650f WHIRLPOOL 93d4fdd206602833104f43eae576fc22bee4975e3ba116dd4caff1067a0394c230726d70d8e74d90288c984b46c3f9d26856bb2ee663dd63ace425ce6acc4d71
 AUX allow_xdm.patch 472 SHA256 9d0462096d7eb03489dbb4f5920c767828068cc87d2e41c75c37631f95850368 SHA512 c728b3619746902584d2f75ef57829a249c964139a24bd012530399ce3fb478fd2236efaa6c5313dd8132ea46ecb9a8c899f7a10c5b063da2a03ba9f9ba2650f WHIRLPOOL 93d4fdd206602833104f43eae576fc22bee4975e3ba116dd4caff1067a0394c230726d70d8e74d90288c984b46c3f9d26856bb2ee663dd63ace425ce6acc4d71
+AUX new_krb5.patch 1702 SHA256 5ad16a7c733824dea87dc0df4ac8b1e9ec3edbd94093856bf379875dbbef4602 SHA512 a55285885d076250890765f25b3c2af5e28649de7efcc275d12ba751784182dccdab76b0f72f5e68863581b588cd4ddd615a218ebdd47be4317983f4c919fc9a WHIRLPOOL 55590c98ef738179e4ec0b4f3791d3fe38c7074173569408f32e102df38e1b86f29b729b85b791fd5661fff69f81c72d86402474eee5669fa079a090311fe47b
 AUX sssd 488 SHA256 464f6ecb559cbe14dcd1974837aeab338f4ce38686cc464bcddf1db28839caa5 SHA512 274473cf69e62f405c2af2ea94e9964f579140c47623f4d7712f33c9e34525fda6b77c8fe8d180e8b45905ad6c4d581f9ae4f173aafa0660e48f61da0069e65d WHIRLPOOL ceb70b5c0bf11f6620f0c31fab6c7f4fe5c7ff84fc07aa4f63a6a73be05f0bca62d1f9ab0d422ec0c97939569ec3a6ca7ed63b13ede84f6e39c4ac3c12cc0ba4
 AUX sssd.conf 124 SHA256 bc5154f0ee2c2e6cffd5b6e371d4302a5952bd04343dd4c56689f43821a5fb94 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a WHIRLPOOL 37151473420598bd24d90ef1975ba83c5e9f5301a459b8d73d5df540d5b67686494b9f826b8e985b42765c65861d5f82b6ef705ebe577e68bbf57a893a24f32b
 DIST sssd-1.8.6.tar.gz 2175323 SHA256 df3417e7c95e49ee982b6919059a5f181d59fcfbffa1c75106025980fda4c023 SHA512 137b3f2977511ed88c013e3e07da73dff689f8064c7ecf4c6c555e2686d76dd9daf10a184396b9e4a663a5a4fc4942808f6eae2b72eef47a730e041916445a30 WHIRLPOOL 25c8baecc35e69028b92cf4be01a2d37412838b6ec624ca3928e3f013b0e81bb0f0f1a3d57b7145291da7bed52f84f6259366a78e9f562afd26b9af0eb12c31c
@@ -13,16 +14,16 @@ EBUILD sssd-1.8.6.ebuild 2964 SHA256 aced9bdec88bba4f7832625dc8b27c7cdbcdc7e8dac
 EBUILD sssd-1.9.4-r1.ebuild 3342 SHA256 45b7752b27f44ec350a399cf6dc6c6210d5d38157acba9c8752531be5b71f25f SHA512 c53523f3b101ab7f46557472e63df17eed5d4d280ef8846e6dae5502b3a6d60edb891444b72c3fa4d0f56a08d8cab6d9482d1e23b4ddd74d164bf1a66ff5df06 WHIRLPOOL 593fd4e1641a407a969e169df420fe2c61840ad5df3995b70fecd132332ee20c17fe21d3443176aa6374c5c9e3d350cbca18d8e4aebd8128a8284403d13fd4c0
 EBUILD sssd-1.9.4-r2.ebuild 3406 SHA256 135e2cedc6d226ccc918ff67b2cbead445262d0482012122dbed539437857119 SHA512 b9fe992d24821dba44b02e150e87c6f22e80b324e26f67123aa1a395bfbb5ce3b9e286bfbdeac75cc224110aa2c370b2c852818211c7c458027804ca0cd6f7f3 WHIRLPOOL 7bc5cc1707d75a7717615038f380ad15c8881babad0fb80acdb72d6b728f124536fab3f04dcb25769e0cd0b772e0627fb7c9e6b24183542327ce65863aeb2088
 EBUILD sssd-1.9.4.ebuild 3357 SHA256 7a04a01d551e5f00bc66564db200377e9680b906ee001716dcbdc1227d0952f8 SHA512 06f8fc0f2fbac133870049c8eeaa6adf2addb0a22f89bbefa85c6114f1637b24a922b1b776f69056b29a3b978e359e35614fa17c5ca718d357ce2c16a77ac9e1 WHIRLPOOL 7d0d4ad7d83f2523e4709a1b526a73291ce4c22890bf90c994b18563f3bf4e0e4d3cb97d70e3cb9ea5be17443583b5b016750a364c7dfd7d056a1b2a58fd7a33
-MISC ChangeLog 6245 SHA256 644e5a70b7b736cd403d5306daee9f0616e9e945cb5308a24cad792e5ec35b23 SHA512 1c4600a6a4cd953a969c7c65dd04fa2e948f27d4600cf593776e36f29e34df5b26ccc40523a761d17f11a18ddc56d537302e9d0e9739aabb48888f985f5bca86 WHIRLPOOL 1b8f781d8c7ac9d97ca2f4138e4b5f9e8b151086416d2f402295b372346e9e0364f15a7a5611c467e20100f53b0a68ac1daeece9225eaefcf515de1c53c62f4d
+MISC ChangeLog 6407 SHA256 f348af2e79841d2dc1a5a15830e603b24455d79f59c3fda9566568f239e70f63 SHA512 2319c4ea075e950a1cb09c49c895db38864d85cc6736e2f78a6b34c3efd1c7e021bfab517a73ddf8a836bf9b5f79b1b50fb31fbecdc329f640c1ebda4bf4b343 WHIRLPOOL eda334e9f24943d1c3be66ff8cfe7120be713c6bb1bdd47ac19035cbe2d3a93db01910ae84cf880245ef72941c051705a98ae1ddb8bfe665ba3b9e55fc609844
 MISC metadata.xml 1151 SHA256 3a2e0f337acc48549dd94df23a782654d76c9c78985e67e8ff6b2bb925e316b6 SHA512 2264c5d0ade0fb2e7538a704ffe3a4ca4f5da9e44540e9de9291915b434b56f0d06a017c0a290b59f193f494a320530608f4eb040d1f799dfdef51a583efa9d7 WHIRLPOOL 835caff70885090d33d8db6b38bd357c8042c74a2368eb2c0664230aa12d458bd22039de1079cf95935307554453be0f71593f0b0873df5352f6927adb7d51f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRXnpyAAoJEAmJmMX429reX6sIAJfEr77Fe3eHyFPY2+HCLJ1l
-1pmSoXlmHwdDG9F5HQq/AOPrY+JrAOrEZROvm6iH9jFBDOFYi+Ju92Vp3JYx7EYK
-lBmyfKvgNpfLl657+jtxCdn+A8pXRGBSxOWB4+sdwiSRfVd/su6Y3p+XNZZN/ubi
-KWUremy5JAu2HQJ3WOKh5HtbcC/uIMIocilXQanigHT1czH5AIYiy2tb1KZXlFcY
-nj7D+JeOhrrHTIauooD/aMhTcU02vZm0E8Zf5Q5nBse7839OFcJAlNYvqmco1Tbb
-mh0mWaAe0VnB7XjUGH+YQffPjI3VXgqtaf9Ll7xhDNrKk6+X7oepy/1OdUtwHks=
-=Zg9s
+iQEcBAEBCAAGBQJRXw4kAAoJEAmJmMX429repdEH/iHZz9xXUKpsdr1SQVJztJw0
+LZcQdIajKM8akUs36TT32BrnNeFlISe4OnDyHdSBTKtYeB5shDtBttXiZQAyxrgN
+IOcJB6z8lSChOVqB1TVZXihqIv0A7+jzkEOSAnBkHrL1VT+Vek7fW9zY+HNLEhF2
+BSqzvw6wLoPOS+pDNoR+2XRSdlOJmh56QftiAm+X5LdMkaZbLfeUuw3e61PcjnPz
+5SN9MXtYtmq/JLiiL4nnaJFphlsBctTz+LaRkbn4JXVXmnPdFXDaHmUydZaJHw9m
+iRWSykQDNZ7ZneGW+3u0DzNdT6vfkayqzQVmNpysRStnFOHl06ZU9Y72p0L71Hs=
+=YJXU
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/sssd/files/new_krb5.patch b/sys-auth/sssd/files/new_krb5.patch
new file mode 100644
index 000000000000..03a7c744f2ae
--- /dev/null
+++ b/sys-auth/sssd/files/new_krb5.patch
@@ -0,0 +1,46 @@
+From 4e78fab6a1b2e9653a7959cbdb7d54bb750041d0 Mon Sep 17 00:00:00 2001
+From: Jakub Hrozek <jhrozek@redhat.com>
+Date: Mon, 04 Feb 2013 16:30:48 +0000
+Subject: 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.
+---
+diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
+index 5bc8711..f1679a1 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 <krb5/krb5.h>
+                  #else
+diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c
+index bb61d10..ab0344c 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. */
+--
+cgit v0.9.1