From 3c7b164c190a1d61c72261fcac484ac3642441b6 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 20 Sep 2021 09:54:09 -0400 Subject: [PATCH 01/14] Bump version to 2.0.10 Issue 4908 - Updated several dsconf --help entries (typos, wrong descriptions, etc.) Issue 4912 - Account Policy plugin does not set the config entry DN Issue 4863 - typoes in logconv.pl Issue 4796 - Add support for nsslapd-state to CLI & UI Issue 4894 - IPA failure in ipa user-del --preserve (#4907) Issue 4912 - dsidm command crashing when account policy plugin is enabled Issue 4910 - db reindex corrupts RUV tombstone nsuiqueid index Issue 4869 - Fix retro cl trimming misuse of monotonic/realtime clocks Issue 4887 - UI - fix minor regression from camelCase fixup --- .gitignore | 1 + 389-ds-base.spec | 108 +++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 68 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index a5a3b57..37e58d4 100644 --- a/.gitignore +++ b/.gitignore @@ -206,3 +206,4 @@ /389-ds-base-2.0.5.tar.bz2 /389-ds-base-2.0.6.tar.bz2 /389-ds-base-2.0.7.tar.bz2 +/389-ds-base-2.0.10.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index 6108dfe..709c3ea 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -47,11 +47,15 @@ ExcludeArch: i686 # Filter argparse-manpage from autogenerated package Requires %global __requires_exclude ^python.*argparse-manpage +# Force to require nss version greater or equal as the version available at the build time +# See bz1986327 +%define dirsrv_requires_ge() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") + Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.7 -Release: %{?relprefix}1%{?prerel}%{?dist}.1 -License: GPLv3+ and MIT and (ASL 2.0 or MIT) and (ASL 2.0 or Boost) and MPLv2.0 and ASL 2.0 and BSD and (ASL 2.0 with exceptions or ASL 2.0 or MIT) and (Unlicense or MIT) +Version: 2.0.10 +Release: %{?relprefix}1%{?prerel}%{?dist} +License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 Conflicts: freeipa-server < 4.0.3 @@ -61,86 +65,89 @@ Obsoletes: %{name}-legacy-tools-debuginfo < 1.4.4.6 Provides: ldif2ldbm >= 0 ##### Bundled cargo crates list - START ##### -Provides: bundled(crate(ahash)) = 0.7.2 +Provides: bundled(crate(ahash)) = 0.7.4 Provides: bundled(crate(ansi_term)) = 0.11.0 Provides: bundled(crate(atty)) = 0.2.14 Provides: bundled(crate(autocfg)) = 1.0.1 Provides: bundled(crate(base64)) = 0.13.0 -Provides: bundled(crate(bitflags)) = 1.2.1 +Provides: bundled(crate(bitflags)) = 1.3.2 Provides: bundled(crate(byteorder)) = 1.4.3 Provides: bundled(crate(cbindgen)) = 0.9.1 -Provides: bundled(crate(cc)) = 1.0.67 +Provides: bundled(crate(cc)) = 1.0.70 Provides: bundled(crate(cfg-if)) = 1.0.0 Provides: bundled(crate(clap)) = 2.33.3 -Provides: bundled(crate(concread)) = 0.2.9 -Provides: bundled(crate(crossbeam)) = 0.8.0 +Provides: bundled(crate(concread)) = 0.2.18 +Provides: bundled(crate(crossbeam)) = 0.8.1 Provides: bundled(crate(crossbeam-channel)) = 0.5.1 -Provides: bundled(crate(crossbeam-deque)) = 0.8.0 -Provides: bundled(crate(crossbeam-epoch)) = 0.9.3 -Provides: bundled(crate(crossbeam-queue)) = 0.3.1 -Provides: bundled(crate(crossbeam-utils)) = 0.8.3 +Provides: bundled(crate(crossbeam-deque)) = 0.8.1 +Provides: bundled(crate(crossbeam-epoch)) = 0.9.5 +Provides: bundled(crate(crossbeam-queue)) = 0.3.2 +Provides: bundled(crate(crossbeam-utils)) = 0.8.5 Provides: bundled(crate(entryuuid)) = 0.1.0 Provides: bundled(crate(entryuuid_syntax)) = 0.1.0 Provides: bundled(crate(fernet)) = 0.1.4 Provides: bundled(crate(foreign-types)) = 0.3.2 Provides: bundled(crate(foreign-types-shared)) = 0.1.1 -Provides: bundled(crate(getrandom)) = 0.2.2 -Provides: bundled(crate(hermit-abi)) = 0.1.18 -Provides: bundled(crate(instant)) = 0.1.9 -Provides: bundled(crate(itoa)) = 0.4.7 -Provides: bundled(crate(jobserver)) = 0.1.21 +Provides: bundled(crate(getrandom)) = 0.2.3 +Provides: bundled(crate(hermit-abi)) = 0.1.19 +Provides: bundled(crate(instant)) = 0.1.10 +Provides: bundled(crate(itoa)) = 0.4.8 +Provides: bundled(crate(jobserver)) = 0.1.24 Provides: bundled(crate(lazy_static)) = 1.4.0 -Provides: bundled(crate(libc)) = 0.2.93 +Provides: bundled(crate(libc)) = 0.2.102 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 -Provides: bundled(crate(lock_api)) = 0.4.3 +Provides: bundled(crate(lock_api)) = 0.4.5 Provides: bundled(crate(log)) = 0.4.14 -Provides: bundled(crate(memoffset)) = 0.6.3 -Provides: bundled(crate(once_cell)) = 1.7.2 -Provides: bundled(crate(openssl)) = 0.10.33 -Provides: bundled(crate(openssl-sys)) = 0.9.61 -Provides: bundled(crate(parking_lot)) = 0.11.1 -Provides: bundled(crate(parking_lot_core)) = 0.8.3 +Provides: bundled(crate(memoffset)) = 0.6.4 +Provides: bundled(crate(once_cell)) = 1.8.0 +Provides: bundled(crate(openssl)) = 0.10.36 +Provides: bundled(crate(openssl-sys)) = 0.9.66 +Provides: bundled(crate(parking_lot)) = 0.11.2 +Provides: bundled(crate(parking_lot_core)) = 0.8.5 Provides: bundled(crate(paste)) = 0.1.18 Provides: bundled(crate(paste-impl)) = 0.1.18 +Provides: bundled(crate(pin-project-lite)) = 0.2.7 Provides: bundled(crate(pkg-config)) = 0.3.19 Provides: bundled(crate(ppv-lite86)) = 0.2.10 Provides: bundled(crate(proc-macro-hack)) = 0.5.19 -Provides: bundled(crate(proc-macro2)) = 1.0.26 +Provides: bundled(crate(proc-macro2)) = 1.0.29 Provides: bundled(crate(pwdchan)) = 0.1.0 Provides: bundled(crate(quote)) = 1.0.9 -Provides: bundled(crate(rand)) = 0.8.3 -Provides: bundled(crate(rand_chacha)) = 0.3.0 -Provides: bundled(crate(rand_core)) = 0.6.2 -Provides: bundled(crate(rand_hc)) = 0.3.0 -Provides: bundled(crate(redox_syscall)) = 0.2.6 +Provides: bundled(crate(rand)) = 0.8.4 +Provides: bundled(crate(rand_chacha)) = 0.3.1 +Provides: bundled(crate(rand_core)) = 0.6.3 +Provides: bundled(crate(rand_hc)) = 0.3.1 +Provides: bundled(crate(redox_syscall)) = 0.2.10 Provides: bundled(crate(remove_dir_all)) = 0.5.3 Provides: bundled(crate(ryu)) = 1.0.5 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(serde)) = 1.0.125 -Provides: bundled(crate(serde_derive)) = 1.0.125 -Provides: bundled(crate(serde_json)) = 1.0.64 +Provides: bundled(crate(serde)) = 1.0.130 +Provides: bundled(crate(serde_derive)) = 1.0.130 +Provides: bundled(crate(serde_json)) = 1.0.68 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 Provides: bundled(crate(smallvec)) = 1.6.1 Provides: bundled(crate(strsim)) = 0.8.0 -Provides: bundled(crate(syn)) = 1.0.69 -Provides: bundled(crate(synstructure)) = 0.12.4 +Provides: bundled(crate(syn)) = 1.0.76 +Provides: bundled(crate(synstructure)) = 0.12.5 Provides: bundled(crate(tempfile)) = 3.2.0 Provides: bundled(crate(textwrap)) = 0.11.0 +Provides: bundled(crate(tokio)) = 1.11.0 +Provides: bundled(crate(tokio-macros)) = 1.3.0 Provides: bundled(crate(toml)) = 0.5.8 -Provides: bundled(crate(unicode-width)) = 0.1.8 -Provides: bundled(crate(unicode-xid)) = 0.2.1 +Provides: bundled(crate(unicode-width)) = 0.1.9 +Provides: bundled(crate(unicode-xid)) = 0.2.2 Provides: bundled(crate(uuid)) = 0.8.2 -Provides: bundled(crate(vcpkg)) = 0.2.11 +Provides: bundled(crate(vcpkg)) = 0.2.15 Provides: bundled(crate(vec_map)) = 0.8.2 Provides: bundled(crate(version_check)) = 0.9.3 Provides: bundled(crate(wasi)) = 0.10.2+wasi_snapshot_preview1 Provides: bundled(crate(winapi)) = 0.3.9 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0 -Provides: bundled(crate(zeroize)) = 1.2.0 -Provides: bundled(crate(zeroize_derive)) = 1.0.1 +Provides: bundled(crate(zeroize)) = 1.4.1 +Provides: bundled(crate(zeroize_derive)) = 1.1.0 ##### Bundled cargo crates list - END ##### BuildRequires: nspr-devel @@ -243,6 +250,8 @@ Requires: cracklib-dicts # Needed by logconv.pl Requires: perl-DB_File Requires: perl-Archive-Tar +Requires: perl-debugger +Requires: perl-sigtrap # Picks up our systemd deps. %{?systemd_requires} @@ -665,7 +674,7 @@ exit 0 %dir %{_libdir}/%{pkgname} %{_libdir}/libsvrcore.so.* %{_libdir}/%{pkgname}/libslapd.so.* -%{_libdir}/%{pkgname}/libns-dshttpd-*.so +%{_libdir}/%{pkgname}/libns-dshttpd.so.* %{_libdir}/%{pkgname}/libldaputil.so.* %{_libdir}/%{pkgname}/librewriters.so* %if %{bundle_jemalloc} @@ -699,6 +708,21 @@ exit 0 %endif %changelog +* Mon Sep 20 2021 Mark Reynolds - 2.0.10-1 +- Bump version to 2.0.10 +- Issue 4908 - Updated several dsconf --help entries (typos, wrong descriptions, etc.) +- Issue 4912 - Account Policy plugin does not set the config entry DN +- Issue 4863 - typoes in logconv.pl +- Issue 4796 - Add support for nsslapd-state to CLI & UI +- Issue 4894 - IPA failure in ipa user-del --preserve (#4907) +- Issue 4912 - dsidm command crashing when account policy plugin is enabled +- Issue 4910 - db reindex corrupts RUV tombstone nsuiqueid index +- Issue 4869 - Fix retro cl trimming misuse of monotonic/realtime clocks +- Issue 4887 - UI - fix minor regression from camelCase fixup + +* Tue Sep 14 2021 Sahana Prasad - 2.0.7-1.2 +- Rebuilt with OpenSSL 3.0.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.7-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 275c1fe..a748bd4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (389-ds-base-2.0.10.tar.bz2) = 2ae362386c72c2b6408d7f0ba8e04f3f2b4a750e4c60aa8915fd513994da62f4ac6bf10dcf69b75504611b082527b906cfa0c507d0aaf48b5f729b7acaa80b4f SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 -SHA512 (389-ds-base-2.0.7.tar.bz2) = 05a307d2bfbf47e60cab236f4b9f931820e33e208579422e85f2823eb19dbd45dbab5758366c1be48cbdcdf5fbf128ab3d6700ec2be1fe61dd63b9b1f855f30f From 01c564bdc9b0e6c21d6b517dd8525854ad3bb5d3 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Thu, 4 Nov 2021 08:46:01 +0100 Subject: [PATCH 02/14] Use split perl dependencies only on Fedora >= 33 and RHEL >= 9 Resolves rhbz#2016595 --- 389-ds-base.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 709c3ea..c4d6f3a 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -54,7 +54,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 2.0.10 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 @@ -250,8 +250,10 @@ Requires: cracklib-dicts # Needed by logconv.pl Requires: perl-DB_File Requires: perl-Archive-Tar +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 Requires: perl-debugger Requires: perl-sigtrap +%endif # Picks up our systemd deps. %{?systemd_requires} @@ -708,6 +710,9 @@ exit 0 %endif %changelog +* Thu Nov 04 2021 Viktor Ashirov - 2.0.10-2 +- Resolves #rhbz2016595 + * Mon Sep 20 2021 Mark Reynolds - 2.0.10-1 - Bump version to 2.0.10 - Issue 4908 - Updated several dsconf --help entries (typos, wrong descriptions, etc.) From 7a526f2ab2b7d028950087836409f70cee6f721f Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 22 Nov 2021 20:08:03 -0500 Subject: [PATCH 03/14] Bump version to 2.0.11 Issue 4962 - Fix various UI bugs - Settings and Monitor (#5016) Issue 5014 - UI - Add group creation to LDAP editor Issue 5006 - UI - LDAP editor tree not being properly updated Issue 5001 - Update CI test for new availableSASLMechs attribute Issue 4959 - Invalid /etc/hosts setup can cause isLocalHost to fail. Issue 5001 - Fix next round of UI bugs: Issue 4962 - Fix various UI bugs - dsctl and ciphers (#5000) Issue 4978 - use more portable python command for checking containers Issue 4678 - RFE automatique disable of virtual attribute checking (#4918) Issue 4972 - gecos with IA5 introduces a compatibility issue with previous (#4981) Issue 4978 - make installer robust Issue 4976 - Failure in suites/import/import_test.py::test_fast_slow_import Issue 4973 - update snmp to use /run/dirsrv for PID file Issue 4962 - Fix various UI bugs - Plugins (#4969) Issue 4973 - installer changes permissions on /run Issue 4092 - systemd-tmpfiles warnings Issue 4956 - Automember allows invalid regex, and does not log proper error Issue 4731 - Promoting/demoting a replica can crash the server Issue 4962 - Fix various UI bugs part 1 Issue 3584 - Fix PBKDF2_SHA256 hashing in FIPS mode (#4949) Issue 4943 - Fix csn generator to limit time skew drift (#4946) Issue 2790 - Set db home directory by default Issue 4299 - Merge LDAP editor code into Cockpit UI Issue 4938 - max_failure_count can be reached in dscontainer on slow machine with missing debug exception trace Issue 4921 - logconv.pl -j: Use of uninitialized value (#4922) Issue 4847 - BUG - potential deadlock in replica (#4936) Issue 4513 - fix ACI CI tests involving ip/hostname rules Issue 4925 - Performance ACI: targetfilter evaluation result can be reused (#4926) Issue 4916 - Memory leak in ldap-agent --- .gitignore | 1 + 389-ds-base.spec | 78 ++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 58 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 37e58d4..0f767d3 100644 --- a/.gitignore +++ b/.gitignore @@ -207,3 +207,4 @@ /389-ds-base-2.0.6.tar.bz2 /389-ds-base-2.0.7.tar.bz2 /389-ds-base-2.0.10.tar.bz2 +/389-ds-base-2.0.11.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index c4d6f3a..b1bf1c2 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -53,9 +53,9 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.10 -Release: %{?relprefix}2%{?prerel}%{?dist} -License: GPLv3+ and (ASL 2.0 or MIT) +Version: 2.0.11 +Release: %{?relprefix}1%{?prerel}%{?dist} +License: GPLv3+ URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 Conflicts: freeipa-server < 4.0.3 @@ -65,7 +65,7 @@ Obsoletes: %{name}-legacy-tools-debuginfo < 1.4.4.6 Provides: ldif2ldbm >= 0 ##### Bundled cargo crates list - START ##### -Provides: bundled(crate(ahash)) = 0.7.4 +Provides: bundled(crate(ahash)) = 0.7.6 Provides: bundled(crate(ansi_term)) = 0.11.0 Provides: bundled(crate(atty)) = 0.2.14 Provides: bundled(crate(autocfg)) = 1.0.1 @@ -73,10 +73,10 @@ Provides: bundled(crate(base64)) = 0.13.0 Provides: bundled(crate(bitflags)) = 1.3.2 Provides: bundled(crate(byteorder)) = 1.4.3 Provides: bundled(crate(cbindgen)) = 0.9.1 -Provides: bundled(crate(cc)) = 1.0.70 +Provides: bundled(crate(cc)) = 1.0.72 Provides: bundled(crate(cfg-if)) = 1.0.0 Provides: bundled(crate(clap)) = 2.33.3 -Provides: bundled(crate(concread)) = 0.2.18 +Provides: bundled(crate(concread)) = 0.2.19 Provides: bundled(crate(crossbeam)) = 0.8.1 Provides: bundled(crate(crossbeam-channel)) = 0.5.1 Provides: bundled(crate(crossbeam-deque)) = 0.8.1 @@ -89,31 +89,33 @@ Provides: bundled(crate(fernet)) = 0.1.4 Provides: bundled(crate(foreign-types)) = 0.3.2 Provides: bundled(crate(foreign-types-shared)) = 0.1.1 Provides: bundled(crate(getrandom)) = 0.2.3 +Provides: bundled(crate(hashbrown)) = 0.11.2 Provides: bundled(crate(hermit-abi)) = 0.1.19 -Provides: bundled(crate(instant)) = 0.1.10 +Provides: bundled(crate(instant)) = 0.1.12 Provides: bundled(crate(itoa)) = 0.4.8 Provides: bundled(crate(jobserver)) = 0.1.24 Provides: bundled(crate(lazy_static)) = 1.4.0 -Provides: bundled(crate(libc)) = 0.2.102 +Provides: bundled(crate(libc)) = 0.2.108 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 Provides: bundled(crate(lock_api)) = 0.4.5 Provides: bundled(crate(log)) = 0.4.14 +Provides: bundled(crate(lru)) = 0.6.6 Provides: bundled(crate(memoffset)) = 0.6.4 Provides: bundled(crate(once_cell)) = 1.8.0 -Provides: bundled(crate(openssl)) = 0.10.36 -Provides: bundled(crate(openssl-sys)) = 0.9.66 +Provides: bundled(crate(openssl)) = 0.10.38 +Provides: bundled(crate(openssl-sys)) = 0.9.71 Provides: bundled(crate(parking_lot)) = 0.11.2 Provides: bundled(crate(parking_lot_core)) = 0.8.5 Provides: bundled(crate(paste)) = 0.1.18 Provides: bundled(crate(paste-impl)) = 0.1.18 Provides: bundled(crate(pin-project-lite)) = 0.2.7 -Provides: bundled(crate(pkg-config)) = 0.3.19 -Provides: bundled(crate(ppv-lite86)) = 0.2.10 +Provides: bundled(crate(pkg-config)) = 0.3.22 +Provides: bundled(crate(ppv-lite86)) = 0.2.15 Provides: bundled(crate(proc-macro-hack)) = 0.5.19 -Provides: bundled(crate(proc-macro2)) = 1.0.29 +Provides: bundled(crate(proc-macro2)) = 1.0.32 Provides: bundled(crate(pwdchan)) = 0.1.0 -Provides: bundled(crate(quote)) = 1.0.9 +Provides: bundled(crate(quote)) = 1.0.10 Provides: bundled(crate(rand)) = 0.8.4 Provides: bundled(crate(rand_chacha)) = 0.3.1 Provides: bundled(crate(rand_core)) = 0.6.3 @@ -124,17 +126,17 @@ Provides: bundled(crate(ryu)) = 1.0.5 Provides: bundled(crate(scopeguard)) = 1.1.0 Provides: bundled(crate(serde)) = 1.0.130 Provides: bundled(crate(serde_derive)) = 1.0.130 -Provides: bundled(crate(serde_json)) = 1.0.68 +Provides: bundled(crate(serde_json)) = 1.0.71 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 -Provides: bundled(crate(smallvec)) = 1.6.1 +Provides: bundled(crate(smallvec)) = 1.7.0 Provides: bundled(crate(strsim)) = 0.8.0 -Provides: bundled(crate(syn)) = 1.0.76 -Provides: bundled(crate(synstructure)) = 0.12.5 +Provides: bundled(crate(syn)) = 1.0.81 +Provides: bundled(crate(synstructure)) = 0.12.6 Provides: bundled(crate(tempfile)) = 3.2.0 Provides: bundled(crate(textwrap)) = 0.11.0 -Provides: bundled(crate(tokio)) = 1.11.0 -Provides: bundled(crate(tokio-macros)) = 1.3.0 +Provides: bundled(crate(tokio)) = 1.14.0 +Provides: bundled(crate(tokio-macros)) = 1.6.0 Provides: bundled(crate(toml)) = 0.5.8 Provides: bundled(crate(unicode-width)) = 0.1.9 Provides: bundled(crate(unicode-xid)) = 0.2.2 @@ -146,8 +148,8 @@ Provides: bundled(crate(wasi)) = 0.10.2+wasi_snapshot_preview1 Provides: bundled(crate(winapi)) = 0.3.9 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0 -Provides: bundled(crate(zeroize)) = 1.4.1 -Provides: bundled(crate(zeroize_derive)) = 1.1.0 +Provides: bundled(crate(zeroize)) = 1.4.3 +Provides: bundled(crate(zeroize_derive)) = 1.2.2 ##### Bundled cargo crates list - END ##### BuildRequires: nspr-devel @@ -710,6 +712,38 @@ exit 0 %endif %changelog +* Mon Nov 22 2021 Mark Reynolds - 2.0.11-1 +- Bump version to 2.0.11 +- Issue 4962 - Fix various UI bugs - Settings and Monitor (#5016) +- Issue 5014 - UI - Add group creation to LDAP editor +- Issue 5006 - UI - LDAP editor tree not being properly updated +- Issue 5001 - Update CI test for new availableSASLMechs attribute +- Issue 4959 - Invalid /etc/hosts setup can cause isLocalHost to fail. +- Issue 5001 - Fix next round of UI bugs: +- Issue 4962 - Fix various UI bugs - dsctl and ciphers (#5000) +- Issue 4978 - use more portable python command for checking containers +- Issue 4678 - RFE automatique disable of virtual attribute checking (#4918) +- Issue 4972 - gecos with IA5 introduces a compatibility issue with previous (#4981) +- Issue 4978 - make installer robust +- Issue 4976 - Failure in suites/import/import_test.py::test_fast_slow_import +- Issue 4973 - update snmp to use /run/dirsrv for PID file +- Issue 4962 - Fix various UI bugs - Plugins (#4969) +- Issue 4973 - installer changes permissions on /run +- Issue 4092 - systemd-tmpfiles warnings +- Issue 4956 - Automember allows invalid regex, and does not log proper error +- Issue 4731 - Promoting/demoting a replica can crash the server +- Issue 4962 - Fix various UI bugs part 1 +- Issue 3584 - Fix PBKDF2_SHA256 hashing in FIPS mode (#4949) +- Issue 4943 - Fix csn generator to limit time skew drift (#4946) +- Issue 2790 - Set db home directory by default +- Issue 4299 - Merge LDAP editor code into Cockpit UI +- Issue 4938 - max_failure_count can be reached in dscontainer on slow machine with missing debug exception trace +- Issue 4921 - logconv.pl -j: Use of uninitialized value (#4922) +- Issue 4847 - BUG - potential deadlock in replica (#4936) +- Issue 4513 - fix ACI CI tests involving ip/hostname rules +- Issue 4925 - Performance ACI: targetfilter evaluation result can be reused (#4926) +- Issue 4916 - Memory leak in ldap-agent + * Thu Nov 04 2021 Viktor Ashirov - 2.0.10-2 - Resolves #rhbz2016595 diff --git a/sources b/sources index a748bd4..1d4ddf2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (389-ds-base-2.0.10.tar.bz2) = 2ae362386c72c2b6408d7f0ba8e04f3f2b4a750e4c60aa8915fd513994da62f4ac6bf10dcf69b75504611b082527b906cfa0c507d0aaf48b5f729b7acaa80b4f +SHA512 (389-ds-base-2.0.11.tar.bz2) = 23869b5ec8d0fd2774682b5c2dfd1d60dc99a50f5817e25dca50f1eb62d2553f11f7249c7751d1e010bf0c1a0380ec08f56fc5b3f7d66f439a6e350913912318 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 From aa0fb5ed9f5117f5a6f2a7aeaee2b37cb1700bf4 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Thu, 16 Dec 2021 17:30:03 -0500 Subject: [PATCH 04/14] Bump version to 2.0.12-1 Issue 4299 - UI LDAP editor - add "edit" and "rename" functionality Issue 4962 - Fix various UI bugs - Database and Backups (#5044) Issue 5046 - BUG - update concread (#5047) Issue 5043 - BUG - Result must be used compiler warning (#5045) Issue 4165 - Don't apply RootDN access control restrictions to UNIX connections Issue 4931 - RFE: dsidm - add creation of service accounts Issue 5024 - BUG - windows ro replica sigsegv (#5027) Issue 5020 - BUG - improve clarity of posix win sync logging (#5021) Issue 5008 - If a non critical plugin can not be loaded/initialized, bootstrap should succeeds (#5009) --- .gitignore | 1 + 389-ds-base.spec | 48 ++++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 0f767d3..f960344 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ /389-ds-base-2.0.7.tar.bz2 /389-ds-base-2.0.10.tar.bz2 /389-ds-base-2.0.11.tar.bz2 +/389-ds-base-2.0.12.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index b1bf1c2..b256405 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -53,7 +53,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.11 +Version: 2.0.12 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org @@ -66,7 +66,7 @@ Provides: ldif2ldbm >= 0 ##### Bundled cargo crates list - START ##### Provides: bundled(crate(ahash)) = 0.7.6 -Provides: bundled(crate(ansi_term)) = 0.11.0 +Provides: bundled(crate(ansi_term)) = 0.12.1 Provides: bundled(crate(atty)) = 0.2.14 Provides: bundled(crate(autocfg)) = 1.0.1 Provides: bundled(crate(base64)) = 0.13.0 @@ -75,8 +75,8 @@ Provides: bundled(crate(byteorder)) = 1.4.3 Provides: bundled(crate(cbindgen)) = 0.9.1 Provides: bundled(crate(cc)) = 1.0.72 Provides: bundled(crate(cfg-if)) = 1.0.0 -Provides: bundled(crate(clap)) = 2.33.3 -Provides: bundled(crate(concread)) = 0.2.19 +Provides: bundled(crate(clap)) = 2.34.0 +Provides: bundled(crate(concread)) = 0.2.20 Provides: bundled(crate(crossbeam)) = 0.8.1 Provides: bundled(crate(crossbeam-channel)) = 0.5.1 Provides: bundled(crate(crossbeam-deque)) = 0.8.1 @@ -92,28 +92,28 @@ Provides: bundled(crate(getrandom)) = 0.2.3 Provides: bundled(crate(hashbrown)) = 0.11.2 Provides: bundled(crate(hermit-abi)) = 0.1.19 Provides: bundled(crate(instant)) = 0.1.12 -Provides: bundled(crate(itoa)) = 0.4.8 +Provides: bundled(crate(itoa)) = 1.0.1 Provides: bundled(crate(jobserver)) = 0.1.24 Provides: bundled(crate(lazy_static)) = 1.4.0 -Provides: bundled(crate(libc)) = 0.2.108 +Provides: bundled(crate(libc)) = 0.2.112 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 Provides: bundled(crate(lock_api)) = 0.4.5 Provides: bundled(crate(log)) = 0.4.14 Provides: bundled(crate(lru)) = 0.6.6 -Provides: bundled(crate(memoffset)) = 0.6.4 -Provides: bundled(crate(once_cell)) = 1.8.0 +Provides: bundled(crate(memoffset)) = 0.6.5 +Provides: bundled(crate(once_cell)) = 1.9.0 Provides: bundled(crate(openssl)) = 0.10.38 -Provides: bundled(crate(openssl-sys)) = 0.9.71 +Provides: bundled(crate(openssl-sys)) = 0.9.72 Provides: bundled(crate(parking_lot)) = 0.11.2 Provides: bundled(crate(parking_lot_core)) = 0.8.5 Provides: bundled(crate(paste)) = 0.1.18 Provides: bundled(crate(paste-impl)) = 0.1.18 Provides: bundled(crate(pin-project-lite)) = 0.2.7 -Provides: bundled(crate(pkg-config)) = 0.3.22 +Provides: bundled(crate(pkg-config)) = 0.3.24 Provides: bundled(crate(ppv-lite86)) = 0.2.15 Provides: bundled(crate(proc-macro-hack)) = 0.5.19 -Provides: bundled(crate(proc-macro2)) = 1.0.32 +Provides: bundled(crate(proc-macro2)) = 1.0.34 Provides: bundled(crate(pwdchan)) = 0.1.0 Provides: bundled(crate(quote)) = 1.0.10 Provides: bundled(crate(rand)) = 0.8.4 @@ -122,21 +122,21 @@ Provides: bundled(crate(rand_core)) = 0.6.3 Provides: bundled(crate(rand_hc)) = 0.3.1 Provides: bundled(crate(redox_syscall)) = 0.2.10 Provides: bundled(crate(remove_dir_all)) = 0.5.3 -Provides: bundled(crate(ryu)) = 1.0.5 +Provides: bundled(crate(ryu)) = 1.0.9 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(serde)) = 1.0.130 -Provides: bundled(crate(serde_derive)) = 1.0.130 -Provides: bundled(crate(serde_json)) = 1.0.71 +Provides: bundled(crate(serde)) = 1.0.132 +Provides: bundled(crate(serde_derive)) = 1.0.132 +Provides: bundled(crate(serde_json)) = 1.0.73 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 Provides: bundled(crate(smallvec)) = 1.7.0 Provides: bundled(crate(strsim)) = 0.8.0 -Provides: bundled(crate(syn)) = 1.0.81 +Provides: bundled(crate(syn)) = 1.0.82 Provides: bundled(crate(synstructure)) = 0.12.6 Provides: bundled(crate(tempfile)) = 3.2.0 Provides: bundled(crate(textwrap)) = 0.11.0 -Provides: bundled(crate(tokio)) = 1.14.0 -Provides: bundled(crate(tokio-macros)) = 1.6.0 +Provides: bundled(crate(tokio)) = 1.15.0 +Provides: bundled(crate(tokio-macros)) = 1.7.0 Provides: bundled(crate(toml)) = 0.5.8 Provides: bundled(crate(unicode-width)) = 0.1.9 Provides: bundled(crate(unicode-xid)) = 0.2.2 @@ -712,6 +712,18 @@ exit 0 %endif %changelog +* Thu Dec 16 2021 Mark Reynolds - 2.0.12-1 +- Bump version to 2.0.12-1 +- Issue 4299 - UI LDAP editor - add "edit" and "rename" functionality +- Issue 4962 - Fix various UI bugs - Database and Backups (#5044) +- Issue 5046 - BUG - update concread (#5047) +- Issue 5043 - BUG - Result must be used compiler warning (#5045) +- Issue 4165 - Don't apply RootDN access control restrictions to UNIX connections +- Issue 4931 - RFE: dsidm - add creation of service accounts +- Issue 5024 - BUG - windows ro replica sigsegv (#5027) +- Issue 5020 - BUG - improve clarity of posix win sync logging (#5021) +- Issue 5008 - If a non critical plugin can not be loaded/initialized, bootstrap should succeeds (#5009) + * Mon Nov 22 2021 Mark Reynolds - 2.0.11-1 - Bump version to 2.0.11 - Issue 4962 - Fix various UI bugs - Settings and Monitor (#5016) diff --git a/sources b/sources index 1d4ddf2..12d8e74 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (389-ds-base-2.0.11.tar.bz2) = 23869b5ec8d0fd2774682b5c2dfd1d60dc99a50f5817e25dca50f1eb62d2553f11f7249c7751d1e010bf0c1a0380ec08f56fc5b3f7d66f439a6e350913912318 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 +SHA512 (389-ds-base-2.0.12.tar.bz2) = add9ad43f9ab50e8ab10bba2a2daef3b201adae0367a28b9814f17c6130a8cb6287391352951a6528c9a16d8139133c8b8ac08bc9436b587c8790ac5b30d0cff From 48eb2c4121ec4757eb7fb98e96a0918f60031b5f Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 24 Jan 2022 13:58:17 -0500 Subject: [PATCH 05/14] Bump version to 2.0.13 Issue 5132 - Update Rust crate lru to fix CVE Issue 3555 - UI - fix audit issue with npm nanoid Issue 4299 - UI - Add ACI editing features Issue 4299 - UI - LDAP editor - add "edit" and "rename" functionality Issue 5127 - run restorecon on /dev/shm at server startup Issue 5124 - dscontainer fails to create an instance Issue 4312 - fix compiler warnings Issue 5115 - AttributeError: type object 'build_manpages' has no attribute 'build_manpages' Issue 4312 - performance search rate: contention on global monitoring counters (#4940) Issue 5105 - During a bind, if the target entry is not reachable the operation may complete without sending result (#5107) Issue 5095 - sync-repl with openldap may send truncated syncUUID (#5099) Issue 3584 - Add is_fips check to password tests (#5100) Issue 5074 - retro changelog cli updates (#5075) Issue 4994 - Revert retrocl dependency workaround (#4995) --- .gitignore | 1 + 389-ds-base.spec | 63 +++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index f960344..03ac955 100644 --- a/.gitignore +++ b/.gitignore @@ -209,3 +209,4 @@ /389-ds-base-2.0.10.tar.bz2 /389-ds-base-2.0.11.tar.bz2 /389-ds-base-2.0.12.tar.bz2 +/389-ds-base-2.0.13.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index b256405..a9c00e4 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -53,7 +53,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.12 +Version: 2.0.13 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org @@ -76,31 +76,32 @@ Provides: bundled(crate(cbindgen)) = 0.9.1 Provides: bundled(crate(cc)) = 1.0.72 Provides: bundled(crate(cfg-if)) = 1.0.0 Provides: bundled(crate(clap)) = 2.34.0 -Provides: bundled(crate(concread)) = 0.2.20 +Provides: bundled(crate(concread)) = 0.2.21 Provides: bundled(crate(crossbeam)) = 0.8.1 -Provides: bundled(crate(crossbeam-channel)) = 0.5.1 +Provides: bundled(crate(crossbeam-channel)) = 0.5.2 Provides: bundled(crate(crossbeam-deque)) = 0.8.1 -Provides: bundled(crate(crossbeam-epoch)) = 0.9.5 -Provides: bundled(crate(crossbeam-queue)) = 0.3.2 -Provides: bundled(crate(crossbeam-utils)) = 0.8.5 +Provides: bundled(crate(crossbeam-epoch)) = 0.9.6 +Provides: bundled(crate(crossbeam-queue)) = 0.3.3 +Provides: bundled(crate(crossbeam-utils)) = 0.8.6 Provides: bundled(crate(entryuuid)) = 0.1.0 Provides: bundled(crate(entryuuid_syntax)) = 0.1.0 +Provides: bundled(crate(fastrand)) = 1.7.0 Provides: bundled(crate(fernet)) = 0.1.4 Provides: bundled(crate(foreign-types)) = 0.3.2 Provides: bundled(crate(foreign-types-shared)) = 0.1.1 -Provides: bundled(crate(getrandom)) = 0.2.3 +Provides: bundled(crate(getrandom)) = 0.2.4 Provides: bundled(crate(hashbrown)) = 0.11.2 Provides: bundled(crate(hermit-abi)) = 0.1.19 Provides: bundled(crate(instant)) = 0.1.12 Provides: bundled(crate(itoa)) = 1.0.1 Provides: bundled(crate(jobserver)) = 0.1.24 Provides: bundled(crate(lazy_static)) = 1.4.0 -Provides: bundled(crate(libc)) = 0.2.112 +Provides: bundled(crate(libc)) = 0.2.113 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 Provides: bundled(crate(lock_api)) = 0.4.5 Provides: bundled(crate(log)) = 0.4.14 -Provides: bundled(crate(lru)) = 0.6.6 +Provides: bundled(crate(lru)) = 0.7.2 Provides: bundled(crate(memoffset)) = 0.6.5 Provides: bundled(crate(once_cell)) = 1.9.0 Provides: bundled(crate(openssl)) = 0.10.38 @@ -109,13 +110,13 @@ Provides: bundled(crate(parking_lot)) = 0.11.2 Provides: bundled(crate(parking_lot_core)) = 0.8.5 Provides: bundled(crate(paste)) = 0.1.18 Provides: bundled(crate(paste-impl)) = 0.1.18 -Provides: bundled(crate(pin-project-lite)) = 0.2.7 +Provides: bundled(crate(pin-project-lite)) = 0.2.8 Provides: bundled(crate(pkg-config)) = 0.3.24 -Provides: bundled(crate(ppv-lite86)) = 0.2.15 +Provides: bundled(crate(ppv-lite86)) = 0.2.16 Provides: bundled(crate(proc-macro-hack)) = 0.5.19 -Provides: bundled(crate(proc-macro2)) = 1.0.34 +Provides: bundled(crate(proc-macro2)) = 1.0.36 Provides: bundled(crate(pwdchan)) = 0.1.0 -Provides: bundled(crate(quote)) = 1.0.10 +Provides: bundled(crate(quote)) = 1.0.15 Provides: bundled(crate(rand)) = 0.8.4 Provides: bundled(crate(rand_chacha)) = 0.3.1 Provides: bundled(crate(rand_core)) = 0.6.3 @@ -124,16 +125,16 @@ Provides: bundled(crate(redox_syscall)) = 0.2.10 Provides: bundled(crate(remove_dir_all)) = 0.5.3 Provides: bundled(crate(ryu)) = 1.0.9 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(serde)) = 1.0.132 -Provides: bundled(crate(serde_derive)) = 1.0.132 -Provides: bundled(crate(serde_json)) = 1.0.73 +Provides: bundled(crate(serde)) = 1.0.135 +Provides: bundled(crate(serde_derive)) = 1.0.135 +Provides: bundled(crate(serde_json)) = 1.0.78 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 -Provides: bundled(crate(smallvec)) = 1.7.0 +Provides: bundled(crate(smallvec)) = 1.8.0 Provides: bundled(crate(strsim)) = 0.8.0 -Provides: bundled(crate(syn)) = 1.0.82 +Provides: bundled(crate(syn)) = 1.0.86 Provides: bundled(crate(synstructure)) = 0.12.6 -Provides: bundled(crate(tempfile)) = 3.2.0 +Provides: bundled(crate(tempfile)) = 3.3.0 Provides: bundled(crate(textwrap)) = 0.11.0 Provides: bundled(crate(tokio)) = 1.15.0 Provides: bundled(crate(tokio-macros)) = 1.7.0 @@ -143,13 +144,13 @@ Provides: bundled(crate(unicode-xid)) = 0.2.2 Provides: bundled(crate(uuid)) = 0.8.2 Provides: bundled(crate(vcpkg)) = 0.2.15 Provides: bundled(crate(vec_map)) = 0.8.2 -Provides: bundled(crate(version_check)) = 0.9.3 +Provides: bundled(crate(version_check)) = 0.9.4 Provides: bundled(crate(wasi)) = 0.10.2+wasi_snapshot_preview1 Provides: bundled(crate(winapi)) = 0.3.9 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0 -Provides: bundled(crate(zeroize)) = 1.4.3 -Provides: bundled(crate(zeroize_derive)) = 1.2.2 +Provides: bundled(crate(zeroize)) = 1.5.0 +Provides: bundled(crate(zeroize_derive)) = 1.3.1 ##### Bundled cargo crates list - END ##### BuildRequires: nspr-devel @@ -633,6 +634,7 @@ exit 0 %{_sbindir}/openldap_to_ds %{_mandir}/man8/openldap_to_ds.8.gz %{_libexecdir}/%{pkgname}/ds_systemd_ask_password_acl +%{_libexecdir}/%{pkgname}/ds_selinux_restorecon.sh %{_mandir}/man5/99user.ldif.5.gz %{_mandir}/man5/certmap.conf.5.gz %{_mandir}/man5/slapd-collations.conf.5.gz @@ -712,6 +714,23 @@ exit 0 %endif %changelog +* Mon Jan 24 2022 Mark Reynolds - 2.0.13-1 +- Bump version to 2.0.13 +- Issue 5132 - Update Rust crate lru to fix CVE +- Issue 3555 - UI - fix audit issue with npm nanoid +- Issue 4299 - UI - Add ACI editing features +- Issue 4299 - UI - LDAP editor - add "edit" and "rename" functionality +- Issue 5127 - run restorecon on /dev/shm at server startup +- Issue 5124 - dscontainer fails to create an instance +- Issue 4312 - fix compiler warnings +- Issue 5115 - AttributeError: type object 'build_manpages' has no attribute 'build_manpages' +- Issue 4312 - performance search rate: contention on global monitoring counters (#4940) +- Issue 5105 - During a bind, if the target entry is not reachable the operation may complete without sending result (#5107) +- Issue 5095 - sync-repl with openldap may send truncated syncUUID (#5099) +- Issue 3584 - Add is_fips check to password tests (#5100) +- Issue 5074 - retro changelog cli updates (#5075) +- Issue 4994 - Revert retrocl dependency workaround (#4995) + * Thu Dec 16 2021 Mark Reynolds - 2.0.12-1 - Bump version to 2.0.12-1 - Issue 4299 - UI LDAP editor - add "edit" and "rename" functionality diff --git a/sources b/sources index 12d8e74..7786e23 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (389-ds-base-2.0.13.tar.bz2) = ab9429b391b32d4a09ea5fb0ce15fcf31f7c13e781588ce5587a0ed169959938ce59bff857dbf58bb9413208f6c35792c127cad27c7aca6aa53ef66ef4c36196 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 -SHA512 (389-ds-base-2.0.12.tar.bz2) = add9ad43f9ab50e8ab10bba2a2daef3b201adae0367a28b9814f17c6130a8cb6287391352951a6528c9a16d8139133c8b8ac08bc9436b587c8790ac5b30d0cff From db9f14d2645aa47df9a7896f48c8535e6208cdc1 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Tue, 25 Jan 2022 14:40:31 +0100 Subject: [PATCH 06/14] Use Rust 2018 edition for concread on EL8 --- 389-ds-base.spec | 5 +++++ concread-use-2018-edition.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 concread-use-2018-edition.patch diff --git a/389-ds-base.spec b/389-ds-base.spec index a9c00e4..760dcbe 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -271,6 +271,11 @@ Source2: %{name}-devel.README Source3: https://github.com/jemalloc/%{jemalloc_name}/releases/download/%{jemalloc_ver}/%{jemalloc_name}-%{jemalloc_ver}.tar.bz2 %endif +# Remove this after rust-1.56 lands in repos +%if 0%{?rhel} == 8 +Patch0: concread-use-2018-edition.patch +%endif + %description 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration. diff --git a/concread-use-2018-edition.patch b/concread-use-2018-edition.patch new file mode 100644 index 0000000..c09bf22 --- /dev/null +++ b/concread-use-2018-edition.patch @@ -0,0 +1,19 @@ +diff '--color=auto' -Nur 389-ds-base-2.0.13.orig/vendor/concread/.cargo-checksum.json 389-ds-base-2.0.13/vendor/concread/.cargo-checksum.json +--- 389-ds-base-2.0.13.orig/vendor/concread/.cargo-checksum.json 2022-01-25 14:30:32.886759088 +0100 ++++ 389-ds-base-2.0.13/vendor/concread/.cargo-checksum.json 2022-01-25 14:30:59.144053695 +0100 +@@ -1 +1 @@ +-{"files":{"CACHE.md":"258e585db81ee9582e1f7e7246026b49b3f617dae4459ec52437024b00ba5dff","CODE_OF_CONDUCT.md":"f32933e0090f012d336e8b2f2301967e8a27cbc896aa3860811a944d05b58964","CONTRIBUTORS.md":"1edff6e840fc50412ac698cd7e5ebe660574760b492d4febe94feb0c066b062f","Cargo.toml":"088f1aa3051cfc8b7861c3eed146e9a5d936e68edaaa85d04054475a8d24224e","LICENSE.md":"32ee9dbf6196874fc9d406c54a888a6c4cbb9aa4a7f35b46befeaff43a78fe85","Makefile":"de35f7df990b5c047785da63ad560ecadac746bf19d2ab8457fc2ba0224ad46a","README.md":"f70aafccb01764a1aa4d83e3f7fbeab245f7bfa3d3bafecea9614439ff97b487","asan_test.sh":"7355f359e34a6198e895c18fbb616fa45a44666c0a82787f704454e83687be4c","benches/arccache.rs":"6f1f23abb2b577c21aa7ee3d4bd7413fcb49a60d59b1220e1afaeda99f4e6b0e","benches/hashmap_benchmark.rs":"306d085f88f7ce40b8709aff37375482f8edb3c891cbb3da5d9d70a95c2d6cca","src/arcache/ll.rs":"2bd7eb2e73f80112765a0e1792edc27b58269dfc419498ef02ad68fb63141abc","src/arcache/mod.rs":"5911e162123373e241a6bf2b6355cda5480f9ff2f3fa2901c08a7010ad82c00a","src/arcache/traits.rs":"09ea380ea38efe3e35c2036a2ae233388a5367706d155c4aa3c9234d03eef8ea","src/bptree/asynch.rs":"69eff00e05b7b85a12468304374422b2ce1d8598b50918b0efe6eb77036249a4","src/bptree/impl.rs":"b54a7d53e23bf0ff23ebd43ea7ab19708cc383766706051f207bfb62f5e64793","src/bptree/mod.rs":"5e8d2004865dd2064a550070ca3b49a1975ac877cd6749f035806335f3a393a1","src/cowcell/asynch.rs":"04a1c424c083625f92524547bd21d20aadec4d20e2eedfff4db90f2aef920d6c","src/cowcell/mod.rs":"621c243c301f80ebcf65a636489c9450e22940bc5bc9cfb1e5db7943f4e3543f","src/ebrcell/mod.rs":"cf2a2042ac41039ca5fb4212f1fec58bfa1695b88f9c7f7864e01dafa84ccf35","src/hashmap/asynch.rs":"f8418906a23cf06e73fb1330988da4ab0f53ae58c4d5fd58ab5105f8fcbcc414","src/hashmap/impl.rs":"9695dcfde2fd6b27766adddd225d6390a44cc757ebf9b2f5879f6f1b9a7f29dc","src/hashmap/mod.rs":"bbd33d7f50a28b9a1254d4aaed72f5122e9f01e68e0c43331f90582a17056657","src/internals/bptree/cursor.rs":"83b250db73eb09e1cf7367e8c33700e9b9659695fd565e813549b7f20f9ba777","src/internals/bptree/iter.rs":"dfcf50a3ff5b052dc719b2c68b0bafcfdd0c0c8d8173f3e227a7dd6c8f1be773","src/internals/bptree/macros.rs":"568826a43238474d1f92f7dbf1671690790b35a3b8c88d0d6c5dd35aca54857a","src/internals/bptree/mod.rs":"67ba38e16d96c0d239b72cf0b7be5f27a7a82a29e3a31afc5477175f92b4c57f","src/internals/bptree/node.rs":"afe7217f187d5d7a086dab3bc6fadbae0456e4f8518aa12153f877590380d585","src/internals/bptree/states.rs":"da1ce34cbe6bc449e9e5172ed1fd2a296f2ac197b17ca855f2d40aada7d32a63","src/internals/hashmap/cursor.rs":"7d9c47d7e31e984670cd2161be54475dc468df5b00df26dc89f9848eb1a587ea","src/internals/hashmap/iter.rs":"f02f372e34d2af685eebbcc4db71cc5985c904c1bbd14dd13f48921ea58e5c5f","src/internals/hashmap/macros.rs":"f1236cd794e0e8d7ee2e89428b60c1c3437f34e6be32217de2d61dddce7c6b90","src/internals/hashmap/mod.rs":"ffa693b755ef92da14b001e08a1154e263bd9540ae993d4f79ddf5979e2dcbd6","src/internals/hashmap/node.rs":"7d86f28969185f28de91b2c816990f231adb2c5985c4cbf0efcfdd07ae94ef9a","src/internals/hashmap/simd.rs":"4ef1fd5a0b6218823eafd727b7ff1a738dfc0c59d1e3afbb2ace8f0513967bf3","src/internals/hashmap/states.rs":"9366f29bdfaeb3ee9744268b5b2283209f791a260045312e8489515f8bd3900a","src/internals/lincowcell/mod.rs":"9caa826c9b6758e79d90c10c5dad4bfeaf46a8773784537750814f700fa13428","src/internals/lincowcell_async/mod.rs":"c38ec2efbd02219ebec68aa0b31e824262941093d1cfb3e441e6c98b375df6ab","src/internals/mod.rs":"18db9c4cb457fd06a85d668a69bd290ad13a7fae971a926015daf148424e19cc","src/lib.rs":"ce9ba3daaa0f8e9ee2e61a61e8134cf4d241522ca30909d6933f37075bd3e549","src/threadcache/mod.rs":"43328459ade4c1abb8174ded0f77f264a3931dbae82991e70765747d519882c6","src/unsound.rs":"60ed0cad28434083fe7cccd17af4995381cdd9e4dfb685da5b14e802150074fb","src/unsound2.rs":"02b72de153d9f5fac901ea59a9ef3d1ce9b8e3e18bc80d9d19b2d6aa8c7b5022","src/unsound3.rs":"019ba913656558f91e9a160cbc05fe78b1e4a44acc1bb74d38281ebea71edd77","src/utils.rs":"d07e962bab8936d5396bc7542af7ce2812504358c4e68dd2322f521c066476cd","static/arc_1.png":"94ff0d24a15d5feda27f0316f8a1ca82291f816d8705b1d0743e03e39791bbe2","static/arc_2.png":"9932b1b8e7f44a833f4ffdb710af984199711d6c9c3349a51ab122a22d0ebbe7","static/cow_1.png":"f340e6d143589efdbbfb8c62c4fdddc97dcb213e0cff2c04f7f93bf380fd36f3","static/cow_2.png":"20f550b67109cd042170da95ff6faecda043d333c55f48ec19ced8bb9dce1eee","static/cow_3.png":"137a24e70196bd628522733b55ed1d92cf3f9936be39d9f0864201424a25bd88","static/cow_arc_1.png":"97a45ad9b55721381aff07e921fedc863209629a4ae4f8c160cad7059ecad795","static/cow_arc_2.png":"178e681ba6e2e0a33a7b6a08b9895b628dad74cda56e9e25b59288376e9f01ce","static/cow_arc_3.png":"37dac32e173b14faf37b502a110ab1e4f47f30710cfc65714b9fef0b79f64307","static/cow_arc_4.png":"f4b962b9ccd9b765523f50b752b9bb85525cbf8a4e6cdc15048f9363579e6719","static/cow_arc_5.png":"d6b122ec844d0d19312cc57667769f2955bc7b8667449b1c13a7359a4debc8a2","static/cow_arc_6.png":"847018f7f5e0813b26c2b636a2ca8549f475339de24a21dd2e0e21d90dbd77f1","static/cow_arc_7.png":"3df9b3d1153c7b1de52a30a46e9bdba75e2412ad51ef158437a356f16b3bd1be","static/cow_arc_8.png":"68f405191ef400b8f854102e98fac92ddd31c274bcff7739e47483a39dba9612","static/cow_arc_9.png":"eb60637be4fb951ac54a1e3de0fd33e0bb2f5a4d19c3519bd8f23c02b8fc240d"},"package":"dcc9816f5ac93ebd51c37f7f9a6bf2b40dfcd42978ad2aea5d542016e9244cf6"} +\ No newline at end of file ++{"files":{"CACHE.md":"258e585db81ee9582e1f7e7246026b49b3f617dae4459ec52437024b00ba5dff","CODE_OF_CONDUCT.md":"f32933e0090f012d336e8b2f2301967e8a27cbc896aa3860811a944d05b58964","CONTRIBUTORS.md":"1edff6e840fc50412ac698cd7e5ebe660574760b492d4febe94feb0c066b062f","Cargo.toml":"188257f3b5f5cba5f526fd3647ce8c5a4c75a70dc95fbedf665a2cf2755aee6d","LICENSE.md":"32ee9dbf6196874fc9d406c54a888a6c4cbb9aa4a7f35b46befeaff43a78fe85","Makefile":"de35f7df990b5c047785da63ad560ecadac746bf19d2ab8457fc2ba0224ad46a","README.md":"f70aafccb01764a1aa4d83e3f7fbeab245f7bfa3d3bafecea9614439ff97b487","asan_test.sh":"7355f359e34a6198e895c18fbb616fa45a44666c0a82787f704454e83687be4c","benches/arccache.rs":"6f1f23abb2b577c21aa7ee3d4bd7413fcb49a60d59b1220e1afaeda99f4e6b0e","benches/hashmap_benchmark.rs":"306d085f88f7ce40b8709aff37375482f8edb3c891cbb3da5d9d70a95c2d6cca","src/arcache/ll.rs":"2bd7eb2e73f80112765a0e1792edc27b58269dfc419498ef02ad68fb63141abc","src/arcache/mod.rs":"5911e162123373e241a6bf2b6355cda5480f9ff2f3fa2901c08a7010ad82c00a","src/arcache/traits.rs":"09ea380ea38efe3e35c2036a2ae233388a5367706d155c4aa3c9234d03eef8ea","src/bptree/asynch.rs":"69eff00e05b7b85a12468304374422b2ce1d8598b50918b0efe6eb77036249a4","src/bptree/impl.rs":"b54a7d53e23bf0ff23ebd43ea7ab19708cc383766706051f207bfb62f5e64793","src/bptree/mod.rs":"5e8d2004865dd2064a550070ca3b49a1975ac877cd6749f035806335f3a393a1","src/cowcell/asynch.rs":"04a1c424c083625f92524547bd21d20aadec4d20e2eedfff4db90f2aef920d6c","src/cowcell/mod.rs":"621c243c301f80ebcf65a636489c9450e22940bc5bc9cfb1e5db7943f4e3543f","src/ebrcell/mod.rs":"cf2a2042ac41039ca5fb4212f1fec58bfa1695b88f9c7f7864e01dafa84ccf35","src/hashmap/asynch.rs":"f8418906a23cf06e73fb1330988da4ab0f53ae58c4d5fd58ab5105f8fcbcc414","src/hashmap/impl.rs":"9695dcfde2fd6b27766adddd225d6390a44cc757ebf9b2f5879f6f1b9a7f29dc","src/hashmap/mod.rs":"bbd33d7f50a28b9a1254d4aaed72f5122e9f01e68e0c43331f90582a17056657","src/internals/bptree/cursor.rs":"83b250db73eb09e1cf7367e8c33700e9b9659695fd565e813549b7f20f9ba777","src/internals/bptree/iter.rs":"dfcf50a3ff5b052dc719b2c68b0bafcfdd0c0c8d8173f3e227a7dd6c8f1be773","src/internals/bptree/macros.rs":"568826a43238474d1f92f7dbf1671690790b35a3b8c88d0d6c5dd35aca54857a","src/internals/bptree/mod.rs":"67ba38e16d96c0d239b72cf0b7be5f27a7a82a29e3a31afc5477175f92b4c57f","src/internals/bptree/node.rs":"afe7217f187d5d7a086dab3bc6fadbae0456e4f8518aa12153f877590380d585","src/internals/bptree/states.rs":"da1ce34cbe6bc449e9e5172ed1fd2a296f2ac197b17ca855f2d40aada7d32a63","src/internals/hashmap/cursor.rs":"7d9c47d7e31e984670cd2161be54475dc468df5b00df26dc89f9848eb1a587ea","src/internals/hashmap/iter.rs":"f02f372e34d2af685eebbcc4db71cc5985c904c1bbd14dd13f48921ea58e5c5f","src/internals/hashmap/macros.rs":"f1236cd794e0e8d7ee2e89428b60c1c3437f34e6be32217de2d61dddce7c6b90","src/internals/hashmap/mod.rs":"ffa693b755ef92da14b001e08a1154e263bd9540ae993d4f79ddf5979e2dcbd6","src/internals/hashmap/node.rs":"7d86f28969185f28de91b2c816990f231adb2c5985c4cbf0efcfdd07ae94ef9a","src/internals/hashmap/simd.rs":"4ef1fd5a0b6218823eafd727b7ff1a738dfc0c59d1e3afbb2ace8f0513967bf3","src/internals/hashmap/states.rs":"9366f29bdfaeb3ee9744268b5b2283209f791a260045312e8489515f8bd3900a","src/internals/lincowcell/mod.rs":"9caa826c9b6758e79d90c10c5dad4bfeaf46a8773784537750814f700fa13428","src/internals/lincowcell_async/mod.rs":"c38ec2efbd02219ebec68aa0b31e824262941093d1cfb3e441e6c98b375df6ab","src/internals/mod.rs":"18db9c4cb457fd06a85d668a69bd290ad13a7fae971a926015daf148424e19cc","src/lib.rs":"ce9ba3daaa0f8e9ee2e61a61e8134cf4d241522ca30909d6933f37075bd3e549","src/threadcache/mod.rs":"43328459ade4c1abb8174ded0f77f264a3931dbae82991e70765747d519882c6","src/unsound.rs":"60ed0cad28434083fe7cccd17af4995381cdd9e4dfb685da5b14e802150074fb","src/unsound2.rs":"02b72de153d9f5fac901ea59a9ef3d1ce9b8e3e18bc80d9d19b2d6aa8c7b5022","src/unsound3.rs":"019ba913656558f91e9a160cbc05fe78b1e4a44acc1bb74d38281ebea71edd77","src/utils.rs":"d07e962bab8936d5396bc7542af7ce2812504358c4e68dd2322f521c066476cd","static/arc_1.png":"94ff0d24a15d5feda27f0316f8a1ca82291f816d8705b1d0743e03e39791bbe2","static/arc_2.png":"9932b1b8e7f44a833f4ffdb710af984199711d6c9c3349a51ab122a22d0ebbe7","static/cow_1.png":"f340e6d143589efdbbfb8c62c4fdddc97dcb213e0cff2c04f7f93bf380fd36f3","static/cow_2.png":"20f550b67109cd042170da95ff6faecda043d333c55f48ec19ced8bb9dce1eee","static/cow_3.png":"137a24e70196bd628522733b55ed1d92cf3f9936be39d9f0864201424a25bd88","static/cow_arc_1.png":"97a45ad9b55721381aff07e921fedc863209629a4ae4f8c160cad7059ecad795","static/cow_arc_2.png":"178e681ba6e2e0a33a7b6a08b9895b628dad74cda56e9e25b59288376e9f01ce","static/cow_arc_3.png":"37dac32e173b14faf37b502a110ab1e4f47f30710cfc65714b9fef0b79f64307","static/cow_arc_4.png":"f4b962b9ccd9b765523f50b752b9bb85525cbf8a4e6cdc15048f9363579e6719","static/cow_arc_5.png":"d6b122ec844d0d19312cc57667769f2955bc7b8667449b1c13a7359a4debc8a2","static/cow_arc_6.png":"847018f7f5e0813b26c2b636a2ca8549f475339de24a21dd2e0e21d90dbd77f1","static/cow_arc_7.png":"3df9b3d1153c7b1de52a30a46e9bdba75e2412ad51ef158437a356f16b3bd1be","static/cow_arc_8.png":"68f405191ef400b8f854102e98fac92ddd31c274bcff7739e47483a39dba9612","static/cow_arc_9.png":"eb60637be4fb951ac54a1e3de0fd33e0bb2f5a4d19c3519bd8f23c02b8fc240d"},"package":"dcc9816f5ac93ebd51c37f7f9a6bf2b40dfcd42978ad2aea5d542016e9244cf6"} +diff '--color=auto' -Nur 389-ds-base-2.0.13.orig/vendor/concread/Cargo.toml 389-ds-base-2.0.13/vendor/concread/Cargo.toml +--- 389-ds-base-2.0.13.orig/vendor/concread/Cargo.toml 2022-01-25 14:30:32.883759169 +0100 ++++ 389-ds-base-2.0.13/vendor/concread/Cargo.toml 2022-01-25 14:30:44.786439411 +0100 +@@ -10,7 +10,7 @@ + # See Cargo.toml.orig for the original contents. + + [package] +-edition = "2021" ++edition = "2018" + name = "concread" + version = "0.2.21" + authors = ["William Brown "] From c4c22eb1f9ed2fa717b3c9269fb3a2239c4c59d4 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 27 Jan 2022 11:21:43 -0800 Subject: [PATCH 07/14] Backport #5141, fix startup when directory doesn't exist (#2047323) --- 389-ds-base.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 760dcbe..dfc6f6c 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -54,7 +54,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 2.0.13 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 @@ -276,6 +276,11 @@ Source3: https://github.com/jemalloc/%{jemalloc_name}/releases/download Patch0: concread-use-2018-edition.patch %endif +# https://bugzilla.redhat.com/show_bug.cgi?id=2047323 +# https://github.com/389ds/389-ds-base/pull/5141 +# Don't fail on startup if a directory we try to restorecon doesn't exist +Patch1: 0001-ds_selinux_restorecon.sh-always-exit-0.patch + %description 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration. @@ -719,6 +724,9 @@ exit 0 %endif %changelog +* Thu Jan 27 2022 Adam Williamson - 2.0.13-2 +- Backport PR#5141 to fix startup when a directory doesn't exist (#2047323) + * Mon Jan 24 2022 Mark Reynolds - 2.0.13-1 - Bump version to 2.0.13 - Issue 5132 - Update Rust crate lru to fix CVE From d199facc72a3ef7905604ce58360acbc6bfc6fae Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 27 Jan 2022 12:31:35 -0800 Subject: [PATCH 08/14] Add patch file missing from last commit --- ..._selinux_restorecon.sh-always-exit-0.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 0001-ds_selinux_restorecon.sh-always-exit-0.patch diff --git a/0001-ds_selinux_restorecon.sh-always-exit-0.patch b/0001-ds_selinux_restorecon.sh-always-exit-0.patch new file mode 100644 index 0000000..fd13034 --- /dev/null +++ b/0001-ds_selinux_restorecon.sh-always-exit-0.patch @@ -0,0 +1,33 @@ +From d858b6950e4e0946f8d18d1855923c8d0f89c858 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 27 Jan 2022 11:07:26 -0800 +Subject: [PATCH] ds_selinux_restorecon.sh: always exit 0 + +We don't want to error out and give up on starting the service +if the restorecon fails - it might just be that the directory +doesn't exist and doesn't need restoring. Issue identified and +fix suggested by Simon Farnsworth. + +https://bugzilla.redhat.com/show_bug.cgi?id=2047323 + +Signed-off-by: Adam Williamson +--- + wrappers/ds_selinux_restorecon.sh.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/wrappers/ds_selinux_restorecon.sh.in b/wrappers/ds_selinux_restorecon.sh.in +index 063347de3..2d7386233 100644 +--- a/wrappers/ds_selinux_restorecon.sh.in ++++ b/wrappers/ds_selinux_restorecon.sh.in +@@ -29,5 +29,6 @@ then + exit 0 + fi + +-# Now run restorecon +-restorecon ${DS_HOME_DIR} ++# Now run restorecon, but don't die if it fails (could be that the ++# directory doesn't exist) ++restorecon ${DS_HOME_DIR} || : +-- +2.35.0.rc1 + From 1805ece200863150015bfb4b353e282807be7c8f Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Thu, 27 Jan 2022 16:23:20 -0500 Subject: [PATCH 09/14] Bump version to 2.0.14-1 Issue 5127 - ds_selinux_restorecon.sh: always exit 0 Issue 5037 - in OpenQA changelog trimming can crashes (#5070) Issue 4992 - BUG - slapd.socket container fix (#4993) Issue 5079 - BUG - multiple ways to specific primary (#5087) Issue 5080 - BUG - multiple index types not handled in openldap migration (#5094) Issue 5135 - UI - Disk monitoring threshold does update properly Issue 5129 - BUG - Incorrect fn signature in add_index (#5130) --- .gitignore | 1 + ...-Issue-4765-database-suffix-on-2-0-4.patch | 182 ------------------ 0001-dna_enable_interval.patch | 20 -- ..._selinux_restorecon.sh-always-exit-0.patch | 33 ---- 389-ds-base.spec | 29 +-- sources | 2 +- 6 files changed, 19 insertions(+), 248 deletions(-) delete mode 100644 0000-Issue-4765-database-suffix-on-2-0-4.patch delete mode 100644 0001-dna_enable_interval.patch delete mode 100644 0001-ds_selinux_restorecon.sh-always-exit-0.patch diff --git a/.gitignore b/.gitignore index 03ac955..a6c6c96 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,4 @@ /389-ds-base-2.0.11.tar.bz2 /389-ds-base-2.0.12.tar.bz2 /389-ds-base-2.0.13.tar.bz2 +/389-ds-base-2.0.14.tar.bz2 diff --git a/0000-Issue-4765-database-suffix-on-2-0-4.patch b/0000-Issue-4765-database-suffix-on-2-0-4.patch deleted file mode 100644 index 19f3c10..0000000 --- a/0000-Issue-4765-database-suffix-on-2-0-4.patch +++ /dev/null @@ -1,182 +0,0 @@ -From bbdf47a9252040a5e42e015cb636380b88e9caa8 Mon Sep 17 00:00:00 2001 -From: Thierry Bordaz -Date: Tue, 18 May 2021 19:16:30 +0200 -Subject: [PATCH] Issue 4765 - database suffix unexpectdly changed from .db to - .db4 (#4766) - -* Issue 4765 - database suffix unexpectdly changed from .db to .db4 - -* Issue 4765 - database suffix unexpectdly changed from .db to .db4 - fix some compilation warnings ---- - ldap/servers/slapd/back-ldbm/back-ldbm.h | 9 --------- - ldap/servers/slapd/back-ldbm/db-bdb/bdb_config.c | 1 + - ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c | 5 +++++ - ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.h | 11 +++++++++++ - ldap/servers/slapd/back-ldbm/dblayer.c | 9 +++++++++ - ldap/servers/slapd/back-ldbm/dblayer.h | 3 +++ - ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 2 ++ - ldap/servers/slapd/back-ldbm/vlv_srch.c | 2 +- - 8 files changed, 32 insertions(+), 10 deletions(-) - -diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h -index ddac99541..50b0996cb 100644 ---- a/ldap/servers/slapd/back-ldbm/back-ldbm.h -+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h -@@ -66,14 +66,6 @@ typedef unsigned short u_int16_t; - - #define ID2ENTRY "id2entry" /* main db file name: ID2ENTRY+LDBM_SUFFIX */ - --#if 1000 * DB_VERSION_MAJOR + 100 * DB_VERSION_MINOR >= 5000 --#define LDBM_SUFFIX_OLD ".db4" --#define LDBM_SUFFIX ".db" --#else --#define LDBM_SUFFIX_OLD ".db3" --#define LDBM_SUFFIX ".db4" --#endif -- - #define MEGABYTE (1024 * 1024) - #define GIGABYTE (1024 * MEGABYTE) - -@@ -143,7 +135,6 @@ typedef unsigned short u_int16_t; - #define LDBM_VERSION_40 "Netscape-ldbm/4.0" - #define LDBM_VERSION_30 "Netscape-ldbm/3.0" - #define LDBM_VERSION_31 "Netscape-ldbm/3.1" --#define LDBM_FILENAME_SUFFIX LDBM_SUFFIX - #define DBVERSION_FILENAME "DBVERSION" - /* 0 here means to let the autotuning reset the value on first run */ - /* cache can't get any smaller than this (in bytes) */ -diff --git a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_config.c b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_config.c -index 65a2405d8..11a65e806 100644 ---- a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_config.c -+++ b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_config.c -@@ -125,6 +125,7 @@ int bdb_init(struct ldbminfo *li, config_info *config_array) - priv->dblayer_dbi_txn_abort_fn = &bdb_dbi_txn_abort; - priv->dblayer_get_entries_count_fn = &bdb_get_entries_count; - priv->dblayer_cursor_get_count_fn = &bdb_public_cursor_get_count; -+ priv->dblayer_get_db_suffix_fn = &bdb_public_get_db_suffix; - - bdb_fake_priv = *priv; /* Copy the callbaks for bdb_be() */ - return 0; -diff --git a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c -index 186c11cc3..455596a92 100644 ---- a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c -+++ b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c -@@ -6713,3 +6713,8 @@ bdb_public_cursor_get_count(dbi_cursor_t *cursor, dbi_recno_t *count) - int rc = cur->c_count(cur, count, 0); - return bdb_map_error(__FUNCTION__, rc); - } -+ -+const char *bdb_public_get_db_suffix(void) -+{ -+ return LDBM_FILENAME_SUFFIX; -+} -diff --git a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.h b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.h -index 32430e2af..924656998 100644 ---- a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.h -+++ b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.h -@@ -13,6 +13,16 @@ - - #define BDB_CONFIG(li) ((bdb_config *)(li)->li_dblayer_config) - -+#if 1000 * DB_VERSION_MAJOR + 100 * DB_VERSION_MINOR >= 5000 -+#define LDBM_SUFFIX_OLD ".db4" -+#define LDBM_SUFFIX ".db" -+#else -+#define LDBM_SUFFIX_OLD ".db3" -+#define LDBM_SUFFIX ".db4" -+#endif -+ -+#define LDBM_FILENAME_SUFFIX LDBM_SUFFIX -+ - typedef struct bdb_db_env - { - DB_ENV *bdb_DB_ENV; -@@ -133,6 +143,7 @@ dblayer_dbi_txn_commit_fn_t bdb_dbi_txn_commit; - dblayer_dbi_txn_abort_fn_t bdb_dbi_txn_abort; - dblayer_get_entries_count_fn_t bdb_get_entries_count; - dblayer_cursor_get_count_fn_t bdb_public_cursor_get_count; -+dblayer_get_db_suffix_fn_t bdb_public_get_db_suffix; - - /* instance functions */ - int bdb_instance_cleanup(struct ldbm_instance *inst); -diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c -index c5ff6cba9..bf56df42a 100644 ---- a/ldap/servers/slapd/back-ldbm/dblayer.c -+++ b/ldap/servers/slapd/back-ldbm/dblayer.c -@@ -1370,3 +1370,12 @@ dblayer_pop_pvt_txn(void) - } - return; - } -+ -+const char * -+dblayer_get_db_suffix(Slapi_Backend *be) -+{ -+ struct ldbminfo *li = be ? (struct ldbminfo *)be->be_database->plg_private : NULL; -+ dblayer_private *prv = li ? (dblayer_private *)li->li_dblayer_private : NULL; -+ -+ return prv ? prv->dblayer_get_db_suffix_fn() : NULL; -+} -diff --git a/ldap/servers/slapd/back-ldbm/dblayer.h b/ldap/servers/slapd/back-ldbm/dblayer.h -index 99acfd1ab..051035f3f 100644 ---- a/ldap/servers/slapd/back-ldbm/dblayer.h -+++ b/ldap/servers/slapd/back-ldbm/dblayer.h -@@ -109,6 +109,7 @@ typedef int dblayer_dbi_txn_commit_fn_t(dbi_txn_t *txn); - typedef int dblayer_dbi_txn_abort_fn_t(dbi_txn_t *txn); - typedef int dblayer_get_entries_count_fn_t(dbi_db_t *db, int *count); - typedef int dblayer_cursor_get_count_fn_t(dbi_cursor_t *cursor, dbi_recno_t *count); -+typedef const char *dblayer_get_db_suffix_fn_t(void); - - struct dblayer_private - { -@@ -178,6 +179,7 @@ struct dblayer_private - dblayer_dbi_txn_abort_fn_t *dblayer_dbi_txn_abort_fn; - dblayer_get_entries_count_fn_t *dblayer_get_entries_count_fn; - dblayer_cursor_get_count_fn_t *dblayer_cursor_get_count_fn; -+ dblayer_get_db_suffix_fn_t *dblayer_get_db_suffix_fn; - }; - - #define DBLAYER_PRIV_SET_DATA_DIR 0x1 -@@ -188,6 +190,7 @@ back_txn *dblayer_get_pvt_txn(void); - void dblayer_pop_pvt_txn(void); - - int dblayer_delete_indices(ldbm_instance *inst); -+const char *dblayer_get_db_suffix(Slapi_Backend *be); - - - /* Return the last four characters of a string; used for comparing extensions. */ -diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h -index 22f2d1103..dbe5dca73 100644 ---- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h -+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h -@@ -142,6 +142,8 @@ void dblayer_restore_file_update(struct ldbminfo *li, char *directory); - int dblayer_import_file_init(ldbm_instance *inst); - void dblayer_import_file_update(ldbm_instance *inst); - int dblayer_import_file_check(ldbm_instance *inst); -+const char *dblayer_get_db_suffix(Slapi_Backend *be); -+ - - /* - * dn2entry.c -diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.c b/ldap/servers/slapd/back-ldbm/vlv_srch.c -index 4dd3804c9..6fd1b3880 100644 ---- a/ldap/servers/slapd/back-ldbm/vlv_srch.c -+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.c -@@ -30,7 +30,6 @@ char *const type_vlvEnabled = "vlvEnabled"; - char *const type_vlvUses = "vlvUses"; - - static const char *file_prefix = "vlv#"; /* '#' used to avoid collision with real attributes */ --static const char *file_suffix = LDBM_FILENAME_SUFFIX; - - static int vlvIndex_createfilename(struct vlvIndex *pIndex, char **ppc); - -@@ -514,6 +513,7 @@ void - vlvIndex_init(struct vlvIndex *p, backend *be, struct vlvSearch *pSearch, const Slapi_Entry *e) - { - struct ldbminfo *li = (struct ldbminfo *)be->be_database->plg_private; -+ const char *file_suffix = dblayer_get_db_suffix(be); - char *filename = NULL; - - if (NULL == p) --- -2.30.2 - diff --git a/0001-dna_enable_interval.patch b/0001-dna_enable_interval.patch deleted file mode 100644 index 5bef2ee..0000000 --- a/0001-dna_enable_interval.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c -index bf6b74a99..928a3f54a 100644 ---- a/ldap/servers/plugins/dna/dna.c -+++ b/ldap/servers/plugins/dna/dna.c -@@ -1023,7 +1023,6 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry *e, int apply) - /* Set the default interval to 1 */ - entry->interval = 1; - --#ifdef DNA_ENABLE_INTERVAL - value = slapi_entry_attr_get_charptr(e, DNA_INTERVAL); - if (value) { - entry->interval = strtoull(value, 0, 0); -@@ -1032,7 +1031,6 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry *e, int apply) - - slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, - "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_INTERVAL, entry->interval); --#endif - - value = slapi_entry_attr_get_charptr(e, DNA_GENERATE); - if (value) { diff --git a/0001-ds_selinux_restorecon.sh-always-exit-0.patch b/0001-ds_selinux_restorecon.sh-always-exit-0.patch deleted file mode 100644 index fd13034..0000000 --- a/0001-ds_selinux_restorecon.sh-always-exit-0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d858b6950e4e0946f8d18d1855923c8d0f89c858 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 27 Jan 2022 11:07:26 -0800 -Subject: [PATCH] ds_selinux_restorecon.sh: always exit 0 - -We don't want to error out and give up on starting the service -if the restorecon fails - it might just be that the directory -doesn't exist and doesn't need restoring. Issue identified and -fix suggested by Simon Farnsworth. - -https://bugzilla.redhat.com/show_bug.cgi?id=2047323 - -Signed-off-by: Adam Williamson ---- - wrappers/ds_selinux_restorecon.sh.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/wrappers/ds_selinux_restorecon.sh.in b/wrappers/ds_selinux_restorecon.sh.in -index 063347de3..2d7386233 100644 ---- a/wrappers/ds_selinux_restorecon.sh.in -+++ b/wrappers/ds_selinux_restorecon.sh.in -@@ -29,5 +29,6 @@ then - exit 0 - fi - --# Now run restorecon --restorecon ${DS_HOME_DIR} -+# Now run restorecon, but don't die if it fails (could be that the -+# directory doesn't exist) -+restorecon ${DS_HOME_DIR} || : --- -2.35.0.rc1 - diff --git a/389-ds-base.spec b/389-ds-base.spec index dfc6f6c..99ee148 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -53,9 +53,9 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.13 -Release: %{?relprefix}2%{?prerel}%{?dist} -License: GPLv3+ +Version: 2.0.14 +Release: %{?relprefix}1%{?prerel}%{?dist} +License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 Conflicts: freeipa-server < 4.0.3 @@ -96,7 +96,7 @@ Provides: bundled(crate(instant)) = 0.1.12 Provides: bundled(crate(itoa)) = 1.0.1 Provides: bundled(crate(jobserver)) = 0.1.24 Provides: bundled(crate(lazy_static)) = 1.4.0 -Provides: bundled(crate(libc)) = 0.2.113 +Provides: bundled(crate(libc)) = 0.2.115 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 Provides: bundled(crate(lock_api)) = 0.4.5 @@ -125,8 +125,8 @@ Provides: bundled(crate(redox_syscall)) = 0.2.10 Provides: bundled(crate(remove_dir_all)) = 0.5.3 Provides: bundled(crate(ryu)) = 1.0.9 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(serde)) = 1.0.135 -Provides: bundled(crate(serde_derive)) = 1.0.135 +Provides: bundled(crate(serde)) = 1.0.136 +Provides: bundled(crate(serde_derive)) = 1.0.136 Provides: bundled(crate(serde_json)) = 1.0.78 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 @@ -149,7 +149,7 @@ Provides: bundled(crate(wasi)) = 0.10.2+wasi_snapshot_preview1 Provides: bundled(crate(winapi)) = 0.3.9 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0 -Provides: bundled(crate(zeroize)) = 1.5.0 +Provides: bundled(crate(zeroize)) = 1.5.1 Provides: bundled(crate(zeroize_derive)) = 1.3.1 ##### Bundled cargo crates list - END ##### @@ -276,11 +276,6 @@ Source3: https://github.com/jemalloc/%{jemalloc_name}/releases/download Patch0: concread-use-2018-edition.patch %endif -# https://bugzilla.redhat.com/show_bug.cgi?id=2047323 -# https://github.com/389ds/389-ds-base/pull/5141 -# Don't fail on startup if a directory we try to restorecon doesn't exist -Patch1: 0001-ds_selinux_restorecon.sh-always-exit-0.patch - %description 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration. @@ -724,6 +719,16 @@ exit 0 %endif %changelog +* Thu Jan 27 2022 Mark Reynolds - 2.0.14-1 +- Bump version to 2.0.14-1 +- Issue 5127 - ds_selinux_restorecon.sh: always exit 0 +- Issue 5037 - in OpenQA changelog trimming can crashes (#5070) +- Issue 4992 - BUG - slapd.socket container fix (#4993) +- Issue 5079 - BUG - multiple ways to specific primary (#5087) +- Issue 5080 - BUG - multiple index types not handled in openldap migration (#5094) +- Issue 5135 - UI - Disk monitoring threshold does update properly +- Issue 5129 - BUG - Incorrect fn signature in add_index (#5130) + * Thu Jan 27 2022 Adam Williamson - 2.0.13-2 - Backport PR#5141 to fix startup when a directory doesn't exist (#2047323) diff --git a/sources b/sources index 7786e23..343f06a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (389-ds-base-2.0.13.tar.bz2) = ab9429b391b32d4a09ea5fb0ce15fcf31f7c13e781588ce5587a0ed169959938ce59bff857dbf58bb9413208f6c35792c127cad27c7aca6aa53ef66ef4c36196 +SHA512 (389-ds-base-2.0.14.tar.bz2) = 803520ea4901d71021ff2771ea175fb5c30d02705eff51d24d68f1a537194c4766e0618d6a89590b46bbcce03d7b17245260e9930351f41e78a61d29de1363d4 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 From 525cd4bba54b3d12e0feb205a20b5b2ef6fc7b29 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Wed, 23 Mar 2022 15:27:44 -0400 Subject: [PATCH 10/14] Bump version to 2.0.15 Issue 5230 - Race condition in RHDS disk monitoring functions Issue 4299 - UI - Add CoS funtionality (#5196) Issue 5225 - UI - impossible to manually set entry cache Issue 5186 - UI - Fix SASL Mapping regex test feature Issue 5221 - User with expired password can still login with full privledges Issue 5218 - double-free of the virtual attribute context in persistent search (#5219) Issue 5200 - dscontainer should use environment variables with DS_ prefix Issue 5193 - Incomplete ruv occasionally returned from ruv search (#5194) Issue 5189 - memberOf plugin exclude subtree not cleaning up groups on modrdn Issue 5188 - UI - LDAP editor - add entry and group types Issue 5184 - memberOf does not work correctly with multiple include scopes Issue 5162 - BUG - error on importing chain files (#5164) Issue 5186 - UI - Fix SASL Mapping regex validation and other minor improvements Issue 5048 - Support for nsslapd-tcp-fin-timeout and nsslapd-tcp-keepalive-time (#5179) Issue 5122 - dsconf instance backend suffix set doesn't accept backend name (#5178) Issue 5160 - BUG - x- prefix in descr-oid can confuse oid parser (#5161) Issue 5098 - Multiple issues around replication and CI test test_online_reinit_may_hang (#5109) Issue 5102 - BUG - container may fail with bare uid/gid (#5140) Issue 5137 - RFE - improve sssd conf output (#5138) Issue 5145 - Fix covscan errors Issue 4721 - UI - attribute uniqueness crashes UI when there are no configs Issue 5155 - RFE - Provide an option to abort an Auto Member rebuild task Issue 4299 - UI - Add Role funtionality (#5163) Issue 5050 - bdb bulk op fails if fs page size > 8K (#5150) Issue 4775 - Add entryuuid CLI and Fixup (#4776) Issue 5142 - CLI - dsctl dbgen is broken Issue 4299 - UI - fix minor issues with ldap editor (table view) Issue 4299 - UI - fix minor issues with ldap editor Issue 5103 - UI - Add support for TPR to web console (#5111) --- .gitignore | 1 + 389-ds-base.spec | 35 ++++++++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a6c6c96..02f28fc 100644 --- a/.gitignore +++ b/.gitignore @@ -211,3 +211,4 @@ /389-ds-base-2.0.12.tar.bz2 /389-ds-base-2.0.13.tar.bz2 /389-ds-base-2.0.14.tar.bz2 +/389-ds-base-2.0.15.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index 99ee148..4c18573 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -53,7 +53,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.14 +Version: 2.0.15 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org @@ -232,6 +232,7 @@ Requires: selinux-policy >= 3.14.1-29 Requires: openldap-clients Requires: /usr/bin/c_rehash Requires: python%{python3_pkgversion}-ldap +Requires: acl # this is needed to setup SSL if you are not using the # administration server package @@ -719,6 +720,38 @@ exit 0 %endif %changelog +* Wed Mar 23 2022 Mark Reynolds - 2.0.15-1 +- Bump version to 2.0.15 +- Issue 5230 - Race condition in RHDS disk monitoring functions +- Issue 4299 - UI - Add CoS funtionality (#5196) +- Issue 5225 - UI - impossible to manually set entry cache +- Issue 5186 - UI - Fix SASL Mapping regex test feature +- Issue 5221 - User with expired password can still login with full privledges +- Issue 5218 - double-free of the virtual attribute context in persistent search (#5219) +- Issue 5200 - dscontainer should use environment variables with DS_ prefix +- Issue 5193 - Incomplete ruv occasionally returned from ruv search (#5194) +- Issue 5189 - memberOf plugin exclude subtree not cleaning up groups on modrdn +- Issue 5188 - UI - LDAP editor - add entry and group types +- Issue 5184 - memberOf does not work correctly with multiple include scopes +- Issue 5162 - BUG - error on importing chain files (#5164) +- Issue 5186 - UI - Fix SASL Mapping regex validation and other minor improvements +- Issue 5048 - Support for nsslapd-tcp-fin-timeout and nsslapd-tcp-keepalive-time (#5179) +- Issue 5122 - dsconf instance backend suffix set doesn't accept backend name (#5178) +- Issue 5160 - BUG - x- prefix in descr-oid can confuse oid parser (#5161) +- Issue 5098 - Multiple issues around replication and CI test test_online_reinit_may_hang (#5109) +- Issue 5102 - BUG - container may fail with bare uid/gid (#5140) +- Issue 5137 - RFE - improve sssd conf output (#5138) +- Issue 5145 - Fix covscan errors +- Issue 4721 - UI - attribute uniqueness crashes UI when there are no configs +- Issue 5155 - RFE - Provide an option to abort an Auto Member rebuild task +- Issue 4299 - UI - Add Role funtionality (#5163) +- Issue 5050 - bdb bulk op fails if fs page size > 8K (#5150) +- Issue 4775 - Add entryuuid CLI and Fixup (#4776) +- Issue 5142 - CLI - dsctl dbgen is broken +- Issue 4299 - UI - fix minor issues with ldap editor (table view) +- Issue 4299 - UI - fix minor issues with ldap editor +- Issue 5103 - UI - Add support for TPR to web console (#5111) + * Thu Jan 27 2022 Mark Reynolds - 2.0.14-1 - Bump version to 2.0.14-1 - Issue 5127 - ds_selinux_restorecon.sh: always exit 0 diff --git a/sources b/sources index 343f06a..53f8b78 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (389-ds-base-2.0.14.tar.bz2) = 803520ea4901d71021ff2771ea175fb5c30d02705eff51d24d68f1a537194c4766e0618d6a89590b46bbcce03d7b17245260e9930351f41e78a61d29de1363d4 +SHA512 (389-ds-base-2.0.15.tar.bz2) = 5eaa2c7720ac0aa595f03226267af51923bc05638afc8c525007341a598a843d0db34af606c8d3b161edfd4c3656d5ad448cd426fa1ccacd54ba64fba43010ef SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 From 1a1a14d9dfcfd82426909f1e3a24d3b91acfad37 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Thu, 2 Jun 2022 10:03:30 +0200 Subject: [PATCH 11/14] Update tests.yml Change upstream repo URL and remove 389-ds-base-legacy-tools package that is no longer present. --- tests/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 4643f2f..1878c82 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -2,7 +2,7 @@ - hosts: localhost remote_user: root vars: - ds_repo_url: https://pagure.io/389-ds-base.git + ds_repo_url: https://github.com/389ds/389-ds-base.git ds_repo_dir: ds ds_tests: "{{ ds_repo_dir }}/dirsrvtests/tests" pytest: py.test-3 @@ -24,4 +24,3 @@ - python3-pytest - 389-ds-base - 389-ds-base-snmp - - 389-ds-base-legacy-tools From 46c1f7e12dcb5836084c89fc15537aae04cc5a06 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Thu, 2 Jun 2022 10:34:20 +0200 Subject: [PATCH 12/14] Remove unused relprefix and prerel macros that break rpmdev-bumpspec logic During mass rebuilds NVR is bumped by rpmdev-bumpspec. But it can't handle complex Release: fields such as ours, that has %{prerel} and %{relprefix} macros. It adds .1 after the %{dist} macro instead of increasing the release number. The issue for rpmdev-bumpspec is unsolved since 2012: https://pagure.io/rpmdevtools/issue/18 These macros are unused by us and only cause issues when NVR is bumped. So let's remove them. --- 389-ds-base.spec | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 4c18573..c05a3a8 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -5,13 +5,6 @@ # Exclude i686 bit arches ExcludeArch: i686 -# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -# also remove the space between % and global - this space is needed because -# fedpkg verrel stupidly ignores comment lines -#% global prerel .rc3 -# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release -#% global relprefix 0. - # If perl-Socket-2.000 or newer is available, set 0 to use_Socket6. %global use_Socket6 0 @@ -54,7 +47,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 2.0.15 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: 1%{?dist} License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 @@ -264,7 +257,7 @@ Requires: perl-sigtrap Obsoletes: %{name} <= 1.3.5.4 -Source0: https://releases.pagure.org/389-ds-base/%{name}-%{version}%{?prerel}.tar.bz2 +Source0: https://releases.pagure.org/389-ds-base/%{name}-%{version}.tar.bz2 # 389-ds-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh Source2: %{name}-devel.README @@ -374,10 +367,10 @@ A cockpit UI Plugin for configuring and administering the 389 Directory Server %endif %prep -%autosetup -p1 -v -n %{name}-%{version}%{?prerel} +%autosetup -p1 -v -n %{name}-%{version} %if %{bundle_jemalloc} -%setup -q -n %{name}-%{version}%{?prerel} -T -D -b 3 +%setup -q -n %{name}-%{version} -T -D -b 3 %endif cp %{SOURCE2} README.devel @@ -458,10 +451,10 @@ pushd ./src/lib389 popd # argparse-manpage dynamic man pages have hardcoded man v1 in header, # need to change it to v8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsconf.8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsctl.8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsidm.8 -sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dscreate.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dsconf.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dsctl.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dsidm.8 +sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dscreate.8 # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -483,7 +476,7 @@ find %{buildroot}%{_datadir}/cockpit/389-console -type f | sed -e "s@%{buildroot %endif # Copy in our docs from doxygen. -cp -r %{_builddir}/%{name}-%{version}%{?prerel}/man/man3 $RPM_BUILD_ROOT/%{_mandir}/man3 +cp -r %{_builddir}/%{name}-%{version}/man/man3 $RPM_BUILD_ROOT/%{_mandir}/man3 # lib389 pushd src/lib389 @@ -508,8 +501,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libsvrcore.la %if %{bundle_jemalloc} pushd ../%{jemalloc_name}-%{jemalloc_ver} make DESTDIR="$RPM_BUILD_ROOT" install_lib install_bin -cp -pa COPYING ../%{name}-%{version}%{?prerel}/COPYING.jemalloc -cp -pa README ../%{name}-%{version}%{?prerel}/README.jemalloc +cp -pa COPYING ../%{name}-%{version}/COPYING.jemalloc +cp -pa README ../%{name}-%{version}/README.jemalloc popd %endif From 8d66a29c9ae9c43aab72757f2f77db5e826c5558 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Tue, 5 Jul 2022 16:59:54 -0400 Subject: [PATCH 13/14] Bump version to 2.0.16 Issue 5221 - fix covscan (#5359) Issue 4984 - BUG - pid file handling (#4986) Issue 5353 - CLI - dsconf backend export breaks with multiple backends Issue 5345 - BUG - openldap migration fails when ppolicy is active (#5347) Issue 5323 - BUG - improve skipping of monitor db (#5340) Issue 5323 - BUG - Fix issue in mdb tests with monitor (#5326) Issue 5329 - Improve replication extended op logging Issue 5343 - Various improvements to winsync Issue 4932 - CLI - add parser aliases to long arg names Issue 5332 - BUG - normalise filter as intended Issue 5126 - Memory leak in slapi_ldap_get_lderrno (#5153) Issue 5311 - Missing Requires for acl in the spec file Issue 5333 - 389-ds-base fails to build with Python 3.11 Issue 5170 - BUG - incorrect behaviour of filter test (#5315) Issue 5324 - plugin acceptance test needs hardening Issue 5323 - BUG - migrating database for monitoring interface lead to crash (#5321) Issue 5304 - Need a compatibility option about sub suffix handling (#5310) Issue 5302 - Release tarballs don't contain cockpit webapp Issue 5237 - audit-ci: Cannot convert undefined or null to object Issue 5170 - BUG - ldapsubentries were incorrectly returned (#5285) Issue 4970 - Add support for recursively deleting subentries Issue 5284 - Replication broken after password change (#5286) Issue 5291 - Harden ReplicationManager.wait_for_replication (#5292) Issue 5279 - dscontainer: TypeError: unsupported operand type(s) for /: 'str' and 'int' Issue 5170 - RFE - Filter optimiser (#5171) Issue 5276 - CLI - improve task handling Issue 5273 - CLI - add arg completer for instance name Issue 2893 - CLI - dscreate - add options for setting up replication Issue 4866 - CLI - when enabling replication set changelog trimming by default Issue 5241 - UI - Add account locking missing functionality (#5251) Issue 5180 - snmp_collator tries to unlock NULL mutex (#5266) Issue 5098 - Fix cherry-pick error Issue 4904 - Fix various small issues Issue 5260 - BUG - OpenLDAP allows multiple names of memberof overlay (#5261) Issue 5252 - During DEL, vlv search can erroneously return NULL candidate (#5256) Issue 5210 - Python undefined names in lib389 Issue 4959 - BUG - Invalid /etc/hosts setup can cause isLocalHost (#4960) Issue 5249 - dscontainer: ImportError: cannot import name 'get_default_db_lib' from 'lib389.utils' Issue 5242 - SECURITY_FIX - Craft message may crash the server (#5243) Issue 5234 - UI - rename Users and Groups tab Issue 5217 - Simplify instance creation and administration by non root user (#5224) Issue 5227 - UI - No way to move back to Get Started step (#5233) --- .gitignore | 2 + 389-ds-base.spec | 135 ++++++++++++++++++++++++++++++++--------------- sources | 4 +- 3 files changed, 95 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 02f28fc..0cd1236 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,5 @@ /389-ds-base-2.0.13.tar.bz2 /389-ds-base-2.0.14.tar.bz2 /389-ds-base-2.0.15.tar.bz2 +/jemalloc-5.3.0.tar.bz2 +/389-ds-base-2.0.16.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index c05a3a8..556ed20 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -17,7 +17,7 @@ ExcludeArch: i686 %if %{bundle_jemalloc} %global jemalloc_name jemalloc -%global jemalloc_ver 5.2.1 +%global jemalloc_ver 5.3.0 %global __provides_exclude ^libjemalloc\\.so.*$ %endif @@ -46,9 +46,9 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.15 +Version: 2.0.16 Release: 1%{?dist} -License: GPLv3+ and (ASL 2.0 or MIT) +License: GPLv3+ and (ASL 2.0 or MIT) and MIT and (Unlicense or MIT) and MPLv2.0 and BSD and ASL 2.0 and (ASL 2.0 or Boost) and (ASL 2.0 with exceptions or ASL 2.0 or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 Conflicts: freeipa-server < 4.0.3 @@ -61,93 +61,93 @@ Provides: ldif2ldbm >= 0 Provides: bundled(crate(ahash)) = 0.7.6 Provides: bundled(crate(ansi_term)) = 0.12.1 Provides: bundled(crate(atty)) = 0.2.14 -Provides: bundled(crate(autocfg)) = 1.0.1 +Provides: bundled(crate(autocfg)) = 1.1.0 Provides: bundled(crate(base64)) = 0.13.0 Provides: bundled(crate(bitflags)) = 1.3.2 Provides: bundled(crate(byteorder)) = 1.4.3 Provides: bundled(crate(cbindgen)) = 0.9.1 -Provides: bundled(crate(cc)) = 1.0.72 +Provides: bundled(crate(cc)) = 1.0.73 Provides: bundled(crate(cfg-if)) = 1.0.0 Provides: bundled(crate(clap)) = 2.34.0 Provides: bundled(crate(concread)) = 0.2.21 Provides: bundled(crate(crossbeam)) = 0.8.1 -Provides: bundled(crate(crossbeam-channel)) = 0.5.2 +Provides: bundled(crate(crossbeam-channel)) = 0.5.5 Provides: bundled(crate(crossbeam-deque)) = 0.8.1 -Provides: bundled(crate(crossbeam-epoch)) = 0.9.6 -Provides: bundled(crate(crossbeam-queue)) = 0.3.3 -Provides: bundled(crate(crossbeam-utils)) = 0.8.6 +Provides: bundled(crate(crossbeam-epoch)) = 0.9.9 +Provides: bundled(crate(crossbeam-queue)) = 0.3.5 +Provides: bundled(crate(crossbeam-utils)) = 0.8.10 Provides: bundled(crate(entryuuid)) = 0.1.0 Provides: bundled(crate(entryuuid_syntax)) = 0.1.0 Provides: bundled(crate(fastrand)) = 1.7.0 Provides: bundled(crate(fernet)) = 0.1.4 Provides: bundled(crate(foreign-types)) = 0.3.2 Provides: bundled(crate(foreign-types-shared)) = 0.1.1 -Provides: bundled(crate(getrandom)) = 0.2.4 +Provides: bundled(crate(getrandom)) = 0.2.7 Provides: bundled(crate(hashbrown)) = 0.11.2 Provides: bundled(crate(hermit-abi)) = 0.1.19 Provides: bundled(crate(instant)) = 0.1.12 -Provides: bundled(crate(itoa)) = 1.0.1 +Provides: bundled(crate(itoa)) = 1.0.2 Provides: bundled(crate(jobserver)) = 0.1.24 -Provides: bundled(crate(lazy_static)) = 1.4.0 -Provides: bundled(crate(libc)) = 0.2.115 +Provides: bundled(crate(libc)) = 0.2.126 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 -Provides: bundled(crate(lock_api)) = 0.4.5 -Provides: bundled(crate(log)) = 0.4.14 -Provides: bundled(crate(lru)) = 0.7.2 +Provides: bundled(crate(lock_api)) = 0.4.7 +Provides: bundled(crate(log)) = 0.4.17 +Provides: bundled(crate(lru)) = 0.7.7 Provides: bundled(crate(memoffset)) = 0.6.5 -Provides: bundled(crate(once_cell)) = 1.9.0 -Provides: bundled(crate(openssl)) = 0.10.38 -Provides: bundled(crate(openssl-sys)) = 0.9.72 +Provides: bundled(crate(once_cell)) = 1.13.0 +Provides: bundled(crate(openssl)) = 0.10.40 +Provides: bundled(crate(openssl-macros)) = 0.1.0 +Provides: bundled(crate(openssl-sys)) = 0.9.74 Provides: bundled(crate(parking_lot)) = 0.11.2 Provides: bundled(crate(parking_lot_core)) = 0.8.5 Provides: bundled(crate(paste)) = 0.1.18 Provides: bundled(crate(paste-impl)) = 0.1.18 -Provides: bundled(crate(pin-project-lite)) = 0.2.8 -Provides: bundled(crate(pkg-config)) = 0.3.24 +Provides: bundled(crate(pin-project-lite)) = 0.2.9 +Provides: bundled(crate(pkg-config)) = 0.3.25 Provides: bundled(crate(ppv-lite86)) = 0.2.16 Provides: bundled(crate(proc-macro-hack)) = 0.5.19 -Provides: bundled(crate(proc-macro2)) = 1.0.36 +Provides: bundled(crate(proc-macro2)) = 1.0.40 Provides: bundled(crate(pwdchan)) = 0.1.0 -Provides: bundled(crate(quote)) = 1.0.15 -Provides: bundled(crate(rand)) = 0.8.4 +Provides: bundled(crate(quote)) = 1.0.20 +Provides: bundled(crate(rand)) = 0.8.5 Provides: bundled(crate(rand_chacha)) = 0.3.1 Provides: bundled(crate(rand_core)) = 0.6.3 -Provides: bundled(crate(rand_hc)) = 0.3.1 -Provides: bundled(crate(redox_syscall)) = 0.2.10 +Provides: bundled(crate(redox_syscall)) = 0.2.13 Provides: bundled(crate(remove_dir_all)) = 0.5.3 -Provides: bundled(crate(ryu)) = 1.0.9 +Provides: bundled(crate(ryu)) = 1.0.10 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(serde)) = 1.0.136 -Provides: bundled(crate(serde_derive)) = 1.0.136 -Provides: bundled(crate(serde_json)) = 1.0.78 +Provides: bundled(crate(serde)) = 1.0.138 +Provides: bundled(crate(serde_derive)) = 1.0.138 +Provides: bundled(crate(serde_json)) = 1.0.82 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 -Provides: bundled(crate(smallvec)) = 1.8.0 +Provides: bundled(crate(smallvec)) = 1.9.0 Provides: bundled(crate(strsim)) = 0.8.0 -Provides: bundled(crate(syn)) = 1.0.86 +Provides: bundled(crate(syn)) = 1.0.98 Provides: bundled(crate(synstructure)) = 0.12.6 Provides: bundled(crate(tempfile)) = 3.3.0 Provides: bundled(crate(textwrap)) = 0.11.0 -Provides: bundled(crate(tokio)) = 1.15.0 -Provides: bundled(crate(tokio-macros)) = 1.7.0 -Provides: bundled(crate(toml)) = 0.5.8 +Provides: bundled(crate(tokio)) = 1.19.2 +Provides: bundled(crate(tokio-macros)) = 1.8.0 +Provides: bundled(crate(toml)) = 0.5.9 +Provides: bundled(crate(unicode-ident)) = 1.0.1 Provides: bundled(crate(unicode-width)) = 0.1.9 -Provides: bundled(crate(unicode-xid)) = 0.2.2 +Provides: bundled(crate(unicode-xid)) = 0.2.3 Provides: bundled(crate(uuid)) = 0.8.2 Provides: bundled(crate(vcpkg)) = 0.2.15 Provides: bundled(crate(vec_map)) = 0.8.2 Provides: bundled(crate(version_check)) = 0.9.4 -Provides: bundled(crate(wasi)) = 0.10.2+wasi_snapshot_preview1 +Provides: bundled(crate(wasi)) = 0.11.0+wasi_snapshot_preview1 Provides: bundled(crate(winapi)) = 0.3.9 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0 -Provides: bundled(crate(zeroize)) = 1.5.1 -Provides: bundled(crate(zeroize_derive)) = 1.3.1 +Provides: bundled(crate(zeroize)) = 1.5.6 +Provides: bundled(crate(zeroize_derive)) = 1.3.2 ##### Bundled cargo crates list - END ##### -BuildRequires: nspr-devel -BuildRequires: nss-devel >= 3.34 +BuildRequires: nspr-devel >= 4.32 +BuildRequires: nss-devel >= 3.67.0-7 BuildRequires: openldap-devel BuildRequires: libdb-devel BuildRequires: cyrus-sasl-devel @@ -230,7 +230,9 @@ Requires: acl # this is needed to setup SSL if you are not using the # administration server package Requires: nss-tools -Requires: nss >= 3.34 +Requires: nspr >= 4.32 +Requires: nss >= 3.67.0-7 + # these are not found by the auto-dependency method # they are required to support the mandatory LDAP SASL mechs @@ -281,8 +283,8 @@ Please see http://seclists.org/oss-sec/2016/q1/363 for more information. %package libs Summary: Core libraries for 389 Directory Server -BuildRequires: nspr-devel -BuildRequires: nss-devel >= 3.34 +BuildRequires: nspr-devel >= 4.32 +BuildRequires: nss-devel >= 3.67.0-7 BuildRequires: openldap-devel BuildRequires: libdb-devel BuildRequires: cyrus-sasl-devel @@ -713,6 +715,51 @@ exit 0 %endif %changelog +* Tue Jul 5 2022 Mark Reynolds - 2.0.16-1 +- Bump version to 2.0.16 +- Issue 5221 - fix covscan (#5359) +- Issue 4984 - BUG - pid file handling (#4986) +- Issue 5353 - CLI - dsconf backend export breaks with multiple backends +- Issue 5345 - BUG - openldap migration fails when ppolicy is active (#5347) +- Issue 5323 - BUG - improve skipping of monitor db (#5340) +- Issue 5323 - BUG - Fix issue in mdb tests with monitor (#5326) +- Issue 5329 - Improve replication extended op logging +- Issue 5343 - Various improvements to winsync +- Issue 4932 - CLI - add parser aliases to long arg names +- Issue 5332 - BUG - normalise filter as intended +- Issue 5126 - Memory leak in slapi_ldap_get_lderrno (#5153) +- Issue 5311 - Missing Requires for acl in the spec file +- Issue 5333 - 389-ds-base fails to build with Python 3.11 +- Issue 5170 - BUG - incorrect behaviour of filter test (#5315) +- Issue 5324 - plugin acceptance test needs hardening +- Issue 5323 - BUG - migrating database for monitoring interface lead to crash (#5321) +- Issue 5304 - Need a compatibility option about sub suffix handling (#5310) +- Issue 5302 - Release tarballs don't contain cockpit webapp +- Issue 5237 - audit-ci: Cannot convert undefined or null to object +- Issue 5170 - BUG - ldapsubentries were incorrectly returned (#5285) +- Issue 4970 - Add support for recursively deleting subentries +- Issue 5284 - Replication broken after password change (#5286) +- Issue 5291 - Harden ReplicationManager.wait_for_replication (#5292) +- Issue 5279 - dscontainer: TypeError: unsupported operand type(s) for /: 'str' and 'int' +- Issue 5170 - RFE - Filter optimiser (#5171) +- Issue 5276 - CLI - improve task handling +- Issue 5273 - CLI - add arg completer for instance name +- Issue 2893 - CLI - dscreate - add options for setting up replication +- Issue 4866 - CLI - when enabling replication set changelog trimming by default +- Issue 5241 - UI - Add account locking missing functionality (#5251) +- Issue 5180 - snmp_collator tries to unlock NULL mutex (#5266) +- Issue 5098 - Fix cherry-pick error +- Issue 4904 - Fix various small issues +- Issue 5260 - BUG - OpenLDAP allows multiple names of memberof overlay (#5261) +- Issue 5252 - During DEL, vlv search can erroneously return NULL candidate (#5256) +- Issue 5210 - Python undefined names in lib389 +- Issue 4959 - BUG - Invalid /etc/hosts setup can cause isLocalHost (#4960) +- Issue 5249 - dscontainer: ImportError: cannot import name 'get_default_db_lib' from 'lib389.utils' +- Issue 5242 - SECURITY_FIX - Craft message may crash the server (#5243) +- Issue 5234 - UI - rename Users and Groups tab +- Issue 5217 - Simplify instance creation and administration by non root user (#5224) +- Issue 5227 - UI - No way to move back to Get Started step (#5233) + * Wed Mar 23 2022 Mark Reynolds - 2.0.15-1 - Bump version to 2.0.15 - Issue 5230 - Race condition in RHDS disk monitoring functions diff --git a/sources b/sources index 53f8b78..30eb725 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (389-ds-base-2.0.15.tar.bz2) = 5eaa2c7720ac0aa595f03226267af51923bc05638afc8c525007341a598a843d0db34af606c8d3b161edfd4c3656d5ad448cd426fa1ccacd54ba64fba43010ef -SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02 +SHA512 (jemalloc-5.3.0.tar.bz2) = 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1 +SHA512 (389-ds-base-2.0.16.tar.bz2) = a1df34954043c72810131bee14c905a571e4333c08944be7616d8de885c834a2659f4616e17a44f8ffbb6b31fbb782ba21646194fe5deb7a47a1fcdad4087ec6 From 9db88117a743dc844d36f933d04b94b5de03121e Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Fri, 18 Nov 2022 10:54:06 -0500 Subject: [PATCH 14/14] Bump version to 2.0.17 Issue 5534 - Add copyright text to the repository files Issue 5532 - Make db compaction TOD day more robust. Issue 5529 - UI - Fix npm vulnerability in loader-utils Issue 3555 - UI - fix audit issue with npm loader-utils (#5514) Issue 5162 - Fix dsctl tls ca-certfiicate add-cert arg requirement Issue 5162 - RFE - CLI allow adding CA certificate bundles Issue 5440 - memberof is slow on update/fixup if there are several 'groupattr' (#5455) Issue 5512 - BUG - skip pwdPolicyChecker OC in migration (#5513) Issue 5429 - healthcheck - add checks for MemberOf group attrs being indexed Issue 5502 - RFE - Add option to display entry attributes in audit log Issue 5495 - BUG - Minor fix to dds skip, inconsistent attrs caused errors (#5501) Issue 5495 - RFE - skip dds during migration. (#5496) Issue 5491 - UI - Add rework and finish jpegPhoto functionality (#5492) Issue 5368 - Retro Changelog trimming does not work (#5486) Issue 5487 - Fix various issues with logconv.pl Issue 5482 - lib389 - Can not enable replication with a mixed case suffix Issue 4776 - Fix entryuuid fixup task (#5483) Issue 5356 - Update Cargo.lock and bootstrap PBKDF2-SHA512 (#5480) Issue 3061 - RFE - Add password policy debug log level Issue 5462 - RFE - add missing default indexes (#5464) Issue 4324 - Revert recursive pthread mutex usage in factory.c Issue 5262 - high contention in find_entry_internal_dn on mixed load (#5264) Issue 4324 - Revert recursive pthread mutex change (#5463) Issue 5305 - OpenLDAP version autodetection doesn't work Issue 5032 - Fix OpenLDAP version check (#5091) Issue 5032 - OpenLDAP is not shipped with non-threaded version of libldap (#5033) (#5456) Issue 5254 - dscreate create-template regression due to 5a3bdc336 (#5255) Issue 5271 - Serialization of pam_passthrough causing high etimes (#5272) Issue 5453 - UI/CLI - Changing Root DN breaks UI Issue 5446 - Fix some covscan issues (#5451) Issue 5294 - Report Portal 5 is not processing an XML file with (#5358) Issue 4588 - Gost yescrypt may fail to build on some older versions of glibc Issue 4308 - checking if an entry is a referral is expensive Issue 5447 - UI - add NDN max cache size to UI Issue 5443 - UI - disable save button while saving Issue 5077 - UI - Add retrocl exclude attribute functionality (#5078) Issue 5413 - Allow only one MemberOf fixup task at a time Issue 5158 - entryuuid fixup tasks fails in replicated topology (#5439) Issue 4592 - dscreate error with custom dir_path (#5434) Issue 5397 - Fix memory leak with the intent filter Issue 5356 - For RUST build update the default password storage scheme Issue 5423 - Fix missing 'not' in description Issue 5421 - CI - makes replication/acceptance_test.py::test_modify_entry more robust (#5422) Issue 3903 - fix repl keep alive event interval Issue 5418 - Sync_repl may crash while managing invalid cookie (#5420) Issue 5415 - Hostname when set to localhost causing failures in other tests Issue 5412 - lib389 - do not set backend name to lowercase Issue 3903 - keep alive update event starts too soon Issue 5397 - Fix various memory leaks Issue 5399 - UI - LDAP Editor is not updated when we switch instances (#5400) Issue 3903 - Supplier should do periodic updates Issue 5392 - dscreate fails when using alternative ports in the SELinux hi_reserved_port_t label range Issue 5386 - BUG - Update sudoers schema to correctly support UTF-8 (#5387) Issue 5383 - UI - Various fixes and RFE's for UI Issue 4656 - Remove problematic language from source code Issue 5380 - Separate cleanAllRUV code into new file Issue 5322 - optime & wtime on rejected connections is not properly set Issue 5375 - CI - disable TLS hostname checking Issue 5373 - dsidm user get_dn fails with search_ext() argument 1 must be str, not function Issue 5371 - Update npm and cargo packages Issue 3069 - Support ECDSA private keys for TLS (#5365) --- .gitignore | 1 + 389-ds-base.spec | 140 ++++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 104 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 0cd1236..69422c3 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ /389-ds-base-2.0.15.tar.bz2 /jemalloc-5.3.0.tar.bz2 /389-ds-base-2.0.16.tar.bz2 +/389-ds-base-2.0.17.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index 556ed20..8c07eaf 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -46,9 +46,9 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 2.0.16 +Version: 2.0.17 Release: 1%{?dist} -License: GPLv3+ and (ASL 2.0 or MIT) and MIT and (Unlicense or MIT) and MPLv2.0 and BSD and ASL 2.0 and (ASL 2.0 or Boost) and (ASL 2.0 with exceptions or ASL 2.0 or MIT) +License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 Conflicts: freeipa-server < 4.0.3 @@ -62,78 +62,78 @@ Provides: bundled(crate(ahash)) = 0.7.6 Provides: bundled(crate(ansi_term)) = 0.12.1 Provides: bundled(crate(atty)) = 0.2.14 Provides: bundled(crate(autocfg)) = 1.1.0 -Provides: bundled(crate(base64)) = 0.13.0 +Provides: bundled(crate(base64)) = 0.13.1 Provides: bundled(crate(bitflags)) = 1.3.2 Provides: bundled(crate(byteorder)) = 1.4.3 Provides: bundled(crate(cbindgen)) = 0.9.1 -Provides: bundled(crate(cc)) = 1.0.73 +Provides: bundled(crate(cc)) = 1.0.76 Provides: bundled(crate(cfg-if)) = 1.0.0 Provides: bundled(crate(clap)) = 2.34.0 Provides: bundled(crate(concread)) = 0.2.21 -Provides: bundled(crate(crossbeam)) = 0.8.1 -Provides: bundled(crate(crossbeam-channel)) = 0.5.5 -Provides: bundled(crate(crossbeam-deque)) = 0.8.1 -Provides: bundled(crate(crossbeam-epoch)) = 0.9.9 -Provides: bundled(crate(crossbeam-queue)) = 0.3.5 -Provides: bundled(crate(crossbeam-utils)) = 0.8.10 +Provides: bundled(crate(crossbeam)) = 0.8.2 +Provides: bundled(crate(crossbeam-channel)) = 0.5.6 +Provides: bundled(crate(crossbeam-deque)) = 0.8.2 +Provides: bundled(crate(crossbeam-epoch)) = 0.9.11 +Provides: bundled(crate(crossbeam-queue)) = 0.3.6 +Provides: bundled(crate(crossbeam-utils)) = 0.8.12 Provides: bundled(crate(entryuuid)) = 0.1.0 Provides: bundled(crate(entryuuid_syntax)) = 0.1.0 -Provides: bundled(crate(fastrand)) = 1.7.0 +Provides: bundled(crate(fastrand)) = 1.8.0 Provides: bundled(crate(fernet)) = 0.1.4 Provides: bundled(crate(foreign-types)) = 0.3.2 Provides: bundled(crate(foreign-types-shared)) = 0.1.1 -Provides: bundled(crate(getrandom)) = 0.2.7 -Provides: bundled(crate(hashbrown)) = 0.11.2 +Provides: bundled(crate(getrandom)) = 0.2.8 +Provides: bundled(crate(hashbrown)) = 0.12.3 Provides: bundled(crate(hermit-abi)) = 0.1.19 Provides: bundled(crate(instant)) = 0.1.12 -Provides: bundled(crate(itoa)) = 1.0.2 -Provides: bundled(crate(jobserver)) = 0.1.24 -Provides: bundled(crate(libc)) = 0.2.126 +Provides: bundled(crate(itoa)) = 1.0.4 +Provides: bundled(crate(jobserver)) = 0.1.25 +Provides: bundled(crate(libc)) = 0.2.137 Provides: bundled(crate(librnsslapd)) = 0.1.0 Provides: bundled(crate(librslapd)) = 0.1.0 -Provides: bundled(crate(lock_api)) = 0.4.7 +Provides: bundled(crate(lock_api)) = 0.4.9 Provides: bundled(crate(log)) = 0.4.17 -Provides: bundled(crate(lru)) = 0.7.7 +Provides: bundled(crate(lru)) = 0.7.8 Provides: bundled(crate(memoffset)) = 0.6.5 -Provides: bundled(crate(once_cell)) = 1.13.0 -Provides: bundled(crate(openssl)) = 0.10.40 +Provides: bundled(crate(once_cell)) = 1.16.0 +Provides: bundled(crate(openssl)) = 0.10.42 Provides: bundled(crate(openssl-macros)) = 0.1.0 -Provides: bundled(crate(openssl-sys)) = 0.9.74 +Provides: bundled(crate(openssl-sys)) = 0.9.77 Provides: bundled(crate(parking_lot)) = 0.11.2 Provides: bundled(crate(parking_lot_core)) = 0.8.5 Provides: bundled(crate(paste)) = 0.1.18 Provides: bundled(crate(paste-impl)) = 0.1.18 Provides: bundled(crate(pin-project-lite)) = 0.2.9 -Provides: bundled(crate(pkg-config)) = 0.3.25 -Provides: bundled(crate(ppv-lite86)) = 0.2.16 +Provides: bundled(crate(pkg-config)) = 0.3.26 +Provides: bundled(crate(ppv-lite86)) = 0.2.17 Provides: bundled(crate(proc-macro-hack)) = 0.5.19 -Provides: bundled(crate(proc-macro2)) = 1.0.40 +Provides: bundled(crate(proc-macro2)) = 1.0.47 Provides: bundled(crate(pwdchan)) = 0.1.0 -Provides: bundled(crate(quote)) = 1.0.20 +Provides: bundled(crate(quote)) = 1.0.21 Provides: bundled(crate(rand)) = 0.8.5 Provides: bundled(crate(rand_chacha)) = 0.3.1 -Provides: bundled(crate(rand_core)) = 0.6.3 -Provides: bundled(crate(redox_syscall)) = 0.2.13 +Provides: bundled(crate(rand_core)) = 0.6.4 +Provides: bundled(crate(redox_syscall)) = 0.2.16 Provides: bundled(crate(remove_dir_all)) = 0.5.3 -Provides: bundled(crate(ryu)) = 1.0.10 +Provides: bundled(crate(ryu)) = 1.0.11 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(serde)) = 1.0.138 -Provides: bundled(crate(serde_derive)) = 1.0.138 -Provides: bundled(crate(serde_json)) = 1.0.82 +Provides: bundled(crate(serde)) = 1.0.147 +Provides: bundled(crate(serde_derive)) = 1.0.147 +Provides: bundled(crate(serde_json)) = 1.0.88 Provides: bundled(crate(slapd)) = 0.1.0 Provides: bundled(crate(slapi_r_plugin)) = 0.1.0 -Provides: bundled(crate(smallvec)) = 1.9.0 +Provides: bundled(crate(smallvec)) = 1.10.0 Provides: bundled(crate(strsim)) = 0.8.0 -Provides: bundled(crate(syn)) = 1.0.98 +Provides: bundled(crate(syn)) = 1.0.103 Provides: bundled(crate(synstructure)) = 0.12.6 Provides: bundled(crate(tempfile)) = 3.3.0 Provides: bundled(crate(textwrap)) = 0.11.0 -Provides: bundled(crate(tokio)) = 1.19.2 +Provides: bundled(crate(tokio)) = 1.21.2 Provides: bundled(crate(tokio-macros)) = 1.8.0 Provides: bundled(crate(toml)) = 0.5.9 -Provides: bundled(crate(unicode-ident)) = 1.0.1 -Provides: bundled(crate(unicode-width)) = 0.1.9 -Provides: bundled(crate(unicode-xid)) = 0.2.3 +Provides: bundled(crate(unicode-ident)) = 1.0.5 +Provides: bundled(crate(unicode-width)) = 0.1.10 +Provides: bundled(crate(unicode-xid)) = 0.2.4 Provides: bundled(crate(uuid)) = 0.8.2 Provides: bundled(crate(vcpkg)) = 0.2.15 Provides: bundled(crate(vec_map)) = 0.8.2 @@ -142,7 +142,7 @@ Provides: bundled(crate(wasi)) = 0.11.0+wasi_snapshot_preview1 Provides: bundled(crate(winapi)) = 0.3.9 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0 -Provides: bundled(crate(zeroize)) = 1.5.6 +Provides: bundled(crate(zeroize)) = 1.5.7 Provides: bundled(crate(zeroize_derive)) = 1.3.2 ##### Bundled cargo crates list - END ##### @@ -715,6 +715,70 @@ exit 0 %endif %changelog +* Fri Nov 18 2022 Mark Reynolds - 2.0.17-1 +- Bump version to 2.0.17 +- Issue 5534 - Add copyright text to the repository files +- Issue 5532 - Make db compaction TOD day more robust. +- Issue 5529 - UI - Fix npm vulnerability in loader-utils +- Issue 3555 - UI - fix audit issue with npm loader-utils (#5514) +- Issue 5162 - Fix dsctl tls ca-certfiicate add-cert arg requirement +- Issue 5162 - RFE - CLI allow adding CA certificate bundles +- Issue 5440 - memberof is slow on update/fixup if there are several 'groupattr' (#5455) +- Issue 5512 - BUG - skip pwdPolicyChecker OC in migration (#5513) +- Issue 5429 - healthcheck - add checks for MemberOf group attrs being indexed +- Issue 5502 - RFE - Add option to display entry attributes in audit log +- Issue 5495 - BUG - Minor fix to dds skip, inconsistent attrs caused errors (#5501) +- Issue 5495 - RFE - skip dds during migration. (#5496) +- Issue 5491 - UI - Add rework and finish jpegPhoto functionality (#5492) +- Issue 5368 - Retro Changelog trimming does not work (#5486) +- Issue 5487 - Fix various issues with logconv.pl +- Issue 5482 - lib389 - Can not enable replication with a mixed case suffix +- Issue 4776 - Fix entryuuid fixup task (#5483) +- Issue 5356 - Update Cargo.lock and bootstrap PBKDF2-SHA512 (#5480) +- Issue 3061 - RFE - Add password policy debug log level +- Issue 5462 - RFE - add missing default indexes (#5464) +- Issue 4324 - Revert recursive pthread mutex usage in factory.c +- Issue 5262 - high contention in find_entry_internal_dn on mixed load (#5264) +- Issue 4324 - Revert recursive pthread mutex change (#5463) +- Issue 5305 - OpenLDAP version autodetection doesn't work +- Issue 5032 - Fix OpenLDAP version check (#5091) +- Issue 5032 - OpenLDAP is not shipped with non-threaded version of libldap (#5033) (#5456) +- Issue 5254 - dscreate create-template regression due to 5a3bdc336 (#5255) +- Issue 5271 - Serialization of pam_passthrough causing high etimes (#5272) +- Issue 5453 - UI/CLI - Changing Root DN breaks UI +- Issue 5446 - Fix some covscan issues (#5451) +- Issue 5294 - Report Portal 5 is not processing an XML file with (#5358) +- Issue 4588 - Gost yescrypt may fail to build on some older versions of glibc +- Issue 4308 - checking if an entry is a referral is expensive +- Issue 5447 - UI - add NDN max cache size to UI +- Issue 5443 - UI - disable save button while saving +- Issue 5077 - UI - Add retrocl exclude attribute functionality (#5078) +- Issue 5413 - Allow only one MemberOf fixup task at a time +- Issue 5158 - entryuuid fixup tasks fails in replicated topology (#5439) +- Issue 4592 - dscreate error with custom dir_path (#5434) +- Issue 5397 - Fix memory leak with the intent filter +- Issue 5356 - For RUST build update the default password storage scheme +- Issue 5423 - Fix missing 'not' in description +- Issue 5421 - CI - makes replication/acceptance_test.py::test_modify_entry more robust (#5422) +- Issue 3903 - fix repl keep alive event interval +- Issue 5418 - Sync_repl may crash while managing invalid cookie (#5420) +- Issue 5415 - Hostname when set to localhost causing failures in other tests +- Issue 5412 - lib389 - do not set backend name to lowercase +- Issue 3903 - keep alive update event starts too soon +- Issue 5397 - Fix various memory leaks +- Issue 5399 - UI - LDAP Editor is not updated when we switch instances (#5400) +- Issue 3903 - Supplier should do periodic updates +- Issue 5392 - dscreate fails when using alternative ports in the SELinux hi_reserved_port_t label range +- Issue 5386 - BUG - Update sudoers schema to correctly support UTF-8 (#5387) +- Issue 5383 - UI - Various fixes and RFE's for UI +- Issue 4656 - Remove problematic language from source code +- Issue 5380 - Separate cleanAllRUV code into new file +- Issue 5322 - optime & wtime on rejected connections is not properly set +- Issue 5375 - CI - disable TLS hostname checking +- Issue 5373 - dsidm user get_dn fails with search_ext() argument 1 must be str, not function +- Issue 5371 - Update npm and cargo packages +- Issue 3069 - Support ECDSA private keys for TLS (#5365) + * Tue Jul 5 2022 Mark Reynolds - 2.0.16-1 - Bump version to 2.0.16 - Issue 5221 - fix covscan (#5359) diff --git a/sources b/sources index 30eb725..8713c5f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (jemalloc-5.3.0.tar.bz2) = 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1 -SHA512 (389-ds-base-2.0.16.tar.bz2) = a1df34954043c72810131bee14c905a571e4333c08944be7616d8de885c834a2659f4616e17a44f8ffbb6b31fbb782ba21646194fe5deb7a47a1fcdad4087ec6 +SHA512 (389-ds-base-2.0.17.tar.bz2) = 87070a3ad0cf55a03e8337bf0bb987c775541341a73b7c2b1f329705238715e763f40c55d60002110ecc31dc17684978099b1e7f265cd92472119ed0b84efddf