diff --git a/.gitignore b/.gitignore
index d28271f..649484f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,3 +200,16 @@
 /389-ds-base-1.4.5.0.tar.bz2
 /389-ds-base-2.0.1.tar.bz2
 /389-ds-base-2.0.2.tar.bz2
+/389-ds-base-2.0.3.tar.bz2
+/389-ds-base-2.0.4.tar.bz2
+/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.8.tar.bz2
+/389-ds-base-2.0.9.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
+/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/0001-Issue-2526-retrocl-backend-created-out-of-order.patch b/0001-Issue-2526-retrocl-backend-created-out-of-order.patch
deleted file mode 100644
index c6f7fed..0000000
--- a/0001-Issue-2526-retrocl-backend-created-out-of-order.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 67c8b8702a249cb0ef1ebf49b6e87056cd5339f6 Mon Sep 17 00:00:00 2001
-From: Mark Reynolds <mreynolds@redhat.com>
-Date: Tue, 27 Oct 2020 13:14:55 -0400
-Subject: [PATCH] Issue 2526 - retrocl backend created out of order
-
-Bug Description:  A recent change verified that you do not create
-                  a mappingtree entry before the backend entry was
-                  created.  The server created the retrocl backend
-                  in the opposite order which broke the retrocl.
-
-Fix Description:  Create the retrocl backend entry before creating
-                  the mapping tree entry.
-
-Relates: https://github.com/389ds/389-ds-base/issues/2526
-
-Reviewed by: viktor(Thanks!)
----
- ldap/servers/plugins/retrocl/retrocl.c        | 10 ++---
- ldap/servers/plugins/retrocl/retrocl_create.c | 38 +++++++++----------
- 2 files changed, 22 insertions(+), 26 deletions(-)
-
-diff --git a/ldap/servers/plugins/retrocl/retrocl.c b/ldap/servers/plugins/retrocl/retrocl.c
-index 4af4d752b..8d6135dad 100644
---- a/ldap/servers/plugins/retrocl/retrocl.c
-+++ b/ldap/servers/plugins/retrocl/retrocl.c
-@@ -222,15 +222,11 @@ retrocl_select_backend(void)
-     slapi_entry_free(referral);
- 
-     if (err != LDAP_SUCCESS || be == NULL || be == defbackend_get_backend()) {
--        slapi_log_err(SLAPI_LOG_ERR, RETROCL_PLUGIN_NAME,
-+        /* Could not find the backend for cn=changelog, either because
-+         * it doesn't exist mapping tree not registered. */
-+        slapi_log_err(SLAPI_LOG_PLUGIN, RETROCL_PLUGIN_NAME,
-                       "retrocl_select_backend - Mapping tree select failed (%d) %s.\n", err, errbuf);
--
--        /* could not find the backend for cn=changelog, either because
--         * it doesn't exist
--         * mapping tree not registered.
--         */
-         err = retrocl_create_config();
--
-         if (err != LDAP_SUCCESS)
-             return err;
-     } else {
-diff --git a/ldap/servers/plugins/retrocl/retrocl_create.c b/ldap/servers/plugins/retrocl/retrocl_create.c
-index fb1503520..571e6899f 100644
---- a/ldap/servers/plugins/retrocl/retrocl_create.c
-+++ b/ldap/servers/plugins/retrocl/retrocl_create.c
-@@ -192,6 +192,25 @@ retrocl_create_config(void)
-     vals[0] = &val;
-     vals[1] = NULL;
- 
-+    retrocl_be_changelog = slapi_be_select_by_instance_name("changelog");
-+
-+    if (retrocl_be_changelog == NULL) {
-+        /* This is not the nsslapd-changelogdir from cn=changelog4,cn=config */
-+        char *bedir;
-+
-+        bedir = retrocl_get_config_str(CONFIG_CHANGELOG_DIRECTORY_ATTRIBUTE);
-+        if (bedir == NULL) {
-+            /* none specified */
-+        }
-+
-+        rc = retrocl_create_be(bedir);
-+        slapi_ch_free_string(&bedir);
-+        if (rc != LDAP_SUCCESS && rc != LDAP_ALREADY_EXISTS) {
-+            return rc;
-+        }
-+        retrocl_be_changelog = slapi_be_select_by_instance_name("changelog");
-+    }
-+
-     /* Assume the mapping tree node is missing.  It doesn't hurt to
-      * attempt to add it if it already exists.  You will see a warning
-      * in the errors file when the referenced backend does not exist.
-@@ -256,25 +275,6 @@ retrocl_create_config(void)
-         return rc;
-     }
- 
--    retrocl_be_changelog = slapi_be_select_by_instance_name("changelog");
--
--    if (retrocl_be_changelog == NULL) {
--        /* This is not the nsslapd-changelogdir from cn=changelog4,cn=config */
--        char *bedir;
--
--        bedir = retrocl_get_config_str(CONFIG_CHANGELOG_DIRECTORY_ATTRIBUTE);
--        if (bedir == NULL) {
--            /* none specified */
--        }
--
--        rc = retrocl_create_be(bedir);
--        slapi_ch_free_string(&bedir);
--        if (rc != LDAP_SUCCESS && rc != LDAP_ALREADY_EXISTS) {
--            return rc;
--        }
--        retrocl_be_changelog = slapi_be_select_by_instance_name("changelog");
--    }
--
-     return LDAP_SUCCESS;
- }
- 
--- 
-2.28.0
-
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 2482664..52dc47d 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -44,11 +44,18 @@ ExcludeArch: i686
 # set PIE flag
 %global _hardened_build 1
 
