Skip to content

Commit d24edcd

Browse files
SPEC: don't build 'systemd' integration
1 parent 9c8dab4 commit d24edcd

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
@@ -5265,15 +5265,6 @@ if BUILD_KCM
52655265
src/sysv/systemd/sssd-kcm.service \
52665266
$(NULL)
52675267
endif
5268-
else
5269-
if HAVE_GENTOO
5270-
init_SCRIPTS += \
5271-
src/sysv/gentoo/sssd \
5272-
src/sysv/gentoo/sssd-kcm
5273-
else
5274-
init_SCRIPTS += \
5275-
src/sysv/sssd
5276-
endif
52775268
endif
52785269

52795270

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%{?fedora} >= 41 || 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
@@ -155,7 +150,6 @@ BuildRequires: samba-winbind
155150
# required for p11_child smartcard tests
156151
BuildRequires: softhsm >= 2.1.0
157152
BuildRequires: bc
158-
BuildRequires: systemd-devel
159153
BuildRequires: uid_wrapper
160154
BuildRequires: po4a
161155
BuildRequires: valgrind-devel
@@ -202,7 +196,6 @@ Requires(postun): coreutils
202196
%if %{use_sssd_user}
203197
Requires(pre): shadow-utils
204198
%endif
205-
%{?systemd_requires}
206199

207200
### Provides ###
208201
Provides: libsss_sudo-devel = %{version}-%{release}
@@ -249,8 +242,6 @@ Requires: sssd-common = %{version}-%{release}
249242
Requires: python3-sss = %{version}-%{release}
250243
Requires: python3-sssdconfig = %{version}-%{release}
251244
Requires: libsss_certmap = %{version}-%{release}
252-
# for logger=journald support with sss_analyze
253-
Requires: python3-systemd
254245
Requires: sssd-dbus
255246

256247
%description tools
@@ -442,7 +433,6 @@ be used by Python applications.
442433
Summary: The D-Bus responder of the SSSD
443434
License: GPLv3+
444435
Requires: sssd-common = %{version}-%{release}
445-
%{?systemd_requires}
446436

447437
%description dbus
448438
Provides the D-Bus responder of the SSSD, called the InfoPipe, that allows
@@ -524,7 +514,6 @@ Requires: sssd-common = %{version}-%{release}
524514
%if %{build_kcm_renewals}
525515
Requires: krb5-libs >= %{krb5_version}
526516
%endif
527-
%{?systemd_requires}
528517

529518
%description kcm
530519
An implementation of a Kerberos KCM server. Use this package if you want to
@@ -574,7 +563,7 @@ autoreconf -ivf
574563
--with-db-path=%{dbpath} \
575564
--with-gpo-cache-path=%{gpocachepath} \
576565
--with-init-dir=%{_initrddir} \
577-
--with-initscript=systemd \
566+
--with-initscript=sysv \
578567
--with-krb5-rcache-dir=%{_localstatedir}/cache/krb5rcache \
579568
--with-mcache-path=%{mcpath} \
580569
--with-pipe-path=%{pipepath} \
@@ -756,19 +745,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
756745
%license COPYING
757746
%doc src/examples/sssd-example.conf
758747
%{_sbindir}/sssd
759-
%{_unitdir}/sssd.service
760-
%{_unitdir}/sssd-autofs.socket
761-
%{_unitdir}/sssd-autofs.service
762-
%{_unitdir}/sssd-nss.socket
763-
%{_unitdir}/sssd-nss.service
764-
%{_unitdir}/sssd-pac.socket
765-
%{_unitdir}/sssd-pac.service
766-
%{_unitdir}/sssd-pam.socket
767-
%{_unitdir}/sssd-pam.service
768-
%{_unitdir}/sssd-ssh.socket
769-
%{_unitdir}/sssd-ssh.service
770-
%{_unitdir}/sssd-sudo.socket
771-
%{_unitdir}/sssd-sudo.service
772748

773749
%dir %{_libexecdir}/%{servicename}
774750
%{_libexecdir}/%{servicename}/sssd_be
@@ -778,7 +754,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
778754
%{_libexecdir}/%{servicename}/sssd_ssh
779755
%{_libexecdir}/%{servicename}/sssd_sudo
780756
%{_libexecdir}/%{servicename}/p11_child
781-
%{_libexecdir}/%{servicename}/sssd_check_socket_activated_responders
782757

