From 47ebe6b93a6e28bbb5e3147409e3de9c58dc0568 Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikhono@redhat.com>
Date: Wed, 26 Jun 2024 14:03:20 +0200
Subject: [PATCH] Resolves: RHEL-40253 - Rebase SSSD for RHEL 10-beta Resolves:
 RHEL-43259 - sudo does not work any more with krb ticket

---
 .gitignore |  1 +
 sources    |  2 +-
 sssd.spec  | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae09e99..de42cf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@ sssd-1.2.91.tar.gz
 /sssd-2.9.4.tar.gz
 /sssd-2.10.0~beta1.tar.gz
 /sssd-2.10.0-beta1.tar.gz
+/sssd-2.10.0-beta2.tar.gz
diff --git a/sources b/sources
index e8d914a..e93ed16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sssd-2.10.0-beta1.tar.gz) = f643872c36b22f14eab9e8d8495d8720499a5710e45c117e71aa59ac75593767725b6c63295f37a784c1f3206cf3aef68d12b0292a5db60ca81a3aa5191dbea4
+SHA512 (sssd-2.10.0-beta2.tar.gz) = 0de63006d6c9d1658edcdb76c6eca2b2a7858a0805ff3a81c96959e599dc55c09098c34b3a3e38730fbb59edd7e7d7d12eb17ede06411c8131e9dce938e0e810
diff --git a/sssd.spec b/sssd.spec
index 63a08ed..c76dace 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -59,13 +59,13 @@
 %global samba_package_version %(rpm -q samba-devel --queryformat %{version}-%{release})
 
 Name: sssd
-Version: 2.10.0~beta1
+Version: 2.10.0~beta2
 # Using '.el10' directly is a work around RHEL-38900
-Release: 2.el10
+Release: 1%{?dist}
 Summary: System Security Services Daemon
 License: GPL-3.0-or-later
 URL: https://github.com/SSSD/sssd/
-Source0: https://github.com/SSSD/sssd/releases/download/2.10.0-beta1/sssd-2.10.0-beta1.tar.gz
+Source0: https://github.com/SSSD/sssd/releases/download/2.10.0-beta2/sssd-2.10.0-beta2.tar.gz
 Source1: sssd.sysusers
 
 ### Patches ###
@@ -544,7 +544,7 @@ enable authentication with passkey token.
 %endif
 
 %prep
-%autosetup -n sssd-2.10.0-beta1 -p1
+%autosetup -n sssd-2.10.0-beta2 -p1
 
 %build
 
@@ -763,7 +763,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
 %dir %{_libexecdir}/%{servicename}
 %{_libexecdir}/%{servicename}/sssd_be
 %{_libexecdir}/%{servicename}/sssd_nss
-%{_libexecdir}/%{servicename}/sssd_pam
+%attr(0750,root,%{sssd_user}) %caps(cap_dac_read_search=p) %{_libexecdir}/%{servicename}/sssd_pam
 %{_libexecdir}/%{servicename}/sssd_autofs
 %{_libexecdir}/%{servicename}/sssd_ssh
 %{_libexecdir}/%{servicename}/sssd_sudo
@@ -892,7 +892,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
 
 %files proxy
 %license COPYING
-%{_libexecdir}/%{servicename}/proxy_child
+%attr(0750,root,%{sssd_user}) %{_libexecdir}/%{servicename}/proxy_child
 %{_libdir}/%{name}/libsss_proxy.so
 
 %files dbus -f sssd_dbus.lang
@@ -1038,7 +1038,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
 
 %if %{build_passkey}
 %files passkey
-%attr(755,%{sssd_user},%{sssd_user}) %{_libexecdir}/%{servicename}/passkey_child
+%{_libexecdir}/%{servicename}/passkey_child
 %{_libdir}/%{name}/modules/sssd_krb5_passkey_plugin.so
 %{_datadir}/sssd/krb5-snippets/sssd_enable_passkey
 %if "%{sssd_user}" != "root"
@@ -1135,6 +1135,10 @@ fi
 %systemd_postun_with_restart sssd.service
 
 %changelog
+* Wed Jun 26 2024 Alexey Tikhonov <atikhono@redhat.com> - 2.10.0~beta1-2
+- Resolves: RHEL-40253 - Rebase SSSD for RHEL 10-beta
+- Resolves: RHEL-43259 - sudo does not work any more with krb ticket
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.10.0~beta1-2.el10
 - Bump release for June 2024 mass rebuild