Skip to content

Commit fbcfc56

Browse files
SPEC: don't build 'systemd' integration
1 parent d30a40f commit fbcfc56

File tree

2 files changed

+1
-90
lines changed

2 files changed

+1
-90
lines changed

Makefile.am

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5255,15 +5255,6 @@ if BUILD_KCM
52555255
src/sysv/systemd/sssd-kcm.service \
52565256
$(NULL)
52575257
endif
5258-
else
5259-
if HAVE_GENTOO
5260-
init_SCRIPTS += \
5261-
src/sysv/gentoo/sssd \
5262-
src/sysv/gentoo/sssd-kcm
5263-
else
5264-
init_SCRIPTS += \
5265-
src/sysv/sssd
5266-
endif
52675258
endif
52685259

52695260

contrib/sssd.spec.in

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
%global sssd_user root
1010
%endif
1111

12-
# sysusers depends on presence of sssd user
13-
%if 0%{?rhel} >= 10
14-
%global use_sysusers 1
15-
%else
1612
%global use_sysusers 0
17-
%endif
1813

1914
# Capabilities of privileged child helpers (required even if SSSD runs under root)
2015
%global child_capabilities cap_chown,cap_dac_override,cap_setuid,cap_setgid=ep
@@ -154,7 +149,6 @@ BuildRequires: samba-winbind
154149
# required for p11_child smartcard tests
155150
BuildRequires: softhsm >= 2.1.0
156151
BuildRequires: bc
157-
BuildRequires: systemd-devel
158152
BuildRequires: uid_wrapper
159153
BuildRequires: po4a
160154
BuildRequires: valgrind-devel
@@ -199,7 +193,6 @@ Requires(postun): coreutils
199193
%if %{use_sssd_user}
200194
Requires(pre): shadow-utils
201195
%endif
202-
%{?systemd_requires}
203196

204197
### Provides ###
205198
Provides: libsss_sudo-devel = %{version}-%{release}
@@ -246,8 +239,6 @@ Requires: sssd-common = %{version}-%{release}
246239
Requires: python3-sss = %{version}-%{release}
247240
Requires: python3-sssdconfig = %{version}-%{release}
248241
Requires: libsss_certmap = %{version}-%{release}
249-
# for logger=journald support with sss_analyze
250-
Requires: python3-systemd
251242
Requires: sssd-dbus
252243

253244
%description tools
@@ -439,7 +430,6 @@ be used by Python applications.
439430
Summary: The D-Bus responder of the SSSD
440431
License: GPLv3+
441432
Requires: sssd-common = %{version}-%{release}
442-
%{?systemd_requires}
443433

444434
%description dbus
445435
Provides the D-Bus responder of the SSSD, called the InfoPipe, that allows
@@ -502,7 +492,6 @@ Requires: sssd-common = %{version}-%{release}
502492
%if %{build_kcm_renewals}
503493
Requires: krb5-libs >= %{krb5_version}
504494
%endif
505-
%{?systemd_requires}
506495

507496
%description kcm
508497
An implementation of a Kerberos KCM server. Use this package if you want to
@@ -552,7 +541,7 @@ autoreconf -ivf
552541
--with-db-path=%{dbpath} \
553542
--with-gpo-cache-path=%{gpocachepath} \
554543
--with-init-dir=%{_initrddir} \
555-
--with-initscript=systemd \
544+
--with-initscript=sysv \
556545
--with-krb5-rcache-dir=%{_localstatedir}/cache/krb5rcache \
557546
--with-mcache-path=%{mcpath} \
558547
--with-pipe-path=%{pipepath} \
@@ -731,19 +720,6 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con
731720
%license COPYING
732721
%doc src/examples/sssd-example.conf
733722
%{_sbindir}/sssd
734-
%{_unitdir}/sssd.service
735-
%{_unitdir}/sssd-autofs.socket
736-
%{_unitdir}/sssd-autofs.service
737-
%{_unitdir}/sssd-nss.socket
738-
%{_unitdir}/sssd-nss.service
739-
%{_unitdir}/sssd-pac.socket
740-
%{_unitdir}/sssd-pac.service
741-
%{_unitdir}/sssd-pam.socket
742-
%{_unitdir}/sssd-pam.service
743-
%{_unitdir}/sssd-ssh.socket
744-
%{_unitdir}/sssd-ssh.service
745-
%{_unitdir}/sssd-sudo.socket
746-
%{_unitdir}/sssd-sudo.service
747723

748724
%dir %{_libexecdir}/%{servicename}
749725
%{_libexecdir}/%{servicename}/sssd_be
@@ -753,7 +729,6 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con
753729
%{_libexecdir}/%{servicename}/sssd_ssh
754730
%{_libexecdir}/%{servicename}/sssd_sudo
755731
%{_libexecdir}/%{servicename}/p11_child
756-
%{_libexecdir}/%{servicename}/sssd_check_socket_activated_responders
757732

