URL: https://github.com/SSSD/sssd/pull/5859
Author: alexey-tikhonov
Title: #5859: A couple of spec-file updates.
Action: synchronized
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/5859/head:pr5859
git checkout pr5859
From 8b2005433b8598b75b79bfb232367580f3e0ea08 Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikh...@redhat.com>
Date: Mon, 1 Nov 2021 12:08:08 +0100
Subject: [PATCH 1/3] SPEC: enabled build of 'subid ranges' support
Since feature support in shadow-utils is available since
upstream release version 4.9, support in SSSD can also be
enabled by default.
:packaging: 'subid ranges' support was enabled by default.
---
contrib/sssd.spec.in | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index b46b988eb3..6b03998156 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -14,6 +14,14 @@
%global child_attrs 4750
%endif
+%if 0%{?fedora} >= 35
+%global build_subid 1
+%elif 0%{?rhel} >= 9
+%global build_subid 1
+%else
+%global build_subid 0
+%endif
+
%if 0%{?fedora} >= 34
%global build_kcm_renewals 1
%global krb5_version 1.19.1
@@ -136,6 +144,9 @@ BuildRequires: systemd-devel
BuildRequires: systemtap-sdt-devel
BuildRequires: uid_wrapper
BuildRequires: po4a
+%if %{build_subid}
+BuildRequires: shadow-utils-subid-devel
+%endif
%if %{build_kcm_renewals}
BuildRequires: krb5-libs >= %{krb5_version}
%endif
@@ -519,6 +530,9 @@ autoreconf -ivf
--with-sssd-user=%{sssd_user} \
--with-syslog=journald \
--with-test-dir=/dev/shm \
+%if %{build_subid}
+ --with-subid \
+%endif
%if 0%{?fedora}
--enable-files-domain \
--disable-polkit-rules-path \
@@ -826,6 +840,9 @@ done
%files client -f sssd_client.lang
%license src/sss_client/COPYING src/sss_client/COPYING.LESSER
%{_libdir}/libnss_sss.so.2
+%if %{build_subid}
+%{_libdir}/libsubid_sss.so
+%endif
%{_libdir}/security/pam_sss.so
%{_libdir}/security/pam_sss_gss.so
%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
From 0a6b0d1002c27c355fd050aea60ed85432f46bed Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikh...@redhat.com>
Date: Mon, 1 Nov 2021 12:12:23 +0100
Subject: [PATCH 2/3] SPEC: disable running files provider by default
This is to sync Fedora and upstream spec-files.
---
contrib/sssd.spec.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 6b03998156..4d92c34018 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -534,7 +534,6 @@ autoreconf -ivf
--with-subid \
%endif
%if 0%{?fedora}
- --enable-files-domain \
--disable-polkit-rules-path \
%endif
%{nil}
From bab32903793d4ec83606ec6a2d546d4e26712324 Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikh...@redhat.com>
Date: Thu, 4 Nov 2021 20:32:05 +0100
Subject: [PATCH 3/3] INTG-TESTS: enable build of 'subid ranges' support
---
contrib/ci/configure.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh
index 4ab650be8b..d43de3be40 100644
--- a/contrib/ci/configure.sh
+++ b/contrib/ci/configure.sh
@@ -71,6 +71,13 @@ if [[ "$DISTRO_BRANCH" == -redhat-fedora-3[2-9]* ]]; then
)
fi
+if [[ "$DISTRO_BRANCH" == -redhat-fedora-3[5-9]* ||
+ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ]]; then
+ CONFIGURE_ARG_LIST+=(
+ "--with-subid"
+ )
+fi
+
declare -r -a CONFIGURE_ARG_LIST
fi # _CONFIGURE_SH
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
