From a03a78baca410d452cbf3e4bb925e71816a24139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 11 Oct 2022 16:51:49 +0200 Subject: [PATCH] [sys-auth/sssd] bump --- sys-auth/sssd/Manifest | 4 +- .../sssd/files/sssd-2.7.4-mit-krb5-1.20.patch | 62 ------------------- ...sd-2.8.0-conditional-python-install.patch} | 0 .../{sssd-2.7.4.ebuild => sssd-2.8.0.ebuild} | 9 ++- 4 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 sys-auth/sssd/files/sssd-2.7.4-mit-krb5-1.20.patch rename sys-auth/sssd/files/{sssd-2.7.4-conditional-python-install.patch => sssd-2.8.0-conditional-python-install.patch} (100%) rename sys-auth/sssd/{sssd-2.7.4.ebuild => sssd-2.8.0.ebuild} (97%) diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest index e108388..8205534 100644 --- a/sys-auth/sssd/Manifest +++ b/sys-auth/sssd/Manifest @@ -1,2 +1,2 @@ -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 +DIST sssd-2.8.0.tar.gz 7741965 BLAKE2B 9cb85d32ee914095773fb6aace45641f8f3a8eba3a2cd859eacf031763d2be17569b72567b8a56fdacbe5a4cd3aacb2df6bb5900bb471cf8f69ae753a74e1d16 SHA512 25a96b1d14a113c7e388e7f8053668b6262c391413771cd85f4293a3162dcb4403956f4519f3a206095fcee83b0399648c948b25215f1c33dba01d199f01b1ea +DIST sssd-2.8.0.tar.gz.asc 833 BLAKE2B 0edb98e0e52e58f986c3cd08ea54c4e9b0255e3e0b0ff88281d04d576fc1721c5b36177dd28ca1718b3cca6dd1373905649ac8bc0d87f3cdd4ede5084fd05bc8 SHA512 b2105b45c6d2b5b1f73b2881e89dade748fee91ef0f843d31c0a1d60a18a4667445cfb3b9aac3dc9c3ab2e956f811b2e64e9134953e5367a5599db8a87b5ab51 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 deleted file mode 100644 index 32ccbbd..0000000 --- a/sys-auth/sssd/files/sssd-2.7.4-mit-krb5-1.20.patch +++ /dev/null @@ -1,62 +0,0 @@ -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/files/sssd-2.7.4-conditional-python-install.patch b/sys-auth/sssd/files/sssd-2.8.0-conditional-python-install.patch similarity index 100% rename from sys-auth/sssd/files/sssd-2.7.4-conditional-python-install.patch rename to sys-auth/sssd/files/sssd-2.8.0-conditional-python-install.patch diff --git a/sys-auth/sssd/sssd-2.7.4.ebuild b/sys-auth/sssd/sssd-2.8.0.ebuild similarity index 97% rename from sys-auth/sssd/sssd-2.7.4.ebuild rename to sys-auth/sssd/sssd-2.8.0.ebuild index 861fa4f..2c5a325 100644 --- a/sys-auth/sssd/sssd-2.7.4.ebuild +++ b/sys-auth/sssd/sssd-2.8.0.ebuild @@ -3,9 +3,9 @@ EAPI=7 -PLOCALES="ca cs de es eu fi fr ja ko nl pt pt_BR ru sv tg tr uk zh_CN" -PLOCALES_BIN="${PLOCALES} bg hu id it nb pl zh_TW" -PLOCALE_BACKUP="de" +PLOCALES="ca de es fr ja ko pt_BR ru sv tr uk" +PLOCALES_BIN="${PLOCALES} bg cs eu fi hu id it ka nb nl pl pt tg zh_TW zh_CN" +PLOCALE_BACKUP="sv" PYTHON_COMPAT=( python3_{8..10} ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sssd.asc @@ -102,8 +102,7 @@ BDEPEND=" CONFIG_CHECK="~KEYS" PATCHES=( - "${FILESDIR}"/${PN}-2.7.4-conditional-python-install.patch - "${FILESDIR}"/${PN}-2.7.4-mit-krb5-1.20.patch + "${FILESDIR}"/${PN}-2.8.0-conditional-python-install.patch ) MULTILIB_WRAPPED_HEADERS=(