+# 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.2
-Release:          %{?relprefix}1%{?prerel}%{?dist}.1
-License:          GPLv3+
+Version:          2.0.15
+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
@@ -57,6 +64,95 @@ Obsoletes:        %{name}-legacy-tools < 1.4.4.6
 Obsoletes:        %{name}-legacy-tools-debuginfo < 1.4.4.6
 Provides:         ldif2ldbm >= 0
 
+##### Bundled cargo crates list - START #####
+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(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(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-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(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(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.115
+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(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(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(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(pwdchan)) = 0.1.0
+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
+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.9
+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(slapd)) = 0.1.0
+Provides:  bundled(crate(slapi_r_plugin)) = 0.1.0
+Provides:  bundled(crate(smallvec)) = 1.8.0
+Provides:  bundled(crate(strsim)) = 0.8.0
+Provides:  bundled(crate(syn)) = 1.0.86
+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(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.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(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
+##### Bundled cargo crates list - END #####
+
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel >= 3.34
 BuildRequires:    openldap-devel
@@ -130,12 +226,13 @@ Requires:         policycoreutils-python-utils
 Requires:         /usr/sbin/semanage
 Requires:         libsemanage-python%{python3_pkgversion}
 
-Requires:         selinux-policy >= 3.14.1-29
+Requires:         selinux-policy >= 34.17-1
 
 # the following are needed for some of our scripts
 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
@@ -157,6 +254,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}
@@ -171,6 +272,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.
@@ -268,7 +374,7 @@ A cockpit UI Plugin for configuring and administering the 389 Directory Server
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?prerel}
+%autosetup -p1 -v -n %{name}-%{version}%{?prerel}
 
 %if %{bundle_jemalloc}
 %setup -q -n %{name}-%{version}%{?prerel} -T -D -b 3
@@ -330,7 +436,7 @@ popd
 %endif
 
 # Enforce strict linking
-%define _strict_symbol_defs_build 1
+%define _ld_strict_symbol_defs 1
 
 # Rebuild the autotool artifacts now.
 autoreconf -fiv
@@ -534,6 +640,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
@@ -579,7 +686,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}
@@ -613,6 +720,332 @@ exit 0
 %endif
 
 %changelog
+* Wed Mar 23 2022 Mark Reynolds <mreynolds@redhat.com> - 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 <mreynolds@redhat.com> - 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 <awilliam@redhat.com> - 2.0.13-2
+- Backport PR#5141 to fix startup when a directory doesn't exist (#2047323)
+
+* Mon Jan 24 2022 Mark Reynolds <mreynolds@redhat.com> - 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 <mreynolds@redhat.com> - 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)
+
+* Thu Dec 2 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.11-2
+- Bump version to 2.0.11-2
+- Update selinux Requirement to selinux-policy-34.17-1
+
+* Mon Nov 22 2021 Mark Reynolds <mreynolds@redhat.com> - 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 <vashirov@redhat.com> - 2.0.10-2
+- Resolves #rhbz2016595
+
+* Mon Sep 20 2021 Mark Reynolds <mreynolds@redhat.com> - 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
+
+* Mon Aug 30 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.9-1
+- Bump version to 2.0.9
+- Issue 4887 - UI - Update webpack.config.js and package.json
+- Issue 4149 - UI - Migrate the remaining components to PF4
+- Issue 4875 - CLI - Add some verbosity to installer
+- Issue 4884 - server crashes when dnaInterval attribute is set to zero
+
+* Mon Aug 23 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.8-1
+- Bump version to 2.0.8
+- Issue 4877 - RFE - EntryUUID to validate UUIDs on fixup (#4878)
+- Issue 4872 - BUG - entryuuid enabled by default causes replication issues (#4876)
+- Issue 4851 - Typos in "dsconf pwpolicy set --help" (#4867)
+- Issue 4763 - Attribute Uniqueness Plugin uses wrong subtree on ModRDN (#4871)
+- Issue 4736 - lib389 - fix regression in certutil error checking
+- Issue 4861 - Improve instructions in custom.conf for memory leak detection
+- Issue 4859 - Do not version libns-dshttpd
+- Issue 4169 - Migrate Replication & Schema tabs to PF4
+- Issue 4623 - RFE - Monitor the current DB locks ( nsslapd-db-current-locks )
+- Issue 4736 - CLI - Errors from certutil are not propagated
+- Issue 4460 - Fix isLocal and TLS paths discovery (#4850)
+- Issue 4848 - Force to require nss version greater or equal as the version available at the build time
+- Issue 4696 - Password hash upgrade on bind (#4840)
+
+* Thu Jul 15 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.7-1
+- Bump version to 2.0.7
+- Issue 4443 - Internal unindexed searches in syncrepl/retro changelog
+- Issue 4603 - Reindexing a single backend (#4831)
+- Issue 4169 - UI - migrate Server Tab forms to PF4
+- Issue 4817 - BUG - locked crypt accounts on import may allow all passwords (#4819)
+- Issue 4820 - RFE - control flow integrity (#4821)
+- Issue 4706 - negative wtime for compare operations (#4780)
+- Issue 4414 - SIGFPE crash in rhds disk monitoring routine (#4829)
+- Issue 4262 - Fix Index out of bound in fractional test (#4828)
+- Issue 4826 - Filter argparse-manpage from autogenerated requires
+- Issue 4822 - Fix CI temporary password: fixture leftover breaks them (#4823)
+- Issue 2820 - Fix CI test suite issues
+
+* Wed Jun 23 2021 Thierry Bordaz <tbordaz@redhat.com> - 2.0.6-1
+- Bump version to 2.0.6
+- Issue 4803 - Improve DB Locks Monitoring Feature Descriptions
+- Issue 4803 - Improve DB Locks Monitoring Feature Descriptions (#4810)
+- Issue 4169 - UI - Migrate Typeaheads to PF4 (#4808)
+- Issue 4414 - disk monitoring - prevent division by zero crash
+- Issue 4788 - CLI should support Temporary Password Rules attributes (#4793)
+- Issue 4656 - Fix replication plugin rename dependency issues
+- Issue 4656 - replication name change upgrade code causes crash with dynamic plugins
+- Issue 4506 - Improve SASL logging
+- Issue 4709 - Fix double free in dbscan
+- Issue 4093 - Fix MEP test case
+- Issue 4747 - Remove unstable/unstatus tests (followup) (#4809)
+- Issue 4791 - Missing dependency for RetroCL RFE (#4792)
+- Issue 4794 - BUG - don't capture container output (#4798)
+- Issue 4593 - Log an additional message if the server certificate nickname doesn't match nsSSLPersonalitySSL value
+- Issue 4797 - ACL IP ADDRESS evaluation may corrupt c_isreplication_session connection flags (#4799)
+- Issue 4169 - UI Migrate checkbox to PF4 (#4769)
+- Issue 4447 - Crash when the Referential Integrity log is manually edited
+- Issue 4773 - Add CI test for DNA interval assignment
+- Issue 4789 - Temporary password rules are not enforce with local password policy (#4790)
+- Issue 4379 - fixing regression in test_info_disclosure
+- Issue 4379 - Allow more than 1 empty AttributeDescription for ldapsearch, without the risk of denial of service
+- Issue 4379 - Allow more than 1 empty AttributeDescription for ldapsearch, without the risk of denial of service
+- Issue 4575 Update test docstrings metadata
+- Issue 4753 - Adjust our tests to 389-ds-base-snmp missing in RHEL 9 Appstream
+- removed the snmp_present() from utils.py as we have get_rpm_version() in conftest.py
+- Issue 4753 - Adjust our tests to 389-ds-base-snmp missing in RHEL 9 Appstream
+
+* Sun May 30 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.5-1
+- Bump version to 2.0.5
+- Issue 4778 - RFE - Allow setting TOD for db compaction and add task
+- Issue 4169 - UI - Port plugin tables to PF4
+- Issue 4656 - Allow backward compatilbity for replication plugin name change
+- Issue 4764 - replicated operation sometime checks ACI (#4783)
+- Issue 2820 - Fix CI test suite issues
+- Issue 4781 - There are some typos in man-pages
+- Issue 4773 - Enable interval feature of DNA plugin
+- Issue 4623 - RFE - Monitor the current DB locks (#4762)
+- Issue 3555 - Fix UI audit issue
+- Issue 4725 - Fix compiler warnings
+- Issue 4770 - Lower FIPS logging severity
+- Issue 4765 - database suffix unexpectdly changed from .db to .db4 (#4766)
+- Issue 4725 - [RFE] DS - Update the password policy to support a Temporary Password Rules (#4727)
+- Issue 4747 - Remove unstable/unstatus tests from PRCI (#4748)
+- Issue 4759 - Fix coverity issue (#4760)
+- Issue 4169 - UI - Migrate Buttons to PF4 (#4745)
+- Issue 4714 - dscontainer fails with rootless podman
+- Issue 4750 - Fix compiler warning in retrocl (#4751)
+- Issue 4742 - UI - should always use LDAPI path when calling CLI
+- Issue 4169 - UI - Migrate Server, Security, and Schema tables to PF4
+- Issue 4667 - incorrect accounting of readers in vattr rwlock (#4732)
+- Issue 4701 - RFE - Exclude attributes from retro changelog (#4723)
+- Issue 4740 - Fix CI lib389 userPwdPolicy and subtreePwdPolicy (#4741)
+- Issue 4711 - SIGSEV with sync_repl (#4738)
+- Issue 4734 - import of entry with no parent warning (#4735)
+- Issue 4729 - GitHub Actions fails to run pytest tests
+- Issue 4656 - Remove problematic language from source code
+- Issue 4632 - dscontainer: SyntaxWarning: "is" with a literal.
+- Issue 4169 - UI - migrate replication tables to PF4
+- Issue 4637 - ndn cache leak (#4724)
+- Issue 4577 - Fix ASAN flags in specfile
+- Issue 4169 - UI - PF4 migration - database tables
+- issue 4653 - refactor ldbm backend to allow replacement of BDB - phase 3e - dbscan (#4709)
+
+* Thu May 20 2021 Christian Heimes <cheimes@redhat.com> - 2.0.4-3
+- Enable interval feature of DNA plugin (resolves: rhbz#1962671)
+
+* Fri May 07 2021 Viktor Ashirov <vashirov@redhat.com> - 2.0.4-2
+- Rebuilt to fix NVR
+
+* Fri Apr 09 2021 Simon Pichugin <spichugi@redhat.com> - 2.0.4-1.1
+- Add Rust bundled Provides and Update License
+
+* Wed Apr 07 2021 Thierry Bordaz <tbordaz@redhat.com> - 2.0.4-1
+- Bump version to 2.0.4
+- Issue 4680 - 389ds coredump (@389ds/389-ds-base-nightly) in replica install with CA (#4715)
+- Issue 3965 - RFE - Implement the Password Policy attribute "pwdReset" (#4713)
+- Issue 4700 - Regression in winsync replication agreement (#4712)
+- Issue 3965 - RFE - Implement the Password Policy attribute "pwdReset" (#4710)
+- Issue 4169 - UI - migrate monitor tables to PF4
+- issue 4585 - backend redesign phase 3c - dbregion test removal (#4665)
+- Issue 2736 - remove remaining perl references
+- Issue 2736 - https://github.com/389ds/389-ds-base/issues/2736
+- Issue 4706 - negative wtime in access log for CMP operations
+- Issue 3585 - LDAP server returning controltype in different sequence
+- Issue 4127 - With Accounts/Account module delete fuction is not working (#4697)
+- Issue 4666 - BUG - cb_ping_farm can fail with anonymous binds disabled (#4669)
+- Issue 4671 - UI - Fix browser crashes
+- Issue 4169 - UI - Add PF4 charts for server stats
+- Issue 4648 - Fix some issues and improvement around CI tests (#4651)
+- Issue  4654  Updates to tickets/ticket48234_test.py  (#4654)
+- Issue 4229 - Fix Rust linking
+- Issue 4673 - Update Rust crates
+- Issue 4658 - monitor - connection start date is incorrect
+- Issue 4169 - UI - migrate modals to PF4
+- Issue 4656 - remove problematic language from ds-replcheck
+- Issue 4459 - lib389 - Default paths should use dse.ldif if the server is down
+- Issue 4656 - Remove problematic language from UI/CLI/lib389
+- Issue 4661 - RFE - allow importing openldap schemas (#4662)
+- Issue 4659 - restart after openldap migration to enable plugins (#4660)
+- Merge pull request #4664 from mreynolds389/issue4663
+- issue 4552 - Backup Redesign phase 3b - use dbimpl in replicatin plugin (#4622)
+- Issue 4643 - Add a tool that generates Rust dependencies for a specfile (#4645)
+- Issue 4646 - CLI/UI - revise DNA plugin management
+- Issue 4644 - Large updates can reset the CLcache to the beginning of the changelog (#4647)
+- Issue 4649 - crash in sync_repl when a MODRDN create a cenotaph (#4652)
+- Issue 4169 - UI - Migrate alerts to PF4
+- Issue 4169 - UI - Migrate Accordians to PF4 ExpandableSection
+- Issue 4595 - Paged search lookthroughlimit bug (#4602)
+- Issue 4169 - UI - port charts to PF4
+- Issue 2820 - Fix CI test suite issues
+- Issue 4513 - CI - make acl ip address tests more robust
+
+* Fri Feb 26 2021 Alexander Bokovoy <abokovoy@redhat.com> - 2.0.3-3
+- Remove a revert of the fix for Issue 4609 - CVE - info disclosure when authenticating(breaks Dogtag)
+- Dogtag has fixed own code that failed in the presence of the fix for Issue 4609
+
+* Fri Feb 19 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.3-2
+- Bump version to 2.0.3-2
+- Revert Issue 4609 - CVE - info disclosure when authenticating(breaks DogTag)
+
+* Fri Feb 12 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.3-1
+- Bump version to 2.0.3
+- Issue 4619 - remove pytest requirement from lib389
+- Issue 4615 - log message when psearch first exceeds max threads per conn
+- Issue 4469 - Backend redesing phase 3a - implement dbimpl API and use it in back-ldbm (#4618)
+- Issue 4324 - Some architectures the cache line size file does not exist
+- Issue 4593 - RFE - Print help when nsSSLPersonalitySSL is not found (#4614)
+- Issue 4469 - Backend redesign phase 3a - bdb dependency removal from back-ldbm
+- PR 4564 - Update dscontainer
+- Issue 4149 - UI - port TreeView and opther components to PF4
+- Issue 4577 - Add GitHub actions
+- Issue 4591 - RFE - improve openldap_to_ds help and features (#4607)
+- issue 4612 - Fix pytest fourwaymmr_test for non root user (#4613)
+- Issue 4609 - CVE - info disclosure when authenticating
+- Issue 4348 - Add tests for dsidm
+- Issue 4571 - Stale libdb-utils dependency
+- Issue 4600 - performance modify rate: reduce lock contention on the object extension factory (#4601)
+- Issue 4577 - Add GitHub actions
+- Issue 4588 - BUG - unable to compile without xcrypt (#4589)
+- Issue 4579 - libasan detects heap-use-after-free in URP test (#4584)
+- Issue 4581 - A failed re-indexing leaves the database in broken state (#4582)
+- Issue 4348 - Add tests for dsidm
+- Issue 4577 - Add GitHub actions
+- Issue 4563 - Failure on s390x: 'Fails to split RDN "o=pki-tomcat-CA" into components' (#4573)
+- Issue 4093 - fix compiler warnings and update doxygen
+- Issue 4575 - Update test docstrings metadata
+- Issue 4526 - sync_repl: when completing an operation in the pending list, it can select the wrong operation (#4553)
+- Issue 4324 - Performance search rate: change entry cache monitor to recursive pthread mutex (#4569)
+- Issue 4513 - Add DS version check to SSL version test (#4570)
+- Issue 5442 - Search results are different between RHDS10 and RHDS11
+- Issue 4396 - Minor memory leak in backend (#4558)
+- Issue 4513 - Fix replication CI test failures (#4557)
+- Issue 4513 - Fix replication CI test failures (#4557)
+- Issue 4153 - Added a CI test (#4556)
+- Issue 4506 - BUG - fix oob alloc for fds (#4555)
+- Issue 4548 - CLI - dsconf needs better root DN access control plugin validation
+- Issue 4506 - Temporary fix for io issues (#4516)
+- Issue 4535 - lib389 - Fix log function in backends.py
+- Issue 4534 - libasan read buffer overflow in filtercmp (#4541)
+- Issue 4544 - Compiler warnings on krb5 functions (#4545)
+- Update rpm.mk for RUST tarballs
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
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 <william@blackhats.net.au>"]
diff --git a/sources b/sources
index f0a20b7..53f8b78 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 (389-ds-base-2.0.2.tar.bz2) = 42805311e45b2f3305f86da50d5a0128b19cd15aeb4787ccb67b5ceea9f7a7efe42076dff1d47d4d61012453405403c730c245d53431043eb05c125455938c37