From de87ad5faf0974528e7c97b058ab20ed69bc8acc Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Mon, 5 Feb 2024 09:48:20 +0100 Subject: [PATCH] improve sssd package handling due to removed sssd meta package Resolves: rhbz#2255725 --- 0001-sssd-package-fix.patch | 72 +++++++++++++++++++++++++++++++++++++ realmd.spec | 7 +++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 0001-sssd-package-fix.patch diff --git a/0001-sssd-package-fix.patch b/0001-sssd-package-fix.patch new file mode 100644 index 0000000..acf5dcf --- /dev/null +++ b/0001-sssd-package-fix.patch @@ -0,0 +1,72 @@ +From 4299bd81279830e48b93f163049179aff14d1402 Mon Sep 17 00:00:00 2001 +From: Sumit Bose +Date: Mon, 5 Feb 2024 08:58:56 +0100 +Subject: [PATCH] sssd package fix + +--- + dbus/realm-dbus-constants.h | 1 + + service/realm-sssd-ad.c | 3 +++ + service/realmd-redhat-authconfig.conf | 5 ++++- + service/realmd-redhat.conf | 5 ++++- + 4 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/dbus/realm-dbus-constants.h b/dbus/realm-dbus-constants.h +index d2c2a8b..e49034b 100644 +--- a/dbus/realm-dbus-constants.h ++++ b/dbus/realm-dbus-constants.h +@@ -78,6 +78,7 @@ G_BEGIN_DECLS + #define REALM_DBUS_IDENTIFIER_IPA "ipa" + #define REALM_DBUS_IDENTIFIER_FREEIPA "freeipa" + #define REALM_DBUS_IDENTIFIER_SSSD "sssd" ++#define REALM_DBUS_IDENTIFIER_SSSD_AD "sssd-ad" + #define REALM_DBUS_IDENTIFIER_SAMBA "samba" + #define REALM_DBUS_IDENTIFIER_ADCLI "adcli" + #define REALM_DBUS_IDENTIFIER_EXAMPLE "example" +diff --git a/service/realm-sssd-ad.c b/service/realm-sssd-ad.c +index 096b6c5..64bb488 100644 +--- a/service/realm-sssd-ad.c ++++ b/service/realm-sssd-ad.c +@@ -46,18 +46,21 @@ typedef struct { + + static const gchar *ADCLI_PACKAGES[] = { + REALM_DBUS_IDENTIFIER_SSSD, ++ REALM_DBUS_IDENTIFIER_SSSD_AD, + REALM_DBUS_IDENTIFIER_ADCLI, + NULL + }; + + static const gchar *SAMBA_PACKAGES[] = { + REALM_DBUS_IDENTIFIER_SSSD, ++ REALM_DBUS_IDENTIFIER_SSSD_AD, + REALM_DBUS_IDENTIFIER_SAMBA, + NULL + }; + + static const gchar *ALL_PACKAGES[] = { + REALM_DBUS_IDENTIFIER_SSSD, ++ REALM_DBUS_IDENTIFIER_SSSD_AD, + REALM_DBUS_IDENTIFIER_ADCLI, + REALM_DBUS_IDENTIFIER_SAMBA, + NULL +diff --git a/service/realmd-redhat.conf b/service/realmd-redhat.conf +index 2b11c30..12ec3c3 100644 +--- a/service/realmd-redhat.conf ++++ b/service/realmd-redhat.conf +@@ -13,10 +13,13 @@ oddjob = /usr/sbin/oddjobd + oddjob-mkhomedir = /usr/libexec/oddjob/mkhomedir + + [sssd-packages] +-sssd = /usr/sbin/sssd ++sssd-common = /usr/sbin/sssd + oddjob = /usr/sbin/oddjobd + oddjob-mkhomedir = /usr/libexec/oddjob/mkhomedir + ++[sssd-ad-packages] ++sssd-ad = /usr/libexec/sssd/gpo_child ++ + [adcli-packages] + adcli = /usr/sbin/adcli + +-- +2.43.0 + diff --git a/realmd.spec b/realmd.spec index e64f1d7..c39aa11 100644 --- a/realmd.spec +++ b/realmd.spec @@ -1,6 +1,6 @@ Name: realmd Version: 0.17.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Kerberos realm enrollment service License: LGPL-2.1-or-later URL: https://gitlab.freedesktop.org/realmd/realmd @@ -9,6 +9,7 @@ Source0: https://gitlab.freedesktop.org/realmd/realmd/uploads/204d05bd487908ece2 Patch0001: 0001-service-allow-multiple-names-and-_srv_-ad_server-opt.patch Patch0002: 0002-service-fix-error-message-when-removing-host-from-AD.patch Patch0003: 0003-doc-fix-reference-in-realmd.conf-man-page.patch +Patch0004: 0001-sssd-package-fix.patch BuildRequires: make BuildRequires: gcc @@ -95,6 +96,10 @@ make check %doc ChangeLog %changelog +* Mon Feb 05 2024 Sumit Bose - 0.17.1-8 +- improve sssd package handling due to removed sssd meta package + Resolves: rhbz#2255725 + * Fri Jan 26 2024 Fedora Release Engineering - 0.17.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild