diff --git a/0001-Fix-build-failure-against-samba-4.12.0rc1.patch b/0001-Fix-build-failure-against-samba-4.12.0rc1.patch deleted file mode 100644 index 5ee36c0787affbcf8abeb30c8f530b9f537489dd..0000000000000000000000000000000000000000 --- a/0001-Fix-build-failure-against-samba-4.12.0rc1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 391dc02eafed23892c5752834b18174b6cd54e20 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Fri, 24 Jan 2020 15:17:39 +0100 -Subject: [PATCH] Fix build failure against samba 4.12.0rc1 - -The ndr_pull_get_switch() function was dropped, but it was just a wrapper -around the ndr_token_peek() function, so we can use this approach on both -old and new versions of libndr. - -Signed-off-by: Stephen Gallagher ---- - src/providers/ad/ad_gpo_ndr.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c -index d573033494bc5aa3b56bd698a6860261834e58fd..8f405aa62b1b65a5ab9e4e9131c37fda84c5ffba 100644 ---- a/src/providers/ad/ad_gpo_ndr.c -+++ b/src/providers/ad/ad_gpo_ndr.c -@@ -105,7 +105,7 @@ ndr_pull_security_ace_object_type(struct ndr_pull *ndr, - union security_ace_object_type *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); -+ level = ndr_token_peek(&ndr->switch_list, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_union_align(ndr, 4)); -@@ -135,7 +135,7 @@ ndr_pull_security_ace_object_inherited_type(struct ndr_pull *ndr, - union security_ace_object_inherited_type *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); -+ level = ndr_token_peek(&ndr->switch_list, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_union_align(ndr, 4)); -@@ -198,7 +198,7 @@ ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, - union security_ace_object_ctr *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); -+ level = ndr_token_peek(&ndr->switch_list, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_union_align(ndr, 4)); --- -2.24.1 - diff --git a/sssd-2.2.3.tar.gz b/sssd-2.5.1.tar.gz similarity index 46% rename from sssd-2.2.3.tar.gz rename to sssd-2.5.1.tar.gz index c6b8ee4f33ad697d146525efc95a0149e1e8cd74..92ccef9d477f709a1343497e4ce07e91cf7d5d85 100644 Binary files a/sssd-2.2.3.tar.gz and b/sssd-2.5.1.tar.gz differ diff --git a/sssd-BUILD-Accept-krb5-1.18-for-building-the-PAC-plu.patch b/sssd-BUILD-Accept-krb5-1.18-for-building-the-PAC-plu.patch deleted file mode 100644 index 421fe05e3018143d7dd8a7b5e9030b44417ff199..0000000000000000000000000000000000000000 --- a/sssd-BUILD-Accept-krb5-1.18-for-building-the-PAC-plu.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 192d54ffead1552f7086ebc518907519d903bca4 Mon Sep 17 00:00:00 2001 -From: root -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 \ No newline at end of file diff --git a/sssd.spec b/sssd.spec index 10b0d05533a8c2a75ca0d93e7469e5e270366d12..917bfe435e7c9507bdc752d3c8c3eb808e2cbd4c 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,13 +1,10 @@ Name: sssd -Version: 2.2.3 -Release: 4 +Version: 2.5.1 +Release: 1 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 -Patch1: 0001-Fix-build-failure-against-samba-4.12.0rc1.patch +Source0: https://github.com/SSSD/sssd/releases/download/%{version}/%{name}-%{version}.tar.gz Requires: python3-sssd = %{version}-%{release} Requires: libldb @@ -428,10 +425,10 @@ done %{_libdir}/libsss_nss_idmap.so.* %{_libdir}/libsss_simpleifp.so.* %{_libdir}/libsss_certmap.so.* -%{_libdir}/%{name}/modules/libwbclient.so.* %{_libdir}/libnfsidmap/sss.so %dir %{_libdir}/samba/idmap %{_libdir}/samba/idmap/sss.so +%{_libdir}/security/pam_sss_gss.so %files devel %{_includedir}/sss_idmap.h @@ -450,9 +447,6 @@ done %{_includedir}/sss_certmap.h %{_libdir}/libsss_certmap.so %{_libdir}/pkgconfig/sss_certmap.pc -%{_includedir}/wbclient_sssd.h -%{_libdir}/%{name}/modules/libwbclient.so -%{_libdir}/pkgconfig/wbclient_sssd.pc %files -n python3-sssd -f python3_sssd.lang %dir %{python3_sitelib}/SSSDConfig @@ -505,21 +499,24 @@ fi %postun %systemd_postun_with_restart sssd-autofs.socket -%systemd_postun_with_restart sssd-autofs.service %systemd_postun_with_restart sssd-nss.socket -%systemd_postun_with_restart sssd-nss.service %systemd_postun_with_restart sssd-pac.socket -%systemd_postun_with_restart sssd-pac.service %systemd_postun_with_restart sssd-pam.socket %systemd_postun_with_restart sssd-pam-priv.socket -%systemd_postun_with_restart sssd-pam.service %systemd_postun_with_restart sssd-ssh.socket -%systemd_postun_with_restart sssd-ssh.service %systemd_postun_with_restart sssd-sudo.socket -%systemd_postun_with_restart sssd-sudo.service %systemd_postun_with_restart sssd-kcm.socket %systemd_postun_with_restart sssd-kcm.service %systemd_postun_with_restart sssd-ifp.service + +# Services have RefuseManualStart=true, therefore we can't request restart. +%systemd_postun sssd-autofs.service +%systemd_postun sssd-nss.service +%systemd_postun sssd-pac.service +%systemd_postun sssd-pam.service +%systemd_postun sssd-ssh.service +%systemd_postun sssd-sudo.service + /sbin/ldconfig %posttrans @@ -541,6 +538,10 @@ fi %{_libdir}/%{name}/modules/libwbclient.so %changelog +* Tue Jul 6 2021 zoulin - 2.5.1-1 +- update version to 2.5.1; +- do not use systemd to restart services with RefuseManualStart=true + * Thu Oct 29 2020 panxiaohe - 2.2.3-4 - remove subpackage python2-sssd