From 63323372eb8a13b6ac81877b5982cd12ae26cf68 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Thu, 14 Aug 2025 19:55:48 +0800 Subject: [PATCH] Correct configure.ac to request linking to icu-uc --- 389-ds-base.spec | 6 +++- Issue-6415-BUG-Incorrect-icu-linking.patch | 33 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Issue-6415-BUG-Incorrect-icu-linking.patch diff --git a/389-ds-base.spec b/389-ds-base.spec index a46da85..df8784f 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: 8 +Release: 9 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 @@ -24,6 +24,7 @@ Patch4: CVE-2025-2487.patch Patch5: backport-drop-python-setup-tools-dep.patch # https://github.com/389ds/389-ds-base/pull/6930 Patch6: backport-Compilation-failure-with-rust-1.89.patch +Patch7: Issue-6415-BUG-Incorrect-icu-linking.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 @@ -334,6 +335,9 @@ exit 0 %{_mandir}/*/* %changelog +* Thu Aug 14 2025 yaoxin <1024769339@qq.com> - 3.1.1-9 +- Correct configure.ac to request linking to icu-uc + * Tue Aug 12 2025 Funda Wang - 3.1.1-8 - fix build with rust 1.89 diff --git a/Issue-6415-BUG-Incorrect-icu-linking.patch b/Issue-6415-BUG-Incorrect-icu-linking.patch new file mode 100644 index 0000000..81ecd6e --- /dev/null +++ b/Issue-6415-BUG-Incorrect-icu-linking.patch @@ -0,0 +1,33 @@ +From 5813c697bd7b3983ffb302faaf61615ac3f72421 Mon Sep 17 00:00:00 2001 +From: Firstyear +Date: Fri, 29 Nov 2024 12:51:17 +1000 +Subject: [PATCH] Issue 6415 - BUG - Incorrect icu linking (#6416) + +Bug Description: ICU has been updated to version 76.x - the .pc file of icu-18n for example no +longer includes -licuuc, which was so far the most common reason for buildfailures (as icu-uc is +not linked automatically, resulting in underlining) + +Fix Description: Correct configure.ac to request linking to icu-uc + +fixes: https://github.com/389ds/389-ds-base/issues/6415 + +Author: William Brown + +Review by: @droideck +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 24deb6fecb..4ab64c7334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -849,7 +849,7 @@ fi + + PKG_CHECK_MODULES([SASL], [libsasl2]) + +-PKG_CHECK_MODULES([ICU], [icu-i18n >= 60.2]) ++PKG_CHECK_MODULES([ICU], [icu-i18n >= 60.2 icu-uc >= 60.2]) + + m4_include(m4/netsnmp.m4) + -- Gitee