783758
%dir %{_libdir}/%{name}
784759
%{_libdir}/%{name}/libsss_simple.so
@@ -898,7 +873,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
898873
%license COPYING
899874
%{_libexecdir}/%{servicename}/sssd_ifp
900875
%{_mandir}/man5/sssd-ifp.5*
901-
%{_unitdir}/sssd-ifp.service
902876
# InfoPipe DBus plumbing
903877
%{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
904878
%{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
@@ -1037,8 +1011,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
10371011
%config(noreplace) %{_sysconfdir}/krb5.conf.d/kcm_default_ccache
10381012
%dir %{_datadir}/sssd-kcm
10391013
%{_datadir}/sssd-kcm/kcm_default_ccache
1040-
%{_unitdir}/sssd-kcm.socket
1041-
%{_unitdir}/sssd-kcm.service
10421014
%{_mandir}/man8/sssd-kcm.8*
10431015

10441016
%files idp
@@ -1069,13 +1041,6 @@ getent passwd sssd >/dev/null || useradd -r -g sssd -d / -s /sbin/nologin -c "Us
10691041
%endif
10701042

10711043
%post common
1072-
%systemd_post sssd.service
1073-
%systemd_post sssd-autofs.socket
1074-
%systemd_post sssd-nss.socket
1075-
%systemd_post sssd-pac.socket
1076-
%systemd_post sssd-pam.socket
1077-
%systemd_post sssd-ssh.socket
1078-
%systemd_post sssd-sudo.socket
10791044
%__rm -f %{mcpath}/passwd
10801045
%__rm -f %{mcpath}/group
10811046
%__rm -f %{mcpath}/initgroups
@@ -1085,53 +1050,11 @@ getent passwd sssd >/dev/null || useradd -r -g sssd -d / -s /sbin/nologin -c "Us
10851050
%__chown -f -R %{sssd_user}:%{sssd_user} %{_sysconfdir}/sssd/conf.d || true
10861051
%__chown -f %{sssd_user}:%{sssd_user} %{_var}/log/%{name}/*.log || true
10871052

1088-
%preun common
1089-
%systemd_preun sssd.service
1090-
%systemd_preun sssd-autofs.socket
1091-
%systemd_preun sssd-nss.socket
1092-
%systemd_preun sssd-pac.socket
1093-
%systemd_preun sssd-pam.socket
1094-
%systemd_preun sssd-ssh.socket
1095-
%systemd_preun sssd-sudo.socket
1096-
10971053
%postun common
10981054
%__rm -f %{mcpath}/passwd
10991055
%__rm -f %{mcpath}/group
11001056
%__rm -f %{mcpath}/initgroups
11011057
%__rm -f %{mcpath}/sid
1102-
%systemd_postun_with_restart sssd-autofs.socket
1103-
%systemd_postun_with_restart sssd-nss.socket
1104-
%systemd_postun_with_restart sssd-pac.socket
1105-
%systemd_postun_with_restart sssd-pam.socket
1106-
%systemd_postun_with_restart sssd-ssh.socket
1107-
%systemd_postun_with_restart sssd-sudo.socket
1108-
1109-
# Services have RefuseManualStart=true, therefore we can't request restart.
1110-
%systemd_postun sssd-autofs.service
1111-
%systemd_postun sssd-nss.service
1112-
%systemd_postun sssd-pac.service
1113-
%systemd_postun sssd-pam.service
1114-
%systemd_postun sssd-ssh.service
1115-
%systemd_postun sssd-sudo.service
1116-
1117-
%post dbus
1118-
%systemd_post sssd-ifp.service
1119-
1120-
%preun dbus
1121-
%systemd_preun sssd-ifp.service
1122-
1123-
%postun dbus
1124-
%systemd_postun_with_restart sssd-ifp.service
1125-
1126-
%post kcm
1127-
%systemd_post sssd-kcm.socket
1128-
1129-
%preun kcm
1130-
%systemd_preun sssd-kcm.socket
1131-
1132-
%postun kcm
1133-
%systemd_postun_with_restart sssd-kcm.socket
1134-
%systemd_postun_with_restart sssd-kcm.service
11351058

11361059
%post client
11371060
/usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20
@@ -1141,9 +1064,6 @@ if [ $1 -eq 0 ] ; then
11411064
/usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so
11421065
fi
11431066

1144-
%posttrans common
1145-
%systemd_postun_with_restart sssd.service
1146-
11471067
%changelog
11481068
* Thu Jan 21 2021 Pavel Březina <[email protected]> - @PACKAGE_NAME@-@PACKAGE_VERSION@-0@PRERELEASE_VERSION@
11491069
- Built from upstream sources.

0 commit comments

Comments
 (0)