From 6a5d62f4604de39b7d2890dcc898dc2c7ffb8b42 Mon Sep 17 00:00:00 2001 From: hzero1996 Date: Thu, 10 Aug 2023 17:18:06 +0800 Subject: [PATCH] fix build fail --- ...rb5-1.21-for-building-the-PAC-plugin.patch | 31 +++++++++++++++++++ fix-the-build-error.patch | 26 ++++++++++++++++ sssd.spec | 7 ++++- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 backport-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch create mode 100644 fix-the-build-error.patch diff --git a/backport-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch b/backport-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch new file mode 100644 index 0000000..abbc34d --- /dev/null +++ b/backport-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch @@ -0,0 +1,31 @@ +From 74d0f4538deb766592079b1abca0d949d6dea105 Mon Sep 17 00:00:00 2001 +From: Alexey Tikhonov +Date: Thu, 15 Jun 2023 12:05:03 +0200 +Subject: [PATCH] BUILD: Accept krb5 1.21 for building the PAC plugin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-by: Alejandro López +Reviewed-by: Sumit Bose +--- + src/external/pac_responder.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4 +index 3cbe3c9cf..90727185b 100644 +--- a/src/external/pac_responder.m4 ++++ b/src/external/pac_responder.m4 +@@ -22,7 +22,8 @@ then + Kerberos\ 5\ release\ 1.17* | \ + Kerberos\ 5\ release\ 1.18* | \ + Kerberos\ 5\ release\ 1.19* | \ +- Kerberos\ 5\ release\ 1.20*) ++ Kerberos\ 5\ release\ 1.20* | \ ++ Kerberos\ 5\ release\ 1.21*) + krb5_version_ok=yes + AC_MSG_RESULT([yes]) + ;; +-- +2.33.0 + diff --git a/fix-the-build-error.patch b/fix-the-build-error.patch new file mode 100644 index 0000000..d036f4c --- /dev/null +++ b/fix-the-build-error.patch @@ -0,0 +1,26 @@ +From 4b06b696df1c5a6d6a12a75c945da5de503fd263 Mon Sep 17 00:00:00 2001 +From: hzero1996 +Date: Thu, 10 Aug 2023 17:31:30 +0800 +Subject: [PATCH] fix the build error + +--- + src/external/pac_responder.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4 +index 3cbe3c9..9072718 100644 +--- a/src/external/pac_responder.m4 ++++ b/src/external/pac_responder.m4 +@@ -22,7 +22,8 @@ then + Kerberos\ 5\ release\ 1.17* | \ + Kerberos\ 5\ release\ 1.18* | \ + Kerberos\ 5\ release\ 1.19* | \ +- Kerberos\ 5\ release\ 1.20*) ++ Kerberos\ 5\ release\ 1.20* | \ ++ Kerberos\ 5\ release\ 1.21*) + krb5_version_ok=yes + AC_MSG_RESULT([yes]) + ;; +-- +2.33.0 + diff --git a/sssd.spec b/sssd.spec index 8b6eb35..67e1adc 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,11 +1,13 @@ Name: sssd Version: 2.9.1 -Release: 1 +Release: 2 Summary: System Security Services Daemon License: GPLv3+ and LGPLv3+ URL: https://pagure.io/SSSD/sssd/ Source0: https://github.com/SSSD/sssd/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch0001: backport-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch + Requires: python3-sssd = %{version}-%{release} Requires: libldb Requires: cyrus-sasl-gssapi%{?_isa} @@ -525,6 +527,9 @@ fi %systemd_postun_with_restart sssd.service %changelog +* Thu Aug 10 2023 wangcheng - 2.9.1-2 +- fix build fail + * Wed Jul 19 2023 zhengxiaoxiao - 2.9.1-1 - update to 2.9.1 -- Gitee