From b9eb67a6922a082b6cba032bd44c7dce7ebd50e1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 18 2023 07:15:20 +0000 Subject: import 389-ds-base-1.3.11.1-2.el7_9 --- diff --git a/SOURCES/0044-Issue-5565-Add-upgrade-script-for-new-Rust-password-.patch b/SOURCES/0044-Issue-5565-Add-upgrade-script-for-new-Rust-password-.patch new file mode 100644 index 0000000..e7deda3 --- /dev/null +++ b/SOURCES/0044-Issue-5565-Add-upgrade-script-for-new-Rust-password-.patch @@ -0,0 +1,90 @@ +From 4c6fc09f06e68727abaec2bcd703d5e4dd8cc586 Mon Sep 17 00:00:00 2001 +From: Mark Reynolds +Date: Fri, 19 May 2023 14:58:20 -0400 +Subject: [PATCH] Issue 5565 - Add upgrade script for new Rust password storage + plugins + +Description: add upgrade ldif for Rust PBKDF2 password storage plugins + +Relates: https://github.com/389ds/389-ds-base/issues/5565 + +Reviewed by: spichugi(Thanks!) +--- + Makefile.am | 1 + + .../src/scripts/50rust-pwdstorageplugins.ldif | 52 +++++++++++++++++++ + 2 files changed, 53 insertions(+) + create mode 100644 ldap/admin/src/scripts/50rust-pwdstorageplugins.ldif + +diff --git a/Makefile.am b/Makefile.am +index 8f2bd4212..b6ea3fe62 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -997,6 +997,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \ + ldap/admin/src/scripts/50refintprecedence.ldif \ + ldap/admin/src/scripts/50retroclprecedence.ldif \ + ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif \ ++ ldap/admin/src/scripts/50rust-pwdstorageplugins.ldif \ + ldap/admin/src/scripts/50pbkdf2pwdstorageplugin.ldif \ + ldap/admin/src/scripts/50cryptpwdstorageplugin.ldif \ + ldap/admin/src/scripts/50contentsync.ldif \ +diff --git a/ldap/admin/src/scripts/50rust-pwdstorageplugins.ldif b/ldap/admin/src/scripts/50rust-pwdstorageplugins.ldif +new file mode 100644 +index 000000000..696f409e3 +--- /dev/null ++++ b/ldap/admin/src/scripts/50rust-pwdstorageplugins.ldif +@@ -0,0 +1,52 @@ ++dn: cn=PBKDF2,cn=Password Storage Schemes,cn=plugins,cn=config ++objectclass: top ++objectclass: nsSlapdPlugin ++cn: PBKDF2 ++nsslapd-pluginpath: libpwdchan-plugin ++nsslapd-plugininitfunc: pwdchan_pbkdf2_plugin_init ++nsslapd-plugintype: pwdstoragescheme ++nsslapd-pluginenabled: on ++nsslapd-pluginId: ID ++nsslapd-pluginVersion: PACKAGE_VERSION ++nsslapd-pluginVendor: VENDOR ++nsslapd-pluginDescription: DESC ++ ++dn: cn=PBKDF2-SHA1,cn=Password Storage Schemes,cn=plugins,cn=config ++objectclass: top ++objectclass: nsSlapdPlugin ++cn: PBKDF2-SHA1 ++nsslapd-pluginpath: libpwdchan-plugin ++nsslapd-plugininitfunc: pwdchan_pbkdf2_sha1_plugin_init ++nsslapd-plugintype: pwdstoragescheme ++nsslapd-pluginenabled: on ++nsslapd-pluginId: ID ++nsslapd-pluginVersion: PACKAGE_VERSION ++nsslapd-pluginVendor: VENDOR ++nsslapd-pluginDescription: DESC ++ ++dn: cn=PBKDF2-SHA256,cn=Password Storage Schemes,cn=plugins,cn=config ++objectclass: top ++objectclass: nsSlapdPlugin ++cn: PBKDF2-SHA256 ++nsslapd-pluginpath: libpwdchan-plugin ++nsslapd-plugininitfunc: pwdchan_pbkdf2_sha256_plugin_init ++nsslapd-plugintype: pwdstoragescheme ++nsslapd-pluginenabled: on ++nsslapd-pluginId: ID ++nsslapd-pluginVersion: PACKAGE_VERSION ++nsslapd-pluginVendor: VENDOR ++nsslapd-pluginDescription: DESC ++ ++dn: cn=PBKDF2-SHA512,cn=Password Storage Schemes,cn=plugins,cn=config ++objectclass: top ++objectclass: nsSlapdPlugin ++cn: PBKDF2-SHA512 ++nsslapd-pluginpath: libpwdchan-plugin ++nsslapd-plugininitfunc: pwdchan_pbkdf2_sha512_plugin_init ++nsslapd-plugintype: pwdstoragescheme ++nsslapd-pluginenabled: on ++nsslapd-pluginId: ID ++nsslapd-pluginVersion: PACKAGE_VERSION ++nsslapd-pluginVendor: VENDOR ++nsslapd-pluginDescription: DESC ++ +-- +2.40.1 + diff --git a/SOURCES/0045-Bump-version-to-1.3.11.1-1.patch b/SOURCES/0045-Bump-version-to-1.3.11.1-1.patch new file mode 100644 index 0000000..a53b333 --- /dev/null +++ b/SOURCES/0045-Bump-version-to-1.3.11.1-1.patch @@ -0,0 +1,28 @@ +From 47d4802c82a651e779079c69e7f04ddd75190f23 Mon Sep 17 00:00:00 2001 +From: Mark Reynolds +Date: Fri, 19 May 2023 13:48:48 -0400 +Subject: [PATCH] Bump version to 1.3.11.1-1 + +--- + VERSION.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/VERSION.sh b/VERSION.sh +index 6f1b96c28..0f2ea6dee 100644 +--- a/VERSION.sh ++++ b/VERSION.sh +@@ -10,9 +10,9 @@ vendor="389 Project" + # PACKAGE_VERSION is constructed from these + VERSION_MAJOR=1 + VERSION_MINOR=3 +-VERSION_MAINT=10.2 ++VERSION_MAINT=11.1 + # NOTE: VERSION_PREREL is automatically set for builds made out of a git tree +-VERSION_PREREL= ++VERSION_PREREL=2 + VERSION_DATE=$(date -u +%Y%m%d) + + # Set the version and release numbers for local developer RPM builds. We +-- +2.40.0 + diff --git a/SPECS/389-ds-base.spec b/SPECS/389-ds-base.spec index e3b2867..2bab3a7 100644 --- a/SPECS/389-ds-base.spec +++ b/SPECS/389-ds-base.spec @@ -41,7 +41,7 @@ Summary: 389 Directory Server (%{variant}) Name: 389-ds-base Version: 1.3.11.1 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org/ Group: System Environment/Daemons @@ -202,7 +202,8 @@ Patch40: 0040-Issue-5418-Sync_repl-may-crash-while-managing-invali.patc Patch41: 0041-Issue-5565-Change-default-password-storage-scheme-to.patch Patch42: 0042-Issue-5440-memberof-is-slow-on-update-fixup-if-there.patch Patch43: 0043-Issue-5497-boolean-attributes-should-be-case-insensi.patch - +Patch44: 0044-Issue-5565-Add-upgrade-script-for-new-Rust-password-.patch +Patch45: 0045-Bump-version-to-1.3.11.1-1.patch %description 389 Directory Server is an LDAPv3 compliant server. The base package includes @@ -568,6 +569,10 @@ fi %{_sysconfdir}/%{pkgname}/dirsrvtests %changelog +* Tue May 23 2023 Mark Reynolds - 1.3.11.1-2 +- Bump version to 1.3.11.1-2 +- Resolves: Bug 2170224 - Fix upgrade scripts and version string + * Tue Feb 21 2023 Simon Pichugin - 1.3.11.1-1 - Bump version to 1.3.11.1-1 - Resolves: Bug 2170224 - Backport Rust password storage PBKDF2 schemes