From 3fd3832981a8362c6e375973a99fe5ef92bba2ad8913a221cefca7b65455ed1c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 17 Jul 2024 12:08:46 +0000 Subject: [PATCH 1/5] [info=bf358d8fff9cbe6e4d724686e14b1ba2f74e5be0130abd0c1aec853471ca572e] OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=317 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- sssd.changes | 6 ++++++ sssd.spec | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 10a45d3..8430d5a 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1721128452 -commit: 747483e6173b31472d61e166a581bb9c9034cf6a690a8bc476176dd5b5befaba +mtime: 1721210267 +commit: bf358d8fff9cbe6e4d724686e14b1ba2f74e5be0130abd0c1aec853471ca572e url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 114e570..390c95e 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e9d70dca414f164c37d455e73d3eec0537555e5183567128cf0ef329962fed3 +oid sha256:404a63fbe0a6f162e04939e5c78f107a9b74ccee399f829a9d7eed4b826b4e4e size 256 diff --git a/sssd.changes b/sssd.changes index ec838e0..a3e3f54 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 17 09:19:20 UTC 2024 - Samuel Cabrero + +- Fix spec file for openSUSE ALP and SUSE SLFO, where the + python3_fix_shebang_path RPM macro is not available + ------------------------------------------------------------------- Thu Jul 11 09:41:21 UTC 2024 - Samuel Cabrero diff --git a/sssd.spec b/sssd.spec index 41a153c..2466377 100644 --- a/sssd.spec +++ b/sssd.spec @@ -451,8 +451,11 @@ find "$b" -type f -name "*.la" -print -delete mkdir -pv %buildroot/%_sysconfdir/alternatives %buildroot/%_sysconfdir/cifs-utils ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin %python3_fix_shebang -%if 0%{?suse_version} >= 1600 +%if 0%{?suse_version} > 1600 %python3_fix_shebang_path %buildroot/%_libexecdir/%name/ +%elif 0%{?suse_version} == 1600 +# python3_fix_shebang_path macro does not exist in < 1600, was added in python-rom-macros 20231204 +sed -i '1s@#!.*python.*@#!%{_bindir}/python3.11@' %{buildroot}/%{_libexecdir}/%{name}/sss_analyze %endif %check From 2a837063b42a98f2765929d2665ecb86f6697c69ee849356af6999b92437b8c0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Jul 2024 03:02:07 +0000 Subject: [PATCH 2/5] [info=bf358d8fff9cbe6e4d724686e14b1ba2f74e5be0130abd0c1aec853471ca572e] OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=318 --- build.specials.obscpio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.specials.obscpio b/build.specials.obscpio index 390c95e..50748d6 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:404a63fbe0a6f162e04939e5c78f107a9b74ccee399f829a9d7eed4b826b4e4e +oid sha256:595ba3e01a103ac52ae390b182d09c1409a75f41d4e84163a45110f486e9d316 size 256 From 4b55e8bec3bf5d001d4f2ad1dd207105136b037562b3122b247b28d92b5fa942 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 25 Sep 2024 20:16:22 +0000 Subject: [PATCH 3/5] [info=4ccb2378cf598025ed7140843f9027c7d6380bb9bd3e3c93331dab8f27d8db43] OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=319 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- sssd.spec | 11 +++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8430d5a..0f5364e 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1721210267 -commit: bf358d8fff9cbe6e4d724686e14b1ba2f74e5be0130abd0c1aec853471ca572e +mtime: 1727293098 +commit: 4ccb2378cf598025ed7140843f9027c7d6380bb9bd3e3c93331dab8f27d8db43 url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 50748d6..fdb21eb 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:595ba3e01a103ac52ae390b182d09c1409a75f41d4e84163a45110f486e9d316 +oid sha256:441091ecf051081f41d6ce35497d9906309861b1791c10f0033c95af3a33ff83 size 256 diff --git a/sssd.spec b/sssd.spec index 2466377..0bb4dd9 100644 --- a/sssd.spec +++ b/sssd.spec @@ -85,7 +85,14 @@ BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(tdb) >= 1.1.3 BuildRequires: pkgconfig(tevent) -BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(uuid) nfsidmap-devel +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +# samba-client-devel pulls samba-client-libs pulls libldap-2_4-2 wants libldap-data(-2.4); +# this conflicts with +# openldap2-devel pulls libldap2 wants libldap-data(-2.6) +# Package contains just config files, not needed for build. +#!BuildIgnore: libldap-data +%endif %{?systemd_ordering} Requires: sssd-ldap = %version-%release Requires(postun): pam-config @@ -104,7 +111,7 @@ Obsoletes: sssd-common < %version-%release %define ldbdir %(pkg-config ldb --variable=modulesdir) # Both SSSD and cifs-utils provide an idmap plugin for cifs.ko -# %_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins +# %%_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins # * cifs-utils one is the default (priority 20) # * installing SSSD should NOT switch to SSSD plugin (priority 10) %define cifs_idmap_plugin %_sysconfdir/cifs-utils/idmap-plugin From d7d2d5b0651478523f81f3c1f0f265bd392923818cf7d8d8a071fddc5f77f4be Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 25 Sep 2024 20:30:52 +0000 Subject: [PATCH 4/5] [info=73fb2a82f612a286176bd085d3250101f93e35e8d95604062552e3d66d837c69] OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=320 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- sssd.spec | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 0f5364e..8551d50 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1727293098 -commit: 4ccb2378cf598025ed7140843f9027c7d6380bb9bd3e3c93331dab8f27d8db43 +mtime: 1727296226 +commit: 73fb2a82f612a286176bd085d3250101f93e35e8d95604062552e3d66d837c69 url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index fdb21eb..17c037d 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:441091ecf051081f41d6ce35497d9906309861b1791c10f0033c95af3a33ff83 +oid sha256:c00fdea96fa1ac816e113deb1157e991d822cc2d43385f56356f905bd4843224 size 256 diff --git a/sssd.spec b/sssd.spec index 0bb4dd9..17e610d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -85,7 +85,7 @@ BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(tdb) >= 1.1.3 BuildRequires: pkgconfig(tevent) -BuildRequires: pkgconfig(uuid) nfsidmap-devel +BuildRequires: pkgconfig(uuid) %if 0%{?suse_version} && 0%{?suse_version} < 1600 # samba-client-devel pulls samba-client-libs pulls libldap-2_4-2 wants libldap-data(-2.4); # this conflicts with @@ -427,7 +427,7 @@ perl -i -lpe 's{%_bindir/python\b}{%_bindir/python3}' src/tools/sss_obfuscate b="%buildroot" # Copy some defaults -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" install -D -p -m 0600 src/examples/sssd-example.conf "$b/%_distconfdir/sssd/sssd.conf" install -d -m 0755 "$b/%_distconfdir/sssd/conf.d" %else @@ -471,7 +471,7 @@ sed -i '1s@#!.*python.*@#!%{_bindir}/python3.11@' %{buildroot}/%{_libexecdir}/%{ %pre %service_add_pre sssd.service -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" # Prepare for migration to /usr/etc; save any old .rpmsave for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do test -f "%_sysconfdir/$i.rpmsave" && mv -v "%_sysconfdir/$i.rpmsave" "%_sysconfdir/$i.rpmsave.old" || : @@ -564,7 +564,7 @@ touch /run/systemd/rpm/sssd-was-active fi %posttrans -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" # 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" || : @@ -678,7 +678,7 @@ fi %attr(755,root,root) %dir %sssdstatedir/mc/ %attr(700,root,root) %dir %sssdstatedir/keytabs/ %attr(750,root,root) %dir %_localstatedir/log/%name/ -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" %dir %_distconfdir/sssd/ %%dir %_distconfdir/sssd/conf.d %config(noreplace) %_distconfdir/sssd/sssd.conf From fbb9662fbcd841dddb0f63483095a3aebc2cf40ac50a2260ca14f32b10997376 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 1 Oct 2024 10:25:27 +0000 Subject: [PATCH 5/5] [info=3a2bee3ebf6e89af81880d7927649117d782a0ba9f98f06213bb4744f044b7fb] OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=321 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- sssd.changes | 9 +++++++++ sssd.spec | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8551d50..7563c5d 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1727296226 -commit: 73fb2a82f612a286176bd085d3250101f93e35e8d95604062552e3d66d837c69 +mtime: 1727778278 +commit: 3a2bee3ebf6e89af81880d7927649117d782a0ba9f98f06213bb4744f044b7fb url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 17c037d..ff1116b 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c00fdea96fa1ac816e113deb1157e991d822cc2d43385f56356f905bd4843224 +oid sha256:cf1fe0bc9d0be1744e3756ea8a53562f128fa1e2514582f8a6cf3d9db472fdd3 size 256 diff --git a/sssd.changes b/sssd.changes index a3e3f54..473f4d7 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Oct 1 10:15:07 UTC 2024 - Jan Engelhardt + +- Update filelists involving memberof.so and idmap/sss.so to + avoid gobbling up one file into multiple sssd subpackages. + (Between samba-4.20 and 4.21, %ldbdir changes from + /usr/lib64/ldb2/modules/ldb to /usr/lib64/samba/ldb, so now + `%_libdir/samba` is a bit too broad.) + ------------------------------------------------------------------- Wed Jul 17 09:19:20 UTC 2024 - Samuel Cabrero diff --git a/sssd.spec b/sssd.spec index 17e610d..354fd6e 100644 --- a/sssd.spec +++ b/sssd.spec @@ -832,7 +832,8 @@ fi %python3_sitelib/sssd/ %files winbind-idmap -%_libdir/samba/ +%dir %_libdir/samba/ +%_libdir/samba/idmap/ %_mandir/man8/idmap_sss.8* %files -n libipa_hbac0