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 e200e94dbbd426721e05e847668c3b6675a3853b 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 | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index b46b988eb3..ea376bba43 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -14,6 +14,10 @@
%global child_attrs 4750
%endif
+%if 0%{?fedora} >= 35
+%global build_subid 1
+%endif
+
%if 0%{?fedora} >= 34
%global build_kcm_renewals 1
%global krb5_version 1.19.1
@@ -136,6 +140,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 +526,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 +836,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 b26e3ab0e37a313b3931c1bd63b07ae29999df58 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 ea376bba43..30f5ce8b84 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -530,7 +530,6 @@ autoreconf -ivf
--with-subid \
%endif
%if 0%{?fedora}
- --enable-files-domain \
--disable-polkit-rules-path \
%endif
%{nil}
From 264842125cfc3d622adf22978971d3efcf2e08bf Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikh...@redhat.com>
Date: Mon, 1 Nov 2021 22:42:45 +0100
Subject: [PATCH 3/3] INTG-TESTS: enable build of 'subid ranges' support
---
Makefile.am | 7 +++++++
configure.ac | 3 +++
2 files changed, 10 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index f6bc9414d0..ca3dfdf513 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3885,6 +3885,12 @@ endif
# Integration tests #
#####################
+if DISTRO_FEDORA
+if DISTRO_RELEASE_GE_35
+INTG_BUILD_SUBID := "--with-subid"
+endif
+endif
+
intgcheck-prepare:
set -e; \
rm -Rf intg; \
@@ -3899,6 +3905,7 @@ intgcheck-prepare:
--enable-intgcheck-reqs \
--without-semanage \
--with-session-recording-shell=/bin/false \
+ $(INTG_BUILD_SUBID) \
--enable-files-domain \
$(INTGCHECK_CONFIGURE_FLAGS) \
CFLAGS="-O2 -g $$CFLAGS"; \
diff --git a/configure.ac b/configure.ac
index bf5ac659a7..6f339486b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,9 @@ AC_SUBST([PRERELEASE_VERSION],
AC_DEFINE([PRERELEASE_VERSION], "PRERELEASE_VERSION_NUMBER",
[Prerelease version number of package])
+AM_CONDITIONAL([DISTRO_FEDORA], [test `lsb_release -i -s` = "Fedora"])
+AM_CONDITIONAL([DISTRO_RELEASE_GE_35], [test `lsb_release -r -s` -ge 35])
+
AM_CONDITIONAL([GIT_CHECKOUT], [git log -1 >/dev/null 2>&1])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
_______________________________________________
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