758733
%dir %{_libdir}/%{name}
759734
%{_libdir}/%{name}/libsss_simple.so
@@ -873,7 +848,6 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con
873848
%license COPYING
874849
%{_libexecdir}/%{servicename}/sssd_ifp
875850
%{_mandir}/man5/sssd-ifp.5*
876-
%{_unitdir}/sssd-ifp.service
877851
# InfoPipe DBus plumbing
878852
%{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
879853
%{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
@@ -1000,8 +974,6 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con
1000974
%config(noreplace) %{_sysconfdir}/krb5.conf.d/kcm_default_ccache
1001975
%dir %{_datadir}/sssd-kcm
1002976
%{_datadir}/sssd-kcm/kcm_default_ccache
1003-
%{_unitdir}/sssd-kcm.socket
1004-
%{_unitdir}/sssd-kcm.service
1005977
%{_mandir}/man8/sssd-kcm.8*
1006978

1007979
%files idp
@@ -1032,13 +1004,6 @@ getent passwd sssd >/dev/null || useradd -r -g sssd -d / -s /sbin/nologin -c "Us
10321004
%endif
10331005

10341006
%post common
1035-
%systemd_post sssd.service
1036-
%systemd_post sssd-autofs.socket
1037-
%systemd_post sssd-nss.socket
1038-
%systemd_post sssd-pac.socket
1039-
%systemd_post sssd-pam.socket
1040-
%systemd_post sssd-ssh.socket
1041-
%systemd_post sssd-sudo.socket
10421007
%__rm -f %{mcpath}/passwd
10431008
%__rm -f %{mcpath}/group
10441009
%__rm -f %{mcpath}/initgroups
@@ -1048,53 +1013,11 @@ getent passwd sssd >/dev/null || useradd -r -g sssd -d / -s /sbin/nologin -c "Us
10481013
%__chown -R %{sssd_user}:%{sssd_user} %{_sysconfdir}/sssd/conf.d
10491014
%__chown %{sssd_user}:%{sssd_user} %{_var}/log/%{name}/*.log
10501015

1051-
%preun common
1052-
%systemd_preun sssd.service
1053-
%systemd_preun sssd-autofs.socket
1054-
%systemd_preun sssd-nss.socket
1055-
%systemd_preun sssd-pac.socket
1056-
%systemd_preun sssd-pam.socket
1057-
%systemd_preun sssd-ssh.socket
1058-
%systemd_preun sssd-sudo.socket
1059-
10601016
%postun common
10611017
%__rm -f %{mcpath}/passwd
10621018
%__rm -f %{mcpath}/group
10631019
%__rm -f %{mcpath}/initgroups
10641020
%__rm -f %{mcpath}/sid
1065-
%systemd_postun_with_restart sssd-autofs.socket
1066-
%systemd_postun_with_restart sssd-nss.socket
1067-
%systemd_postun_with_restart sssd-pac.socket
1068-
%systemd_postun_with_restart sssd-pam.socket
1069-
%systemd_postun_with_restart sssd-ssh.socket
1070-
%systemd_postun_with_restart sssd-sudo.socket
1071-
1072-
# Services have RefuseManualStart=true, therefore we can't request restart.
1073-
%systemd_postun sssd-autofs.service
1074-
%systemd_postun sssd-nss.service
1075-
%systemd_postun sssd-pac.service
1076-
%systemd_postun sssd-pam.service
1077-
%systemd_postun sssd-ssh.service
1078-
%systemd_postun sssd-sudo.service
1079-
1080-
%post dbus
1081-
%systemd_post sssd-ifp.service
1082-
1083-
%preun dbus
1084-
%systemd_preun sssd-ifp.service
1085-
1086-
%postun dbus
1087-
%systemd_postun_with_restart sssd-ifp.service
1088-
1089-
%post kcm
1090-
%systemd_post sssd-kcm.socket
1091-
1092-
%preun kcm
1093-
%systemd_preun sssd-kcm.socket
1094-
1095-
%postun kcm
1096-
%systemd_postun_with_restart sssd-kcm.socket
1097-
%systemd_postun_with_restart sssd-kcm.service
10981021

10991022
%post client
11001023
/usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20
@@ -1104,9 +1027,6 @@ if [ $1 -eq 0 ] ; then
11041027
/usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so
11051028
fi
11061029

1107-
%posttrans common
1108-
%systemd_postun_with_restart sssd.service
1109-
11101030
%changelog
11111031
* Thu Jan 21 2021 Pavel Březina <pbrezina@redhat.com> - @PACKAGE_NAME@-@PACKAGE_VERSION@-0@PRERELEASE_VERSION@
11121032
- Built from upstream sources.

0 commit comments

Comments
 (0)