From 658f13128729d086446d3226d950c7bb4aa04cb7 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 26 Sep 2025 14:33:26 +0800
Subject: [PATCH] fix build with rust 1.89

---
 389-ds-base.spec                              |  7 ++++-
 ...t-Compilation-failure-with-rust-1.89.patch | 30 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 backport-Compilation-failure-with-rust-1.89.patch

diff --git a/389-ds-base.spec b/389-ds-base.spec
index 0364946..4ff4399 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -6,7 +6,7 @@ ExcludeArch:   i686
 Name:          389-ds-base
 Summary:       Base 389 Directory Server
 Version:       3.1.1
-Release:       6
+Release:       7
 License:       GPL-3.0-or-later
 URL:           https://www.port389.org
 Source0:       https://releases.pagure.org/389-ds-base/389-ds-base-%{version}.tar.bz2
@@ -20,6 +20,8 @@ Patch2:        fix-dsidm-role-subtree-status-fails-with-TypeError.patch
 # https://github.com/sfackler/rust-openssl/commit/f014afb230de4d77bc79dea60e7e58c2f47b60f2
 Patch3:        CVE-2025-24898.patch
 Patch4:        CVE-2025-2487.patch
+# https://github.com/389ds/389-ds-base/pull/6930
+Patch5:        backport-Compilation-failure-with-rust-1.89.patch
 
 BuildRequires: nspr-devel nss-devel >= 3.34 perl-generators openldap-devel libdb-devel cyrus-sasl-devel icu
 BuildRequires: libicu-devel pcre-devel cracklib-devel gcc-c++ net-snmp-devel lm_sensors-devel bzip2-devel
@@ -329,6 +331,9 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 12 2025 Funda Wang <fundawang@yeah.net> - 3.1.1-7
+- fix build with rust 1.89
+
 * Mon Mar 31 2025 wangkai <13474090681@163.com> - 3.1.1-6
 - Fix CVE-2025-2487
 
diff --git a/backport-Compilation-failure-with-rust-1.89.patch b/backport-Compilation-failure-with-rust-1.89.patch
new file mode 100644
index 0000000..04dadc1
--- /dev/null
+++ b/backport-Compilation-failure-with-rust-1.89.patch
@@ -0,0 +1,30 @@
+From 8e341b4967212454f154cd08d7ceb2e2a429e2e8 Mon Sep 17 00:00:00 2001
+From: Viktor Ashirov <vashirov@redhat.com>
+Date: Mon, 11 Aug 2025 13:19:13 +0200
+Subject: [PATCH] Issue 6929 - Compilation failure with rust-1.89 on Fedora ELN
+
+Bug Description:
+The `ValueArrayRefIter` struct has a lifetime parameter `'a`.
+But in the `iter` method  the return type doesn't specify the lifetime parameter.
+
+Fix Description:
+Make the lifetime explicit.
+
+Fixes: https://github.com/389ds/389-ds-base/issues/6929
+---
+ src/slapi_r_plugin/src/value.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/slapi_r_plugin/src/value.rs b/src/slapi_r_plugin/src/value.rs
+index 2fd35c808d..fec74ac254 100644
+--- a/src/slapi_r_plugin/src/value.rs
++++ b/src/slapi_r_plugin/src/value.rs
+@@ -61,7 +61,7 @@
+         ValueArrayRef { raw_slapi_val }
+     }
+ 
+-    pub fn iter(&self) -> ValueArrayRefIter {
++    pub fn iter(&self) -> ValueArrayRefIter<'_> {
+         ValueArrayRefIter {
+             idx: 0,
+             va_ref: &self,
-- 
Gitee