From c79dc41684b701556bc8ad0cd8abc425b55144257071ca06933a2026719b750e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Nov 2023 18:20:32 +0000 Subject: [PATCH 1/2] Accepting request 1127890 from home:scabrero:jsc-ped6714 - Adapt spec file for SLE 15 SP6/Leap 15.6; (jsc#PED-6714); * Remove package sssd-common, merged into sssd * Continue building deprecated files provider and infopipe responder * Disable selinux and semanage * Provide rcsssd shortcut OBS-URL: https://build.opensuse.org/request/show/1127890 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=303 --- baselibs.conf | 2 + sssd.changes | 10 +++++ sssd.spec | 101 +++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 112 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index b125802..d35a1bc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,3 +2,5 @@ sssd supplements "packageand(sssd:pam-)" supplements "packageand(sssd:glibc-)" -/usr/lib(64)?/* + obsoletes "sssd-common- < " + provides "sssd-common- = " diff --git a/sssd.changes b/sssd.changes index f1a0abf..d63281b 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 21 09:43:57 UTC 2023 - Samuel Cabrero + +- Adapt spec file for SLE 15 SP6/Leap 15.6; (jsc#PED-6714); + * Remove package sssd-common, merged into sssd + * Continue building deprecated files provider and infopipe + responder + * Disable selinux and semanage + * Provide rcsssd shortcut + ------------------------------------------------------------------- Fri Nov 17 14:52:30 UTC 2023 - Samuel Cabrero diff --git a/sssd.spec b/sssd.spec index c496c32..59d3afb 100644 --- a/sssd.spec +++ b/sssd.spec @@ -65,12 +65,16 @@ BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(ldb) >= 0.9.2 BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcrypto) +%if 0%{?suse_version} >= 1600 BuildRequires: pkgconfig(libcurl) +%endif BuildRequires: pkgconfig(libnfsidmap) BuildRequires: pkgconfig(libnl-3.0) >= 3.0 BuildRequires: pkgconfig(libnl-route-3.0) >= 3.0 BuildRequires: pkgconfig(libpcre2-8) +%if 0%{?suse_version} >= 1600 BuildRequires: pkgconfig(libsemanage) +%endif BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(ndr_krb5pac) BuildRequires: pkgconfig(ndr_nbt) @@ -88,6 +92,8 @@ Requires(postun):pam-config Provides: libsss_sudo = %version-%release Provides: sssd-client = %version-%release Obsoletes: libsss_sudo < %version-%release +Provides: sssd-common = %version-%release +Obsoletes: sssd-common < %version-%release %define servicename sssd %define sssdstatedir %_localstatedir/lib/sss @@ -298,6 +304,28 @@ Requires: libsss_nss_idmap0 = %version %description -n libsss_nss_idmap-devel A utility library for FreeIPA to map Windows SIDs to Unix user/group IDs. +%if 0%{?suse_version} < 1600 +%package -n libsss_simpleifp0 +Summary: The SSSD D-Bus responder helper library +License: GPL-3.0-or-later +Group: System/Libraries + +%description -n libsss_simpleifp0 +This subpackage provides a library that simplifies the D-Bus API for +the SSSD InfoPipe responder. + +%package -n libsss_simpleifp-devel +Summary: Development files for the SSSD D-Bus responder helper library +License: GPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libsss_simpleifp0 = %version + +%description -n libsss_simpleifp-devel +This subpackage provides the development files for sssd's simpleifp, +a library that simplifies the D-Bus API for the SSSD InfoPipe +responder. +%endif + %package -n libsss_sudo Summary: A library to allow communication between sudo and SSSD License: LGPL-3.0-or-later @@ -367,13 +395,18 @@ autoreconf -fiv --enable-nsslibdir="/%_lib" \ --enable-pammoddir="%_pam_moduledir" \ --with-ldb-lib-dir="%ldbdir" \ - --with-selinux=yes \ --with-os=suse \ --disable-ldb-version-check \ --without-python2-bindings \ --without-oidc-child \ %if 0%{?suse_version} >= 1600 + --with-selinux=yes \ --with-subid +%else + --with-selinux=no \ + --with-semanage=no \ + --with-libsifp \ + --with-files-provider %endif %make_build all @@ -396,6 +429,10 @@ install -m644 src/examples/logrotate "$b/%_sysconfdir/logrotate.d/sssd" %endif rm -Rfv "$b/%_initddir" +%if 0%{?suse_version} < 1600 +ln -s service "$b/%_sbindir/rcsssd" +%endif + mkdir -pv "$b/%sssdstatedir/mc" find "$b" -type f -name "*.la" -print -delete %find_lang %name --all-name @@ -449,6 +486,10 @@ fi %postun -n libsss_idmap0 -p /sbin/ldconfig %post -n libsss_nss_idmap0 -p /sbin/ldconfig %postun -n libsss_nss_idmap0 -p /sbin/ldconfig +%if 0%{?suse_version} < 1600 +%post -n libsss_simpleifp0 -p /sbin/ldconfig +%postun -n libsss_simpleifp0 -p /sbin/ldconfig +%endif %triggerun -- %name < %version-%release # sssd takes care of upgrading the database but it doesn't handle downgrades. @@ -483,11 +524,41 @@ fi %postun kcm %service_del_postun sssd-kcm.service sssd-kcm.socket +%pretrans +# Migrate sssd.service from sssd-common to sssd +systemctl is-enabled sssd.service > /dev/null +if [ $? -eq 0 ]; then +mkdir -p /run/systemd/rpm/ +touch /run/systemd/rpm/sssd-was-enabled +fi +systemctl is-active sssd.service > /dev/null +if [ $? -eq 0 ]; then +mkdir -p /run/systemd/rpm/ +touch /run/systemd/rpm/sssd-was-active +fi + %posttrans # Migration to /usr/etc, restore just created .rpmsave for i in sssd/sssd.conf logrotate.d/sssd pam.d/sssd-shadowutils ; do test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: done +# Migrate sssd.service from sssd-common to sssd +if [ -e /run/systemd/rpm/sssd-was-enabled ]; then +systemctl is-enabled sssd.service > /dev/null +if [ $? -ne 0 ]; then + echo "Migrating sssd.service, was enabled" + systemctl enable sssd.service +fi +rm /run/systemd/rpm/sssd-was-enabled +fi +if [ -e /run/systemd/rpm/sssd-was-active ]; then +systemctl is-active sssd.service > /dev/null +if [ $? -ne 0 ]; then + echo "Migrating sssd.service, was active" + systemctl start sssd.service +fi +rm /run/systemd/rpm/sssd-was-active +fi %files -f sssd.lang %license COPYING @@ -507,11 +578,17 @@ done %_unitdir/sssd-sudo.service %_bindir/sss_ssh_* %_sbindir/sssd +%if 0%{?suse_version} < 1600 +%_sbindir/rcsssd +%endif %dir %_mandir/??/ %dir %_mandir/??/man[158]/ %_mandir/??/man1/sss_ssh_* %_mandir/??/man5/sss-certmap.5* %_mandir/??/man5/sssd-ad.5* +%if 0%{?suse_version} < 1600 +%_mandir/??/man5/sssd-files.5* +%endif %_mandir/??/man5/sssd-ldap-attributes.5* %_mandir/??/man5/sssd-session-recording.5* %_mandir/??/man5/sssd-simple.5* @@ -522,6 +599,9 @@ done %_mandir/??/man8/sssd.8* %_mandir/man1/sss_ssh_* %_mandir/man5/sss-certmap.5* +%if 0%{?suse_version} < 1600 +%_mandir/man5/sssd-files.5* +%endif %_mandir/man5/sssd-ldap-attributes.5* %_mandir/man5/sssd-session-recording.5* %_mandir/man5/sssd-simple.5* @@ -535,6 +615,9 @@ done %_libdir/%name/libsss_cert* %_libdir/%name/libsss_crypt* %_libdir/%name/libsss_debug* +%if 0%{?suse_version} < 1600 +%_libdir/%name/libsss_files* +%endif %_libdir/%name/libsss_iface* %_libdir/%name/libsss_semanage* %_libdir/%name/libsss_sbus* @@ -554,7 +637,9 @@ done %_libexecdir/%name/sssd_sudo %_libexecdir/%name/sss_signal %_libexecdir/%name/sssd_check_socket_activated_responders +%if 0%{?suse_version} >= 1600 %_libexecdir/%name/selinux_child +%endif %dir %sssdstatedir %attr(700,root,root) %dir %dbpath/ %attr(755,root,root) %dir %pipepath/ @@ -577,7 +662,11 @@ done %_datadir/%name/sssd.api.conf %dir %_datadir/%name/sssd.api.d/ %_datadir/%name/sssd.api.d/sssd-simple.conf +%if 0%{?suse_version} < 1600 +%_datadir/%name/sssd.api.d/sssd-files.conf +%else %exclude %_mandir/*/*/sssd-files.5.gz +%endif %doc src/examples/sssd.conf # # sssd-client @@ -747,6 +836,16 @@ done %_libdir/libsss_nss_idmap.so %_libdir/pkgconfig/sss_nss_idmap.pc +%if 0%{?suse_version} < 1600 +%files -n libsss_simpleifp0 +%_libdir/libsss_simpleifp.so.0* + +%files -n libsss_simpleifp-devel +%_includedir/sss_sifp*.h +%_libdir/libsss_simpleifp.so +%_libdir/pkgconfig/sss_simpleifp.pc +%endif + %files -n python3-ipa_hbac %dir %python3_sitearch %python3_sitearch/pyhbac.so From a80b4ff01dd539bed7224ac447e3c7f7ae6f6f785cd94ed6065ce48654c729fb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Nov 2023 18:24:05 +0000 Subject: [PATCH 2/2] add a note for why ifp is back for <1600 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=304 --- sssd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sssd.spec b/sssd.spec index 59d3afb..3c41453 100644 --- a/sssd.spec +++ b/sssd.spec @@ -309,6 +309,9 @@ A utility library for FreeIPA to map Windows SIDs to Unix user/group IDs. Summary: The SSSD D-Bus responder helper library License: GPL-3.0-or-later Group: System/Libraries +# Even though sssd has obsoleted simpleifp, the plan here is to retain ABI +# compatibility with the existing SUSE 15.x product line. ...at least, until +# sssd completely removes SIFP from source. %description -n libsss_simpleifp0 This subpackage provides a library that simplifies the D-Bus API for