summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch59
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch21
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch28
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch24
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch28
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb (renamed from meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb)15
6 files changed, 58 insertions, 117 deletions
diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
index 4fcfa48b99..abcf727a3b 100644
--- a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
+++ b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
@@ -16,58 +16,25 @@ Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
16 m4/ioloop.m4 | 9 +++------ 16 m4/ioloop.m4 | 9 +++------
17 2 files changed, 5 insertions(+), 10 deletions(-) 17 2 files changed, 5 insertions(+), 10 deletions(-)
18 18
19diff --git a/m4/glibc.m4 b/m4/glibc.m4 19--- ./m4/glibc.m4 2025-10-04 22:42:24.336965366 +0200
20index 5d722aa..ce088d3 100644 20+++ ./m4/glibc.m4 2025-10-04 22:47:30.578745494 +0200
21--- a/m4/glibc.m4 21@@ -2,7 +2,7 @@
22+++ b/m4/glibc.m4
23@@ -17,7 +17,7 @@ AC_DEFUN([DOVECOT_GLIBC], [
24 dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. 22 dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
25 dnl * It may also be broken in AIX. 23 dnl * It may also be broken in AIX.
26 AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ 24 AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
27- AC_TRY_RUN([ 25- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
28+ AC_TRY_LINK([ 26+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
29 #define _XOPEN_SOURCE 600 27 #define _XOPEN_SOURCE 600
30 #include <stdio.h> 28 #include <stdio.h>
31 #include <stdlib.h> 29 #include <stdlib.h>
32@@ -26,7 +26,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ 30--- ./m4/ioloop.m4.orig 2025-10-04 22:47:44.656705137 +0200
33 #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) 31+++ ./m4/ioloop.m4 2025-10-04 22:48:32.379618966 +0200
34 possibly broken posix_fallocate 32@@ -4,7 +4,7 @@
35 #endif
36- int main() {
37+ ], [
38 int fd = creat("conftest.temp", 0600);
39 int ret;
40 if (fd == -1) {
41@@ -35,8 +35,6 @@ AC_DEFUN([DOVECOT_GLIBC], [
42 }
43 ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0;
44 unlink("conftest.temp");
45- return ret;
46- }
47 ], [
48 i_cv_posix_fallocate_works=yes
49 ], [
50diff --git a/m4/ioloop.m4 b/m4/ioloop.m4
51index 0f7dde0..f40fd62 100644
52--- a/m4/ioloop.m4
53+++ b/m4/ioloop.m4
54@@ -4,13 +4,10 @@ AC_DEFUN([DOVECOT_IOLOOP], [
55 33
56 if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then 34 AS_IF([test "$ioloop" = "best" || test "$ioloop" = "epoll"], [
57 AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ 35 AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[
58- AC_TRY_RUN([ 36- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
59+ AC_TRY_LINK([ 37+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
60 #include <sys/epoll.h> 38 #include <sys/epoll.h>
61- 39 ]], [[
62- int main() 40 return epoll_create(5) < 1;
63- {
64- return epoll_create(5) < 1;
65- }
66+ ], [
67+ epoll_create(5) < 1;
68 ], [
69 i_cv_epoll_works=yes
70 ], [
71--
722.25.1
73
diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch
index ec7a26a329..697fc02193 100644
--- a/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch
+++ b/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch
@@ -14,17 +14,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 14
15diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4 15diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4
16index cadb62b..5517314 100644 16index cadb62b..5517314 100644
17--- a/m4/want_unwind.m4 17--- ./m4/want_unwind.m4 2025-10-04 22:57:09.371034202 +0200
18+++ b/m4/want_unwind.m4 18+++ ./m4/want_unwind.m4 2025-10-04 22:57:30.954794164 +0200
19@@ -2,7 +2,7 @@ AC_DEFUN([DOVECOT_WANT_UNWIND], [ 19@@ -2,7 +2,7 @@
20 have_libunwind=no 20 have_libunwind=no
21
21 AS_IF([test "$want_libunwind" != "no"], [ 22 AS_IF([test "$want_libunwind" != "no"], [
22 PKG_CHECK_EXISTS([libunwind], [ 23- PKG_CHECK_MODULES([LIBUNWIND], [libunwind-generic], [have_libunwind=yes], [
23- PKG_CHECK_MODULES([LIBUNWIND], [libunwind-generic],[ 24+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind], [have_libunwind=yes], [
24+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[ 25 have_libunwind=no
25 have_libunwind=yes 26
26 AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind]) 27 AS_IF([test "$want_libunwind" = "yes"], [
27 ])
28--
292.31.1
30
diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch
deleted file mode 100644
index af69c82f0f..0000000000
--- a/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 8c7d143ff28441c8b74b0f518dd2281239aede3d Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@cn.fujitsu.com>
3Date: Fri, 15 Jan 2021 11:10:22 +0900
4Subject: [PATCH] not check pandoc
5
6Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
7---
8Upstream-Status: Pending
9
10 m4/dovecot.m4 | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
14index 2b5d895..ece8489 100644
15--- a/m4/dovecot.m4
16+++ b/m4/dovecot.m4
17@@ -447,7 +447,7 @@ AC_DEFUN([DC_PANDOC], [
18 dnl Optional tool for making documentation
19 AC_CHECK_PROGS(PANDOC, [pandoc], [true])
20
21- AS_IF([test "$PANDOC" = "true"], [
22+ AS_IF([test "$PANDOC" = "false"], [
23 AS_IF([test ! -e README], [
24 AC_MSG_ERROR([Cannot produce documentation without pandoc - disable with PANDOC=false ./configure])
25 ])
26--
272.25.1
28
diff --git a/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch
deleted file mode 100644
index 0765d963c1..0000000000
--- a/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001
2From: fundawang <fundawang@yeah.net>
3Date: Sun, 27 Oct 2024 22:11:21 +0800
4Subject: [PATCH] configure: Explicitly check for icu-uc
5
6Ensure we link against libicu-uc when it's split in v76.
7
8Upstream-Status: Backport [https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 m4/want_icu.m4 | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14--- a/m4/want_icu.m4
15+++ b/m4/want_icu.m4
16@@ -1,7 +1,7 @@
17 AC_DEFUN([DOVECOT_WANT_ICU], [
18 if test "$want_icu" != "no"; then
19 if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
20- PKG_CHECK_MODULES(LIBICU, icu-i18n)
21+ PKG_CHECK_MODULES(LIBICU, [icu-i18n icu-uc])
22 have_icu=yes
23 AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS])
24 elif test "$want_icu" = "yes"; then
diff --git a/meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch b/meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch
new file mode 100644
index 0000000000..a09165e588
--- /dev/null
+++ b/meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch
@@ -0,0 +1,28 @@
1From 951e371b6e44e2051de83c9fe73c778858fa73a1 Mon Sep 17 00:00:00 2001
2From: Fabian Groffen <grobian@gentoo.org>
3Date: Sat, 31 May 2025 10:49:28 +0200
4Subject: [PATCH] lib: cpu-count - fix compilation using musl
5
6The macros, types and symbols CPU_* and cpuset_t are not exposed in
7musl's sched.h unless _GNU_SOURCE is set.
8
9Upstream-Status: Backport [https://github.com/dovecot/core/commit/951e371b6e44e2051de83c9fe73c778858fa73a1]
10
11Signed-off-by: Fabian Groffen <grobian@gentoo.org>
12---
13 src/lib/cpu-count.c | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/src/lib/cpu-count.c b/src/lib/cpu-count.c
17index 3eb38fa47d8..a3e80e6c157 100644
18--- a/src/lib/cpu-count.c
19+++ b/src/lib/cpu-count.c
20@@ -3,6 +3,8 @@
21
22 #ifdef HAVE_SCHED_H
23 # define __USE_GNU
24+/* _GNU_SOURCE: for musl's sched.h to expose cpuset/CPU_* */
25+# define _GNU_SOURCE
26 # include <sched.h>
27 # ifdef HAVE_SYS_CPUSET_H
28 # include <sys/cpuset.h>
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb b/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb
index 3177cdb1d7..a06fd45199 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb
@@ -1,19 +1,22 @@
1SUMMARY = "Dovecot is an open source IMAP and POP3 email server" 1SUMMARY = "Dovecot is an open source IMAP and POP3 email server"
2HOMEPAGE = "https://www.dovecot.org/" 2HOMEPAGE = "https://www.dovecot.org/"
3DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." 3DESCRIPTION = "Dovecot is an open source IMAP and POP3 email \
4server for Linux/UNIX-like systems, written with security primarily \
5in mind. Dovecot is an excellent choice for both small and large \
6installations. It's fast, simple to set up, requires no special \
7administration and it uses very little memory."
4SECTION = "mail" 8SECTION = "mail"
5LICENSE = "LGPL-2.1-only & MIT" 9LICENSE = "LGPL-2.1-only & MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" 10LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048"
7 11
8SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ 12SRC_URI = "http://dovecot.org/releases/2.4/dovecot-${PV}.tar.gz \
9 file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ 13 file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \
10 file://dovecot.service \ 14 file://dovecot.service \
11 file://dovecot.socket \ 15 file://dovecot.socket \
12 file://0001-not-check-pandoc.patch \
13 file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ 16 file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \
14 file://1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch \ 17 file://fix-musl-compilation.patch \
15 " 18 "
16SRC_URI[sha256sum] = "2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e" 19SRC_URI[sha256sum] = "fb188603f419ed7aaa07794a8692098c3ec2660bb9c67d0efe24948cbb32ae00"
17 20
18DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" 21DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native"
19CFLAGS += "-I${STAGING_INCDIR}/tirpc" 22CFLAGS += "-I${STAGING_INCDIR}/tirpc"
@@ -72,5 +75,3 @@ FILES:${PN} += "${libdir}/dovecot/*plugin.so \
72FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a" 75FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a"
73FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" 76FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so"
74FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" 77FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug"
75
76CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution."
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-09 23:04:43 +0000