dovecot: upgrade 2.4.1-4 -> 2.4.2

Contains fix for CVE-2025-30189

Changelog: https://github.com/dovecot/core/releases/tag/2.4.2

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gyorgy Sarvari 2025-12-22 20:18:04 +01:00 committed by Khem Raj
parent c0fb020740
commit d02f259dd4
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 28 additions and 30 deletions

View File

@ -0,0 +1,26 @@
From fd3d65c65c778cf0a2fba6487c8d0eb30b6780b7 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 31 Oct 2025 12:53:33 +0200
Subject: [PATCH] lib-regex: Remove LIBPCRE_LIBS from test dependencies
Was accidentically added in 49ae6e798310e5c4b96709db435a3714ea6468a8
Upstream-Status: Backport [https://github.com/dovecot/core/commit/fd3d65c65c778cf0a2fba6487c8d0eb30b6780b7]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
src/lib-regex/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib-regex/Makefile.am b/src/lib-regex/Makefile.am
index 60f43d9779..9d26d27fa1 100644
--- a/src/lib-regex/Makefile.am
+++ b/src/lib-regex/Makefile.am
@@ -34,7 +34,7 @@ test_regex_LDADD = libdregex.la \
../lib-test/libtest.la \
../lib/liblib.la \
$(LIBPCRE_LIBS)
-test_regex_DEPENDENCIES = libdregex.la $(LIBPCRE_LIBS)
+test_regex_DEPENDENCIES = libdregex.la
check-local:
for bin in $(test_programs); do \

View File

@ -1,28 +0,0 @@
From 951e371b6e44e2051de83c9fe73c778858fa73a1 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 31 May 2025 10:49:28 +0200
Subject: [PATCH] lib: cpu-count - fix compilation using musl
The macros, types and symbols CPU_* and cpuset_t are not exposed in
musl's sched.h unless _GNU_SOURCE is set.
Upstream-Status: Backport [https://github.com/dovecot/core/commit/951e371b6e44e2051de83c9fe73c778858fa73a1]
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---
src/lib/cpu-count.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/cpu-count.c b/src/lib/cpu-count.c
index 3eb38fa47d8..a3e80e6c157 100644
--- a/src/lib/cpu-count.c
+++ b/src/lib/cpu-count.c
@@ -3,6 +3,8 @@
#ifdef HAVE_SCHED_H
# define __USE_GNU
+/* _GNU_SOURCE: for musl's sched.h to expose cpuset/CPU_* */
+# define _GNU_SOURCE
# include <sched.h>
# ifdef HAVE_SYS_CPUSET_H
# include <sys/cpuset.h>

View File

@ -14,9 +14,9 @@ SRC_URI = "http://dovecot.org/releases/2.4/dovecot-${PV}.tar.gz \
file://dovecot.service \
file://dovecot.socket \
file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \
file://fix-musl-compilation.patch \
file://0001-lib-regex-remove-LIBPCRE_LIBS-from.patch \
"
SRC_URI[sha256sum] = "fb188603f419ed7aaa07794a8692098c3ec2660bb9c67d0efe24948cbb32ae00"
SRC_URI[sha256sum] = "2cd62e4d22b9fc1c80bd38649739950f0dbda34fbc3e62624fb6842264e93c6e"
DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native"
CFLAGS += "-I${STAGING_INCDIR}/tirpc"