From e0c85bdc33b7df06a03607c1df704a402630592e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 22 Nov 2024 18:10:28 -0800 Subject: [PATCH] dovecot: Upgrade to 2.3.21.1 Fix build with icu-76.x while here Signed-off-by: Khem Raj --- ...5b54a408d12fce0c94ab0bbaedbb5ef69830.patch | 24 +++++++++++++++++++ ...{dovecot_2.3.21.bb => dovecot_2.3.21.1.bb} | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch rename meta-networking/recipes-support/dovecot/{dovecot_2.3.21.bb => dovecot_2.3.21.1.bb} (95%) diff --git a/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch new file mode 100644 index 0000000000..0765d963c1 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch @@ -0,0 +1,24 @@ +From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001 +From: fundawang +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. + +Upstream-Status: Backport [https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830] +Signed-off-by: Khem Raj +--- + m4/want_icu.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/m4/want_icu.m4 ++++ b/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 diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb similarity index 95% rename from meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb rename to meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb index 4e76d24526..3177cdb1d7 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb @@ -11,8 +11,9 @@ SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ file://dovecot.socket \ file://0001-not-check-pandoc.patch \ file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ + file://1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch \ " -SRC_URI[sha256sum] = "05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d" +SRC_URI[sha256sum] = "2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e" DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" CFLAGS += "-I${STAGING_INCDIR}/tirpc"