From b5464a63525dd8d79a52fa593569f4c97e21f995 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 31 Mar 2025 09:43:18 +0000 Subject: [PATCH] import CS 389-ds-base-2.6.1-6.el9_6 --- ...Issue-6090-dbscan-use-bdb-by-default.patch | 44 +++++++++++++++++++ SPECS/389-ds-base.spec | 9 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0010-Issue-6090-dbscan-use-bdb-by-default.patch diff --git a/SOURCES/0010-Issue-6090-dbscan-use-bdb-by-default.patch b/SOURCES/0010-Issue-6090-dbscan-use-bdb-by-default.patch new file mode 100644 index 0000000..f39eb11 --- /dev/null +++ b/SOURCES/0010-Issue-6090-dbscan-use-bdb-by-default.patch @@ -0,0 +1,44 @@ +From 39d91c4b86fc2ad7e35f8bebd510dff984e8ba56 Mon Sep 17 00:00:00 2001 +From: Viktor Ashirov +Date: Wed, 5 Mar 2025 23:46:02 +0100 +Subject: [PATCH] Issue 6090 - dbscan: use bdb by default + +Bug Description: +dbscan started to use mdb by default on versions where it's not the +default. + +Fix Description: +Use bdb by default on 2.x versions. + +Relates: https://github.com/389ds/389-ds-base/issues/6090 + +Reviewed by: @mreynolds389 (Thanks!) +--- + ldap/servers/slapd/tools/dbscan.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c +index 12edf7c5b..9260c1532 100644 +--- a/ldap/servers/slapd/tools/dbscan.c ++++ b/ldap/servers/slapd/tools/dbscan.c +@@ -1280,7 +1280,7 @@ removedb(const char *dbimpl_name, const char *filename) + + if (!filename) { + printf("Error: -f option is missing.\n" +- "Usage: dbscan -D mdb -d -f //\n"); ++ "Usage: dbscan -D bdb -d -f //\n"); + return 1; + } + +@@ -1314,7 +1314,7 @@ main(int argc, char **argv) + char *find_key = NULL; + uint32_t entry_id = 0xffffffff; + char *defdbimpl = getenv("NSSLAPD_DB_LIB"); +- char *dbimpl_name = (char*) "mdb"; ++ char *dbimpl_name = (char*) "bdb"; + int longopt_idx = 0; + int c = 0; + char optstring[2*COUNTOF(options)+1] = {0}; +-- +2.48.1 + diff --git a/SPECS/389-ds-base.spec b/SPECS/389-ds-base.spec index 1128df8..e89e257 100644 --- a/SPECS/389-ds-base.spec +++ b/SPECS/389-ds-base.spec @@ -47,7 +47,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 2.6.1 -Release: 4%{?dist} +Release: 6%{?dist} License: GPL-3.0-or-later WITH GPL-3.0-389-ds-base-exception AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSD-2-Clause OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-3.0 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0 URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 @@ -479,6 +479,7 @@ Patch: 0006-Issue-6258-Mitigate-race-condition-in-paged_results_.patc Patch: 0007-Issue-6229-After-an-initial-failure-subsequent-onlin.patch Patch: 0008-Issue-6554-During-import-of-entries-without-nsUnique.patch Patch: 0009-Issue-6561-TLS-1.2-stickiness-in-FIPS-mode.patch +Patch: 0010-Issue-6090-dbscan-use-bdb-by-default.patch %description 389 Directory Server is an LDAPv3 compliant server. The base package includes @@ -921,6 +922,12 @@ exit 0 %endif %changelog +* Fri Mar 14 2025 Viktor Ashirov - 2.6.1-6 +- Resolves: RHEL-82271 - ipa-restore is failing with "Failed to start Directory Service" + +* Fri Mar 14 2025 Viktor Ashirov - 2.6.1-5 +- Resolves: RHEL-82271 - ipa-restore is failing with "Failed to start Directory Service" + * Wed Feb 19 2025 Viktor Ashirov - 2.6.1-4 - Resolves: RHEL-78722 - Failed to set sslversionmax to TLS1.3 in FIPS mode with dsconf $INSTANCE security set --tls-protocol-max TLS1.3