Accepting request 1225498 from server:mail

Forwarded request #1225471 from dimstar

- Add dovecot-link-icu76.patch: configure: Explicitly check for icu-uc
  Ensure we link against libicu-uc when it's split in v76
  (boo#1233582).
- Call autoreconf in build section, as above patch touches the
  build system.

OBS-URL: https://build.opensuse.org/request/show/1225498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dovecot23?expand=0&rev=55

dovecot-link-icu76.patch

@@ -0,0 +1,23 @@
+From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001
+From: fundawang <fundawang@yeah.net>
+Date: Sun, 27 Oct 2024 22:11:21 +0800
+Subject: [PATCH] configure: Explicitly check for icu-uc
+
+Ensure we link against libicu-uc when it's split in v76.
+---
+ m4/want_icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: dovecot-2.3.21.1/m4/want_icu.m4
+===================================================================
+--- dovecot-2.3.21.1.orig/m4/want_icu.m4
++++ dovecot-2.3.21.1/m4/want_icu.m4
+@@ -1,7 +1,7 @@
+ AC_DEFUN([DOVECOT_WANT_ICU], [
+   if test "$want_icu" != "no"; then
+     if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
+-      PKG_CHECK_MODULES(LIBICU, icu-i18n)
++      PKG_CHECK_MODULES(LIBICU, icu-i18n icu-uc)
+       have_icu=yes
+       AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS])
+     elif test "$want_icu" = "yes"; then

dovecot23.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Nov 21 08:29:35 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add dovecot-link-icu76.patch: configure: Explicitly check for icu-uc
+  Ensure we link against libicu-uc when it's split in v76
+  (boo#1233582).
+- Call autoreconf in build section, as above patch touches the
+  build system.
+
 -------------------------------------------------------------------
 Wed Aug 14 19:09:12 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
 

dovecot23.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dovecot23
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -164,6 +164,8 @@ Patch1:         dovecot-2.3.0-better_ssl_defaults.patch
 Patch2:         fix-build-with-openssl-3.patch
 # PATCH-FIX-UPSTREAM - https://github.com/dovecot/core/commit/f0c1cf42ea78d22e2674b03fe65f0ee6545c5b99
 Patch3:         fix-strict-aliasing.patch
+# PATCH-FIX-UPSTREAM - https://github.com/dovecot/core/commit/1ccd5b54.patch
+Patch4:         dovecot-link-icu76.patch
 Summary:        IMAP and POP3 Server Written Primarily with Security in Mind
 License:        BSD-3-Clause AND LGPL-2.1-or-later AND MIT
 Group:          Productivity/Networking/Email/Servers
@@ -347,6 +349,7 @@ gzip -9v ChangeLog
 sed -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf
 
 %build
+autoreconf -fiv
 export CFLAGS="%{optflags}"
 %if %{with clucene}
 export CFLAGS="$CFLAGS -I%{_libdir}"