!4 accept krb5 1.18 for building the PAC plugin

Merge pull request !4 from guoxiaoqi/hzq-openeuler
This commit is contained in:
openeuler-ci-bot 2020-06-22 21:11:37 +08:00 committed by Gitee
commit 3596f45d4f
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 192d54ffead1552f7086ebc518907519d903bca4 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Fri, 24 Apr 2020 00:58:21 -0400
Subject: [PATCH] sssd: BUILD: Accept krb5 1.18 for building the PAC plugin
backport addr:https://github.com/SSSD/sssd/commit/399ee9d1af9cca4026ce50c58ce25c45a30c85c2
---
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 dc986a1..114d847 100644
--- a/src/external/pac_responder.m4
+++ b/src/external/pac_responder.m4
@@ -19,7 +19,8 @@ then
Kerberos\ 5\ release\ 1.14* | \
Kerberos\ 5\ release\ 1.15* | \
Kerberos\ 5\ release\ 1.16* | \
- Kerberos\ 5\ release\ 1.17*)
+ Kerberos\ 5\ release\ 1.17* | \
+ Kerberos\ 5\ release\ 1.18*)
krb5_version_ok=yes
AC_MSG_RESULT([yes])
;;
--
2.19.1

View File

@ -1,11 +1,13 @@
Name: sssd
Version: 2.2.2
Release: 3
Release: 4
Summary: System Security Services Daemon
License: GPLv3+ and LGPLv3+
URL: https://pagure.io/SSSD/sssd/
Source0: https://releases.pagure.org/SSSD/sssd/%{name}-%{version}.tar.gz
Patch0:sssd-BUILD-Accept-krb5-1.18-for-building-the-PAC-plu.patch
Requires: python3-sssd = %{version}-%{release}
Requires: libldb
Requires: cyrus-sasl-gssapi%{?_isa}
@ -272,6 +274,10 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/sss_ssh_authorizedkeys
chrpath -d $RPM_BUILD_ROOT%{_bindir}/sss_ssh_knownhostsproxy
chrpath -d $RPM_BUILD_ROOT%{_sbindir}/sss_cache
chrpath -d $RPM_BUILD_ROOT%{_sbindir}/sssd
chrpath -d $RPM_BUILD_ROOT%{_sbindir}/sssctl
chrpath -d $RPM_BUILD_ROOT%{_sbindir}/sss_override
chrpath -d $RPM_BUILD_ROOT%{_sbindir}/sss_seed
chrpath -d $RPM_BUILD_ROOT%{_libexecdir}/sssd/sssd_ifp
chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_ipa.so
chrpath -d $RPM_BUILD_ROOT%{_libexecdir}/sssd/selinux_child
@ -286,6 +292,7 @@ chrpath -d $RPM_BUILD_ROOT%{_libexecdir}/sssd/gpo_child
chrpath -d $RPM_BUILD_ROOT%{_libexecdir}/sssd/proxy_child
chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_proxy.so
chrpath -d $RPM_BUILD_ROOT%{python3_sitearch}/pysss.so
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
echo "/usr/lib64/sssd" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
@ -567,6 +574,9 @@ fi
%{_libdir}/%{name}/modules/libwbclient.so
%changelog
* Tue May 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.2.2-4
- accept krb5 1.18 for building the PAC plugin
* Thu Feb 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.2.2-3
- rebuild for libldb