diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest index e7d9ff6..e108388 100644 --- a/sys-auth/sssd/Manifest +++ b/sys-auth/sssd/Manifest @@ -1,2 +1,2 @@ -DIST sssd-2.7.3.tar.gz 7627294 BLAKE2B a98bd2d637a018448204082a8ae49b6bcb474f086c1e04512ea8310fa2f237c9df5d0b5d500259acc884b15607fee6c2d5e2a4ef45cd71cdf948881585a8cf44 SHA512 c7f62030be2a8305509b2e30271977a848ab79dcaf87734c7b71ca3f173679a9e850e6533e8e71c44ae76d2dbc3a2b6e2c46a755fe6b3ec21debbddf90958d35 -DIST sssd-2.7.3.tar.gz.asc 833 BLAKE2B 9b19e3f3e5bee87a660e49b8f5b277ce1e31292ae4847b0a7b452bb7dab2d07e1aaf22ee5e75a317741d3e2a97f266c8fd08d1d589937f8d27e5a394b4ba49cb SHA512 6b41c46ca759641b58e15a91ccee3d10e382f7ae988fa0112aff21fe5f67b6943353188a1834d12f71c3673d97d15027b2b67a8136e320189a42ab1a94300ae8 +DIST sssd-2.7.4.tar.gz 7648702 BLAKE2B d9b9bb5db661d7ef9fcdeefff360464c8480b282d3c79fb5a77e46effd4e83155c3bcdae9828e2813c7a923a9ecdf6c7a9e0eac410883fd2d83f6ad82aa9cbf8 SHA512 2c211f7fdc4325c77e2bf61c5c6981a9a7809d6e02f43b564ed3bb63390f91461f4c48910d4bf111484e00f428ce827f2a5b960930c6b95f2662c7e1207af53b +DIST sssd-2.7.4.tar.gz.asc 833 BLAKE2B 92704b27fa9fc7f19278b5cd65437b62ca4dfa61b48587a3bf86f703270960cd23591595812d50514b824cefa6868f2cc39358ed0354d49497a294ec82316ad6 SHA512 d02519d5452bf937449c2e761806edb2d3c6b4dddf146f8ba8f93fe7c5ef948d51f89186b50a9a31a01c298adfb6e158fd1e648886e2017cdb3d7b3b33cc2ba4 diff --git a/sys-auth/sssd/files/sssd-2.7.2-conditional-python-install.patch b/sys-auth/sssd/files/sssd-2.7.4-conditional-python-install.patch similarity index 100% rename from sys-auth/sssd/files/sssd-2.7.2-conditional-python-install.patch rename to sys-auth/sssd/files/sssd-2.7.4-conditional-python-install.patch diff --git a/sys-auth/sssd/files/sssd-2.7.4-mit-krb5-1.20.patch b/sys-auth/sssd/files/sssd-2.7.4-mit-krb5-1.20.patch new file mode 100644 index 0000000..32ccbbd --- /dev/null +++ b/sys-auth/sssd/files/sssd-2.7.4-mit-krb5-1.20.patch @@ -0,0 +1,62 @@ +From abd8966a0b05236677e3b086ab935ba70f6aac0f Mon Sep 17 00:00:00 2001 +From: Sumit Bose +Date: Fri, 19 Aug 2022 13:53:35 +0200 +Subject: [PATCH] BUILD: Accept krb5 1.20 for building the PAC plugin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Additionally following MIT Kerberos the 'name' member of struct +krb5plugin_authdata_client_ftable_v0 is made 'const' and the related +code to set the name is simplified. + +Resolves: https://github.com/SSSD/sssd/issues/6306 + +Reviewed-by: Alexey Tikhonov +Reviewed-by: Pavel Březina +--- + src/external/pac_responder.m4 | 3 ++- + src/sss_client/krb5_authdata_int.h | 2 +- + src/sss_client/sssd_pac.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4 +index 26c6bd5bdd..3cbe3c9cfb 100644 +--- a/src/external/pac_responder.m4 ++++ b/src/external/pac_responder.m4 +@@ -21,7 +21,8 @@ then + Kerberos\ 5\ release\ 1.16* | \ + Kerberos\ 5\ release\ 1.17* | \ + Kerberos\ 5\ release\ 1.18* | \ +- Kerberos\ 5\ release\ 1.19*) ++ Kerberos\ 5\ release\ 1.19* | \ ++ Kerberos\ 5\ release\ 1.20*) + krb5_version_ok=yes + AC_MSG_RESULT([yes]) + ;; +diff --git a/src/sss_client/krb5_authdata_int.h b/src/sss_client/krb5_authdata_int.h +index 5e0cf5e026..bafff71695 100644 +--- a/src/sss_client/krb5_authdata_int.h ++++ b/src/sss_client/krb5_authdata_int.h +@@ -160,7 +160,7 @@ typedef krb5_error_code + void *dst_request_context); + + typedef struct krb5plugin_authdata_client_ftable_v0 { +- char *name; ++ const char *name; + krb5_authdatatype *ad_type_list; + authdata_client_plugin_init_proc init; + authdata_client_plugin_fini_proc fini; +diff --git a/src/sss_client/sssd_pac.c b/src/sss_client/sssd_pac.c +index 8444834a7f..523b5c4e33 100644 +--- a/src/sss_client/sssd_pac.c ++++ b/src/sss_client/sssd_pac.c +@@ -302,7 +302,7 @@ sssdpac_internalize(krb5_context kcontext, + static krb5_authdatatype sssdpac_ad_types[] = { KRB5_AUTHDATA_WIN2K_PAC, 0 }; + + krb5plugin_authdata_client_ftable_v0 authdata_client_0 = { +- ((void *)((uintptr_t)("sssd_sssdpac"))), ++ "sssd_sssdpac", + sssdpac_ad_types, + sssdpac_init, + sssdpac_fini, diff --git a/sys-auth/sssd/sssd-2.7.3.ebuild b/sys-auth/sssd/sssd-2.7.4.ebuild similarity index 98% rename from sys-auth/sssd/sssd-2.7.3.ebuild rename to sys-auth/sssd/sssd-2.7.4.ebuild index 58b349f..861fa4f 100644 --- a/sys-auth/sssd/sssd-2.7.3.ebuild +++ b/sys-auth/sssd/sssd-2.7.4.ebuild @@ -101,7 +101,10 @@ BDEPEND=" CONFIG_CHECK="~KEYS" -PATCHES=( "${FILESDIR}"/${PN}-2.7.2-conditional-python-install.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.7.4-conditional-python-install.patch + "${FILESDIR}"/${PN}-2.7.4-mit-krb5-1.20.patch +) MULTILIB_WRAPPED_HEADERS=( /usr/include/ipa_hbac.h