Accepting request 1327495 from network:ldap

OBS-URL: https://build.opensuse.org/request/show/1327495
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/389-ds?expand=0&rev=88

389-ds-base-3.1.2~git90.2bc7250be.tar.zst

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b4f5d6127548bcb1217786ef6ffb803ee9cab44ec6f210023afd0872c664528
-size 5111946

389-ds-base-3.2.0~git7.7c8a16c6b.tar.zst

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8e001d8793b1d8b223b379dd7a077ea4d7d4daeca42e3d3841a0e849c88de33
+size 6175423

389-ds-base.obsinfo

@@ -1,4 +1,4 @@
 name: 389-ds-base
-version: 3.1.2~git90.2bc7250be
-mtime: 1746540576
-commit: 2bc7250be92f22f47c2e6dda30bd68f3a1a460c4
+version: 3.2.0~git7.7c8a16c6b
+mtime: 1768409729
+commit: 7c8a16c6bed524fb54d18a5b7e93d4bd5bb19d49

389-ds.changes

@@ -1,3 +1,239 @@
+-------------------------------------------------------------------
+Fri Jan 16 01:23:29 UTC 2026 - william.brown@suse.com
+
+- Update to version 3.2.0~git7.7c8a16c6b:
+  * Issue 7152 - ns-slapd fails to shutdown when deferred memberof update is in progress (#7187)
+  * Issue 6753 - Port ticket 548 test (#7101)
+  * Issue 7172 - (2nd) Index ordering mismatch after upgrade (#7180)
+  * Issue 7172 - Index ordering mismatch after upgrade (#7173)
+  * Issue 7108 - Fix shutdown crash in entry cache destruction (#7163)
+  * Issue - Revise paged result search locking
+  * Issue 7096 - During replication online total init the function idl_id_is_in_idlist is not scaling with large database (#7145)
+  * Bump version to 3.2.0
+  * Issue 7160 - Add lib389 version sync check to configure (#7165)
+  * Issue 7166 - db_config_set asserts because of dynamic list (#7167)
+  * Issue 6951 - Dynamic Certificate refresh phase 3 - Certificates switch (#7157)
+  * Issue 7155 - build_candidate_list - Database error 11 with range search (#7156)
+  * Make nss include paths platform-agnostic (#7159)
+  * Issue 6753 - Port ticket47953 test to acl/misc_test.py using DSLdapObject (#7153)
+  * Issue 6951 - Dynamic Certificate refresh phase 2 - Add/Modify/Delete support (#7140)
+  * Issue 6753 - Port ticket47970 test to sasl/regression_test.py using DSLdapObject (#7146)
+  * Issue 7150 - Compressed access log rotations skipped, accesslog-list out of sync (#7151)
+  * Issue: 7147 - entrycache_eviction_test is failing (#7148)
+  * Issue 1793 - RFE - Dynamic lists - UI and CLI updates
+  * Issue 7119 - Fix DNA shared config replication test (#7143)
+  * Issue 7081 - Repl Log Analysis - Implement data sampling with performance and timezone fixes (#7086)
+  * Issue 1793 - RFE - Implement dynamic lists
+  * Issue 7112 - dsctrl dblib bdb2mdb core dumps and won't allow conversion (#7144)
+  * Issue 7053 - Remove memberof_del_dn_from_groups from MemberOf plugin (#7064)
+  * Issue 7138 - test_cleanallruv_repl does not restart supplier3 (#7139)
+  * Issue 6753 - Port ticket47921 test to indirect_cos_test using DSLdapObject (#7134)
+  * Issue 7128 - memory corruption in alias entry plugin (#7131)
+  * Issue 7091 - Duplicate local password policy entries listed (#7092)
+  * Issue 7124 - BDB cursor race condition with transaction isolation (#7125)
+  * Issue 6951 - Dynamic Certificate refresh phase 1 - Search support (#7117)
+  * Issue 7132 - Keep alive entry updated too soon after an offline import (#7133)
+  * Issue 7135 - Not enough space for tests on GH runner (#7136)
+  * Issue 7121 - LeakSanitizer: various leaks during replication (#7122)
+  * Issue 7115 - LeakSanitizer: leak in `slapd_bind_local_user()` (#7116)
+  * Issue 7109 - AddressSanitizer: SEGV ldap/servers/slapd/csnset.c:302 in csnset_dup (#7114)
+  * Issue 7119 - Harden DNA plugin locking for shared server list operations (#7120)
+  * Issue 7084 - UI - schema - sorting attributes breaks expanded row
+  * Issue 6753 - Port ticket47910 test to logconv_test using DSLdapObject (#7098)
+  * Issue 6753 - Port ticket47920 test to ldap_controls_test using DSLdapObject (#7103)
+  * Issue 7007 - Improve paged result search locking
+  * Issue 7041 - Add WebUI test for group member management (#7111)
+  * Issue 3555 - UI - Fix audit issue with npm - glob (#7107)
+  * Issue 7089 - Fix dsconf certificate list (#7090)
+  * Issue 7076, 6992, 6784, 6214 - Fix CI test failures (#7077)
+  * Bump js-yaml from 4.1.0 to 4.1.1 in /src/cockpit/389-console (#7097)
+  * Issue 7069 - Fix error reporting in HAProxy trusted IP parsing (#7094)
+  * Issue 7049 - RetroCL plugin generates invalid LDIF
+  * Issue 7055 - Online initialization of consumers fails with error -23 (#7075)
+  * Issue 6753 - Remove ticket 47900 test (#7087)
+  * Issue 6753 - Port ticket 49008 test (#7080)
+  * Issue 7042 - Enable global_backend_lock when memberofallbackend is enabled (#7043)
+  * Issue 7078 - audit json logging does not encode binary values
+  * Issue 7069 - Add Subnet/CIDR Support for HAProxy Trusted IPs (#7070)
+  * Issue 7056 - DSBLE0007 doesn't generate remediation steps for missing indexes
+  * Issue 6660 - CLI, UI - Improve replication log analyzer usability (#7062)
+  * Issue 7065 - A search filter containing a non normalized DN assertion does not return matching entries (#7068)
+  * Issue 7071 - search filter (&(cn:dn:=groups)) no longer returns results
+  * Issue 7073 - Add NDN cache size configuration and enforcement tests (#7074)
+  * Issue 6753 - Removing ticket 47871 test and porting to DSLdapObject (#7045)
+  * Issue 7041 - CLI/UI - memberOf - no way to add/remove specific group filters
+  * Issue 6753 - Port ticket 48228 test (#7067)
+  * Issue 7029 - Add test case to measure ndn cache performance impact (#7030)
+  * Issue 7061 - CLI/UI - Improve error messages for dsconf localpwp list
+  * Issue 7059 - UI - unable to upload pem file
+  * Issue 7032 - The new ipahealthcheck test ipahealthcheck.ds.backends.BackendsCheck raises CRITICAL issue (#7036)
+  * Issue 7047 - MemberOf plugin logs null attribute name on fixup task completion (#7048)
+  * Issue 7044 - RFE - index sudoHost by default (#7046)
+  * Issue 6846 - Attribute uniqueness is not enforced with modrdn (#7026)
+  * Issue 6784 - Support of Entry cache pinned entries (#6785)
+  * Issue 6979 - Improve the way to detect asynchronous operations in the access logs (#6980)
+  * Issue 6753 - Port ticket 47931 test (#7038)
+  * Issue 7035 - RFE - memberOf - adding scoping for specific groups
+  * Issue - CLI/UI - Add option to delete all replication conflict entries
+  * Issue 7033 - lib389 -  basic plugin status not in JSON
+
+-------------------------------------------------------------------
+Wed Oct 08 01:25:10 UTC 2025 - william.brown@suse.com
+
+- Move librobdb.so from devel to main package
+- Update to version 3.1.3~git111.e953ee704:
+  * Issue 7023 - UI - if first instance that is loaded is stopped it breaks parts of the UI
+  * Issue 6753 - Removing ticket 47714 test and porting to DSLdapObject (#6946)
+  * Issue 7027 - 389-ds-base OpenScanHub Leaks Detected (#7028)
+  * Issue 6753 - Removing ticket 47676 test and porting to DSLdapObject (#6938)
+  * Issue 6966 - On large DB, unlimited IDL scan limit reduce the SRCH performance (#6967)
+
+-------------------------------------------------------------------
+Fri Oct 03 06:44:23 UTC 2025 - william.brown@suse.com
+
+- Update to version 3.1.3~git106.bea5091e3:
+  * Issue 6660 - UI - Improve replication log analysis charts and usability (#6968)
+  * Issue 6753 - Removing ticket 47653MMR test and porting to DSLdapObject (#6926)
+  * Issue 7021 - Units for changing MDB max size are not consistent across different tools (#7022)
+  * Issue 6753 - Removing ticket 49463 test and porting to DSLdapObject (#6899)
+  * Issue 6954 - do not delete referrals on chain_on_update backend
+  * Issue 6982 - UI - MemberOf shared config does not validate DN properly (#6983)
+  * Issue 6740 - Fix FIPS mode test failures in syncrepl, mapping tree, and resource limits (#6993)
+  * Issue 7018 - BUG - prevent stack depth being hit (#7019)
+  * Issue 7014 - memberOf - ignored deferred updates with LMDB
+  * Issue 7002 - restore is failing. (#7003)
+  * Issue 6758 - Fix WebUI monitoring test failure due to FormSelect component deprecation (#7004)
+  * Issue 6753 - Removing ticket 47869 test and porting to DSLdapObject (#7001)
+  * Issue 6753 - Port ticket 49073 test (#7005)
+  * Issue 7016 - fix NULL deref in send_referrals_from_entry() (#7017)
+  * Issue 6753 - Port ticket 47815 test (#7000)
+  * Issue 7010 - Fix certdir underflow in slapd_nss_init() (#7011)
+  * Issue 7012 - improve dscrl dbverify result when backend does not exists (#7013)
+  * Issue 6753 - Removing ticket 477828 test and porting to DSLdapObject (#6989)
+  * Issue 6753 - Removing ticket 47721 test and porting to DSLdapObject (#6973)
+  * Issue 6992 - Improve handling of mismatched ldif import (#6999)
+  * Issue 6997 - Logic error in get_bdb_impl_status prevents bdb2mdb execution (#6998)
+  * Issue 6810 - Deprecate PAM PTA plugin configuration attributes in base entry - fix memleak (#6988)
+  * Issue 6971 - bundle-rust-npm.py: TypeError: argument of type 'NoneType' is not iterable (#6972)
+  * Fix overflow in certmap filter/DN buffers (#6995)
+  * Issue 6753 - Port ticket 49386 test (#6987)
+  * Issue 6753 - Removing ticket 47787 test and porting to DSLdapObject (#6976)
+  * Issue 6753 - Port ticket 49072 test (#6984)
+  * Issue 6990 - UI - Replace deprecated Select components with new TypeaheadSelect (#6996)
+  * Issue 6990 - UI - Fix typeahead Select fields losing values on Enter keypress (#6991)
+  * Issue 6887 - Enhance logconv.py to add support for JSON access logs (#6889)
+  * Issue 6985 - Some logconv CI tests fail with BDB (#6986)
+  * Issue 6891 - JSON logging - add wrapper function that checks for NULL
+  * Issue 4835 - dsconf display an incomplete help with changelog setting (#6769)
+  * Issue 6753 - Port ticket 47963 & 49184 tests (#6970)
+  * Issue 6753 - Port ticket 47829 & 47833 tests
+  * Issue 6977 - UI - Show error message when trying to use unavailable ports (#6978)
+  * Issue 6956 - More UI fixes
+  * Issue 6626 - Fix version
+  * Issue 6900 - Rename test files for proper pytest discovery (#6909)
+  * Issue 6947 - Revise time skew check in healthcheck tool and add option to exclude checks
+  * Issue 6805 - RFE - Multiple backend entry cache tuning
+  * Issue 6753 - Port and fix ticket 47823 tests
+  * Issue 6843 - Add CI tests for logconv.py (#6856)
+  * Issue 6933 - When deferred memberof update is enabled after the server crashed it should not launch memberof fixup task by default (#6935)
+  * Issue  - UI - update Radio handlers and LDAP entries last modified time
+  * Issue 6810 - Deprecate PAM PTA plugin configuration attributes in base entry (#6832)
+  * Issue 6660 - UI - Fix minor typo (#6955)
+  * Issue 6753 - Port ticket 47808 test
+  * Issue 6910 - Fix latest coverity issues
+  * Issue 6753 - Removing ticket 50232 test and porting to DSLdapObject (#6861)
+  * Issue 6919 - numSubordinates/tombstoneNumSubordinates are inconsisten… (#6920)
+  * Issue 6430 - Fix build with bundled libdb
+  * Issue 6342 - buffer owerflow in the function parseVariant (#6927)
+  * Issue 6940 - dsconf monitor server fails with ldapi:// due to absent server ID (#6941)
+  * Issue 6936 - Make user/subtree policy creation idempotent (#6937)
+
+-------------------------------------------------------------------
+Tue Aug 19 02:36:53 UTC 2025 - william.brown@suse.com
+
+- Update python packaging to adhere to pyproject and newer guidelines
+- Update to version 3.1.3~git51.e14e23e0f:
+  * Migrate from PR_Poll to epoll and timerfd. (#6924)
+  * Issue 6928 - The parentId attribute is indexed with improper matching rule
+  * Issue 6753 - Removing ticket 49540 test and porting to DSLdapObject (#6877)
+  * Issue 6904 - Fix config_test.py::test_lmdb_config
+  * Issue 5120 - Fix compilation error
+  * Issue 6929 - Compilation failure with rust-1.89 on Fedora ELN
+  * Issue 6922 - AddressSanitizer: leaks found by acl test suite
+  * Issue 6519 - Add basic dsidm account tests
+  * Issue 6753 - Port ticket test 47573
+  * Issue 6875 - Fix dsidm tests
+  * Issues 6913, 6886, 6250 - Adjust xfail marks (#6914)
+  * Issue 6768 - ns-slapd crashes when a referral is added (#6780)
+  * Issue 6468 - CLI - Fix default error log level
+  * Issue 6181 - RFE - Allow system to manage uid/gid at startup
+  * Issue 6901 - Update changelog trimming logging - fix tests
+  * Issue 6778 - Memory leak in roles_cache_create_object_from_entry part 2
+  * Issue 6897 - Fix disk monitoring test failures and improve test maintainability (#6898)
+  * Issue 6884 - Mask password hashes in audit logs (#6885)
+  * Issue 6594 - Add test for numSubordinates replication consistency with tombstones (#6862)
+  * Issue 6250 - Add test for entryUSN overflow on failed add operations (#6821)
+  * Issue 6895 - Crash if repl keep alive entry can not be created
+  * Issue 6663 - Fix NULL subsystem crash in JSON error logging (#6883)
+  * Issue 6430 - implement read-only bdb (#6431)
+  * Issue 6901 - Update changelog trimming logging
+  * Issue 6880 - Fix ds_logs test suite failure
+  * Issue 6352 - Fix DeprecationWarning
+  * Issue 6800 - Rerun the check in verbose mode on failure
+  * Issue 6893 - Log user that is updated during password modify extended operation
+  * Issue 6772 - dsconf - Replicas with the "consumer" role allow for viewing and modification of their changelog. (#6773)
+  * Issue 6829 - Update parametrized docstring for tests
+  * Issue 6888 - Missing access JSON logging for TLS/Client auth
+  * Issue 6878 - Prevent repeated disconnect logs during shutdown (#6879)
+  * Issue 6872 - compressed log rotation creates files with world readable permission
+  * Issue 6859 - str2filter is not fully applying matching rules
+  * Issue 5733 - Remove outdated Dockerfiles
+  * Issue 6800 - Check for minimal supported Python version
+  * Issue 6868 - UI - schema attribute table expansion break after moving to a new page
+  * Issue 6865 - AddressSanitizer: leak in agmt_update_init_status
+  * Issue 6848 - AddressSanitizer: leak in do_search
+  * Issue 6850 - AddressSanitizer: memory leak in mdb_init
+  * Issue 6854 - Refactor for improved data management (#6855)
+  * Issue 6756 - CLI, UI - Properly handle disabled NDN cache (#6757)
+  * Issue 6857 - uiduniq: allow specifying match rules in the filter
+  * Issue 6852 - Move ds* CLI tools back to /sbin
+  * Issue 6753 - Port ticket tests 48294 & 48295
+  * Issue 6753 - Add 'add_exclude_subtree' and 'remove_exclude_subtree' methods to Attribute uniqueness plugin
+  * Issue 6841 - Cancel Actions when PR is updated
+  * Issue 6838 - lib389/replica.py is using nonexistent datetime.UTC in Python 3.9
+  * Issue 6822 - Backend creation cleanup and Database UI tab error handling (#6823)
+  * Issue 6782 - Improve paged result locking
+  * Issue 6829 - Update parametrized docstring for tests
+  * Bump version to 3.1.3
+  * Issue 6825 - RootDN Access Control Plugin with wildcards for IP addre… (#6826)
+  * Issue 6767 - Package lib389 on PyPI (#6786)
+  * Issue 6819 - Incorrect pwdpolicysubentry returned for an entry with user password policy
+  * Issue 6553 - Update concread to 0.5.6 (#6824)
+  * Issue 6758 - Fix failing webUI tests
+  * Issue 6753 - Port ticket 47640 test
+
+-------------------------------------------------------------------
+Thu Jun 12 06:52:37 UTC 2025 - william.brown@suse.com
+
+- bsc#1229948 - CVE-2024-43806 - rustix dir iter memory growth
+- Update to version 3.1.2~git106.54c1eb0e5:
+  * Issue 1081 - Add a CI test (#6063)
+  * Issue 6761 - Password modify extended operation should skip password policy checks when executed by root DN
+  * Issue 6753 - Port ticket test 48026
+  * Issue 6791 - crash in liblmdb during instance shutdown (#6793)
+  * Issue 6753 - Port ticket test 48370
+  * Issue 6753 - Port ticket test 48233
+  * Issue 6755 - RFE use of Session Tracking Control in replication agreement (#6766)
+  * Issue 6641 - modrdn fails when a user is member of multiple groups (#6643)
+  * Issue 6776 - Enabling audit log makes slapd coredump
+  * Issue 6534 - CI fails with Fedora 41 and DNF5
+  * Issue 6753 - Port ticket test 47619
+  * Issue 6787 - Improve error message when bulk import connection is closed
+  * Issue 6778 - Memory leak in roles_cache_create_object_from_entry
+  * Issue 4253 - Container bind mount schema
+  * Issue 6727 - RFE - database compaction interval should be persistent
+  * Issue 5120 - ns-slapd doesn't start in referral mode (#6763)
+
 -------------------------------------------------------------------
 Wed May  7 04:39:57 UTC 2025 - William Brown <william.brown@suse.com>
 

389-ds.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package 389-ds
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +17,7 @@
 #
 
 
-%define use_python python3
-%define skip_python2 1
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define pythons python3
 
 %define homedir %{_localstatedir}/lib/dirsrv
 %define logdir %{_localstatedir}/log/dirsrv
@@ -33,7 +32,7 @@
 %define svrcorelib libsvrcore0
 
 Name:           389-ds
-Version:        3.1.2~git90.2bc7250be
+Version:        3.2.0~git7.7c8a16c6b
 Release:        0
 Summary:        389 Directory Server
 License:        GPL-3.0-or-later AND MPL-2.0
@@ -76,16 +75,17 @@ BuildRequires:  openldap2-devel
 # Libressl is incompatible with our rust cryptographic needs.
 BuildRequires:  openssl-devel
 # pam-devel is required by the pam passthru auth plug-in
-BuildRequires:  %use_python-argcomplete
-BuildRequires:  %use_python-argparse-manpage
-BuildRequires:  %use_python-cryptography
-BuildRequires:  %use_python-devel
-BuildRequires:  %use_python-ldap >= 3
-BuildRequires:  %use_python-psutil
-BuildRequires:  %use_python-pyasn1
-BuildRequires:  %use_python-pyasn1-modules
-BuildRequires:  %use_python-python-dateutil
-BuildRequires:  %use_python-setuptools
+BuildRequires:  %{python_module argcomplete}
+BuildRequires:  %{python_module argparse-manpage}
+BuildRequires:  %{python_module cryptography}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module ldap}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module psutil}
+BuildRequires:  %{python_module pyasn1-modules}
+BuildRequires:  %{python_module pyasn1}
+BuildRequires:  %{python_module python-dateutil}
+BuildRequires:  %{python_module setuptools}
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
@@ -176,16 +176,30 @@ SNMP Agent for the 389 Directory Server base package.
 Summary:        389 Directory Server administration tools and library
 License:        GPL-3.0-or-later AND MPL-2.0
 Group:          Development/Languages/Python
-Requires:       %{use_python}-argcomplete
-Requires:       %{use_python}-argparse-manpage
-Requires:       %{use_python}-cryptography
-Requires:       %{use_python}-distro
-Requires:       %{use_python}-ldap >= 3.0
-Requires:       %{use_python}-psutil
-Requires:       %{use_python}-pyasn1
-Requires:       %{use_python}-pyasn1-modules
-Requires:       %{use_python}-python-dateutil
-Requires:       %{use_python}-python-slugify
+BuildRequires:  %{python_module argcomplete}
+BuildRequires:  %{python_module argparse-manpage}
+BuildRequires:  %{python_module cryptography}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module distro}
+BuildRequires:  %{python_module ldap}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module psutil}
+BuildRequires:  %{python_module pyasn1-modules}
+BuildRequires:  %{python_module pyasn1}
+BuildRequires:  %{python_module python-dateutil}
+BuildRequires:  %{python_module python-slugify}
+Requires:       %{python_module argcomplete}
+Requires:       %{python_module argparse-manpage}
+Requires:       %{python_module cryptography}
+Requires:       %{python_module devel}
+Requires:       %{python_module distro}
+Requires:       %{python_module ldap}
+Requires:       %{python_module pip}
+Requires:       %{python_module psutil}
+Requires:       %{python_module pyasn1-modules}
+Requires:       %{python_module pyasn1}
+Requires:       %{python_module python-dateutil}
+Requires:       %{python_module python-slugify}
 Requires:       iproute2
 Requires:       krb5-client
 Requires:       mozilla-nss-tools
@@ -197,8 +211,8 @@ Recommends:     openldap2-client
 # These are recommended if you have selinux on your system
 # to allow some supplementary automated interactions during
 # setup, but it's not required.
-Recommends:     python3-selinux
-Recommends:     python3-policycoreutils
+Recommends:     %{python_module selinux}
+Recommends:     %{python_module policycoreutils}
 
 Provides:       python3-lib389 = %{version}-%{release}
 Obsoletes:      python-lib389 < %{version}-%{release}
@@ -240,7 +254,7 @@ df -h
 %sysusers_generate_pre %{SOURCE10} %{user_group} %{user_group}-user.conf
 # Make sure python3 is used in shebangs
 # FIX ME!!  This should be fixed in the source code !!!
-sed -r -i '1s|^#!\s*%{_bindir}.*python.*|#!%{_bindir}/%{use_python}|' ldap/admin/src/scripts/{*.py,ds-replcheck} src/lib389/cli/ds*
+sed -r -i '1s|^#!\s*%{_bindir}.*python.*|#!%{_bindir}/python3|' ldap/admin/src/scripts/{*.py,ds-replcheck} src/lib389/cli/ds*
 
 # 389-ds expects the vendor dir in the root.
 ln -s ./src/vendor ./vendor
@@ -266,7 +280,7 @@ export CFLAGS="%{optflags}" # -std=gnu99"
   --enable-rust-offline \
   --disable-perl \
   --libexecdir=%{_prefix}/lib/dirsrv/ \
-  --with-pythonexec="%{_bindir}/%{use_python}" \
+  --with-pythonexec="%{_bindir}/python3" \
   --with-systemd \
   --with-systemdgroupname=dirsrv.target \
   --with-systemdsystemunitdir="%{_unitdir}" \
@@ -275,16 +289,15 @@ export CFLAGS="%{optflags}" # -std=gnu99"
   --with-systemdgroupname=dirsrv.target \
 
 export XCFLAGS="$CFLAGS"
-make src/lib389/setup.py
 make %{?_smp_mflags}
 pushd src/lib389
-%python3_build
+%pyproject_wheel
 popd
 
 %install
 %make_install
 pushd src/lib389
-%python3_install
+%pyproject_install
 mv %{buildroot}/usr/libexec/dirsrv/dscontainer %{buildroot}%{_prefix}/lib/dirsrv/
 rmdir %{buildroot}/usr/libexec/dirsrv/
 popd
@@ -319,6 +332,12 @@ mv src/svrcore/LICENSE{,.svrcore}
 install -m 0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/
 install -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/dirsrv@.service.d/krbkdcbefore.conf
 
+mv %{buildroot}%{_bindir}/openldap_to_ds %{buildroot}%{_sbindir}/openldap_to_ds
+mv %{buildroot}%{_bindir}/dsconf %{buildroot}%{_sbindir}/dsconf
+mv %{buildroot}%{_bindir}/dscreate %{buildroot}%{_sbindir}/dscreate
+mv %{buildroot}%{_bindir}/dsctl %{buildroot}%{_sbindir}/dsctl
+mv %{buildroot}%{_bindir}/dsidm %{buildroot}%{_sbindir}/dsidm
+
 # For the purposes of our krb integration, we enable this by default.
 mv %{buildroot}%{_datadir}/dirsrv/data/60kerberos.ldif %{buildroot}%{_datadir}/dirsrv/schema/60kerberos.ldif
 
@@ -382,6 +401,7 @@ exit 0
 %{_libdir}/dirsrv/librewriters.so
 %{_libdir}/dirsrv/plugins/*.so
 %{_libdir}/dirsrv/python/*.py
+%{_libdir}/dirsrv/librobdb.so
 %{_libdir}/dirsrv/*.so.*
 %exclude %{_mandir}/man1/ldap-agent*
 %{_mandir}/man1/*
@@ -450,6 +470,6 @@ exit 0
 %{_mandir}/man8/dscreate.8.gz
 %{_mandir}/man8/dsctl.8.gz
 %{_mandir}/man8/dsidm.8.gz
-%{python3_sitelib}/lib389*
+%{python_sitelib}/lib389*
 
 %changelog

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/389ds/389-ds-base.git</param>
-              <param name="changesrevision">2bc7250be92f22f47c2e6dda30bd68f3a1a460c4</param></service></servicedata>
+              <param name="changesrevision">7c8a16c6bed524fb54d18a5b7e93d4bd5bb19d49</param></service></servicedata>