Skip to content

Commit d22ea0e

Browse files
SPEC:
- don't build 'systemtap' support - don't build 'selinux_child' support - don't build 'systemd' integration - build '--with-syslog=stderr' - don't build 'libnl' support
1 parent dcf5346 commit d22ea0e

File tree

4 files changed

+7
-106
lines changed

4 files changed

+7
-106
lines changed

Makefile.am

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5209,15 +5209,6 @@ if BUILD_KCM
52095209
src/sysv/systemd/sssd-kcm.service \
52105210
$(NULL)
52115211
endif
5212-
else
5213-
if HAVE_GENTOO
5214-
init_SCRIPTS += \
5215-
src/sysv/gentoo/sssd \
5216-
src/sysv/gentoo/sssd-kcm
5217-
else
5218-
init_SCRIPTS += \
5219-
src/sysv/sssd
5220-
endif
52215212
endif
52225213

52235214

contrib/ci/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ declare -a CONFIGURE_ARG_LIST=(
2828
"--disable-static"
2929
"--enable-ldb-version-check"
3030
"--with-initscript=sysv"
31-
"--with-syslog=syslog"
31+
"--with-syslog=stderr"
3232
"--enable-systemtap"
3333
"--with-subid"
3434
"--with-passkey"

contrib/fedora/bashrc_sssd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fedconfig()
4747
--enable-systemtap \
4848
--with-krb5-rcache-dir=/var/cache/krb5rcache \
4949
--with-initscript=systemd \
50-
--with-syslog=journald \
50+
--with-syslog=stderr \
5151
--with-test-dir=/dev/shm \
5252
--cache-file=/tmp/fedconfig.cache \
5353
--with-passkey \

contrib/sssd.spec.in

Lines changed: 5 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ BuildRequires: libfido2-devel
9090
BuildRequires: libini_config-devel >= 1.3
9191
BuildRequires: libldb-devel
9292
BuildRequires: libnfsidmap-devel
93-
BuildRequires: libnl3-devel
94-
BuildRequires: libselinux-devel
95-
BuildRequires: libsemanage-devel
9693
BuildRequires: libsmbclient-devel
9794
BuildRequires: libtalloc-devel
9895
BuildRequires: libtdb-devel
@@ -120,11 +117,7 @@ BuildRequires: python3-setuptools
120117
BuildRequires: samba-devel
121118
# required for idmap_sss.so
122119
BuildRequires: samba-winbind
123-
BuildRequires: selinux-policy-targeted
124120
BuildRequires: bc
125-
BuildRequires: systemd-devel
126-
BuildRequires: systemtap-sdt-devel
127-
BuildRequires: systemtap-sdt-dtrace
128121
BuildRequires: uid_wrapper
129122
BuildRequires: po4a
130123
%ifarch %{valgrind_arches}
@@ -167,7 +160,6 @@ Requires: libsss_certmap = %{version}-%{release}
167160
Requires(post): coreutils
168161
Requires(postun): coreutils
169162
Requires(pre): shadow-utils
170-
%{?systemd_requires}
171163

172164
%description common
173165
Common files for the SSSD. The common package includes all the files needed
@@ -210,8 +202,6 @@ Requires: sssd-common = %{version}-%{release}
210202
Requires: python3-sss = %{version}-%{release}
211203
Requires: python3-sssdconfig = %{version}-%{release}
212204
Requires: libsss_certmap = %{version}-%{release}
213-
# for logger=journald support with sss_analyze
214-
Requires: python3-systemd
215205
Requires: sssd-dbus
216206

217207
%description tools
@@ -403,7 +393,6 @@ be used by Python applications.
403393
Summary: The D-Bus responder of the SSSD
404394
License: GPL-3.0-or-later
405395
Requires: sssd-common = %{version}-%{release}
406-
%{?systemd_requires}
407396

408397
%description dbus
409398
Provides the D-Bus responder of the SSSD, called the InfoPipe, that allows
@@ -452,7 +441,6 @@ License: GPL-3.0-or-later
452441
Requires: sssd-common = %{version}-%{release}
453442
Requires: krb5-libs
454443
Requires: sssd-krb5-common = %{version}-%{release}
455-
%{?systemd_requires}
456444

457445
%description kcm
458446
An implementation of a Kerberos KCM server. Use this package if you want to
@@ -498,23 +486,25 @@ autoreconf -ivf
498486
--enable-nsslibdir=%{_libdir} \
499487
--enable-pammoddir=%{_libdir}/security \
500488
--enable-sss-default-nss-plugin \
501-
--enable-systemtap \
489+
--disable-systemtap \
502490
--with-db-path=%{dbpath} \
503491
--with-gpo-cache-path=%{gpocachepath} \
504492
--with-init-dir=%{_initrddir} \
505-
--with-initscript=systemd \
493+
--with-initscript=sysv \
506494
--with-krb5-rcache-dir=%{_localstatedir}/cache/krb5rcache \
507495
--with-mcache-path=%{mcpath} \
508496
--with-pipe-path=%{pipepath} \
509497
--with-pubconf-path=%{pubconfpath} \
510498
--with-sssd-user=sssd \
511-
--with-syslog=journald \
499+
--with-syslog=stderr \
512500
--with-test-dir=/dev/shm \
513501
--with-subid \
514502
--with-passkey \
515503
%if ! %{build_idp}
516504
--with-id-provider-idp=no \
517505
%endif
506+
--without-selinux \
507+
--without-libnl \
518508
%{nil}
519509

520510
%make_build all docs runstatedir=%{_rundir}
@@ -670,19 +660,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
670660
%license COPYING
671661
%doc src/examples/sssd-example.conf
672662
%{_sbindir}/sssd
673-
%{_unitdir}/sssd.service
674-
%{_unitdir}/sssd-autofs.socket
675-
%{_unitdir}/sssd-autofs.service
676-
%{_unitdir}/sssd-nss.socket
677-
%{_unitdir}/sssd-nss.service
678-
%{_unitdir}/sssd-pac.socket
679-
%{_unitdir}/sssd-pac.service
680-
%{_unitdir}/sssd-pam.socket
681-
%{_unitdir}/sssd-pam.service
682-
%{_unitdir}/sssd-ssh.socket
683-
%{_unitdir}/sssd-ssh.service
684-
%{_unitdir}/sssd-sudo.socket
685-
%{_unitdir}/sssd-sudo.service
686663

687664
%{_tmpfilesdir}/%{name}.conf
688665

@@ -694,7 +671,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
694671
%{_libexecdir}/%{servicename}/sssd_ssh
695672
%{_libexecdir}/%{servicename}/sssd_sudo
696673
%{_libexecdir}/%{servicename}/p11_child
697-
%{_libexecdir}/%{servicename}/sssd_check_socket_activated_responders
698674

699675
%dir %{_libdir}/%{name}
700676
%{_libdir}/%{name}/libsss_simple.so
@@ -755,16 +731,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
755731
%{_mandir}/man5/sssd-session-recording.5*
756732
%{_mandir}/man8/sssd.8*
757733
%{_mandir}/man8/sss_cache.8*
758-
%dir %{_datadir}/sssd/systemtap
759-
%{_datadir}/sssd/systemtap/id_perf.stp
760-
%{_datadir}/sssd/systemtap/nested_group_perf.stp
761-
%{_datadir}/sssd/systemtap/dp_request.stp
762-
%{_datadir}/sssd/systemtap/ldap_perf.stp
763-
%dir %{_datadir}/systemtap
764-
%dir %{_datadir}/systemtap/tapset
765-
%{_datadir}/systemtap/tapset/sssd.stp
766-
%{_datadir}/systemtap/tapset/sssd_functions.stp
767-
%{_mandir}/man5/sssd-systemtap.5*
768734
%{_sysusersdir}/sssd.conf
769735
%{_datadir}/polkit-1/rules.d/*
770736

@@ -797,7 +763,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
797763
%license COPYING
798764
%attr(770,sssd,sssd) %dir %{keytabdir}
799765
%{_libdir}/%{name}/libsss_ipa.so
800-
%attr(0750,root,sssd) %caps(cap_setuid,cap_setgid=p) %{_libexecdir}/%{servicename}/selinux_child
801766
%{_mandir}/man5/sssd-ipa.5*
802767

803768
%files ad -f sssd_ad.lang
@@ -815,7 +780,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
815780
%license COPYING
816781
%{_libexecdir}/%{servicename}/sssd_ifp
817782
%{_mandir}/man5/sssd-ifp.5*
818-
%{_unitdir}/sssd-ifp.service
819783
# InfoPipe DBus plumbing
820784
%{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
821785
%{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
@@ -940,8 +904,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
940904
%config(noreplace) %{_sysconfdir}/krb5.conf.d/kcm_default_ccache
941905
%dir %{_datadir}/sssd-kcm
942906
%{_datadir}/sssd-kcm/kcm_default_ccache
943-
%{_unitdir}/sssd-kcm.socket
944-
%{_unitdir}/sssd-kcm.service
945907
%{_mandir}/man8/sssd-kcm.8*
946908

947909
%files idp
@@ -966,13 +928,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
966928
%sysusers_create_compat %{SOURCE1}
967929

968930
%post common
969-
%systemd_post sssd.service
970-
%systemd_post sssd-autofs.socket
971-
%systemd_post sssd-nss.socket
972-
%systemd_post sssd-pac.socket
973-
%systemd_post sssd-pam.socket
974-
%systemd_post sssd-ssh.socket
975-
%systemd_post sssd-sudo.socket
976931
%__rm -f %{mcpath}/passwd
977932
%__rm -f %{mcpath}/group
978933
%__rm -f %{mcpath}/initgroups
@@ -985,53 +940,11 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
985940
%__chown -f -h sssd:sssd %{secdbpath}/*.ldb || true
986941
%__chown -f -R sssd:sssd %{gpocachepath} || true
987942

988-
%preun common
989-
%systemd_preun sssd.service
990-
%systemd_preun sssd-autofs.socket
991-
%systemd_preun sssd-nss.socket
992-
%systemd_preun sssd-pac.socket
993-
%systemd_preun sssd-pam.socket
994-
%systemd_preun sssd-ssh.socket
995-
%systemd_preun sssd-sudo.socket
996-
997943
%postun common
998944
%__rm -f %{mcpath}/passwd
999945
%__rm -f %{mcpath}/group
1000946
%__rm -f %{mcpath}/initgroups
1001947
%__rm -f %{mcpath}/sid
1002-
%systemd_postun_with_restart sssd-autofs.socket
1003-
%systemd_postun_with_restart sssd-nss.socket
1004-
%systemd_postun_with_restart sssd-pac.socket
1005-
%systemd_postun_with_restart sssd-pam.socket
1006-
%systemd_postun_with_restart sssd-ssh.socket
1007-
%systemd_postun_with_restart sssd-sudo.socket
1008-
1009-
# Services have RefuseManualStart=true, therefore we can't request restart.
1010-
%systemd_postun sssd-autofs.service
1011-
%systemd_postun sssd-nss.service
1012-
%systemd_postun sssd-pac.service
1013-
%systemd_postun sssd-pam.service
1014-
%systemd_postun sssd-ssh.service
1015-
%systemd_postun sssd-sudo.service
1016-
1017-
%post dbus
1018-
%systemd_post sssd-ifp.service
1019-
1020-
%preun dbus
1021-
%systemd_preun sssd-ifp.service
1022-
1023-
%postun dbus
1024-
%systemd_postun_with_restart sssd-ifp.service
1025-
1026-
%post kcm
1027-
%systemd_post sssd-kcm.socket
1028-
1029-
%preun kcm
1030-
%systemd_preun sssd-kcm.socket
1031-
1032-
%postun kcm
1033-
%systemd_postun_with_restart sssd-kcm.socket
1034-
%systemd_postun_with_restart sssd-kcm.service
1035948

1036949
%post client
1037950
/usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20
@@ -1041,8 +954,5 @@ if [ $1 -eq 0 ] ; then
1041954
/usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so || true
1042955
fi
1043956

1044-
%posttrans common
1045-
%systemd_postun_with_restart sssd.service
1046-
1047957
%changelog
1048958
%autochangelog

0 commit comments

Comments
 (0)