Contains fix for CVE-2025-30189 Changelog: https://github.com/dovecot/core/releases/tag/2.4.2
Signed-off-by: Gyorgy Sarvari <[email protected]> --- v2: add backported patch that fixes compilation error about missing libpcre2 libraries. ...1-lib-regex-remove-LIBPCRE_LIBS-from.patch | 26 +++++++++++++++++ .../dovecot/fix-musl-compilation.patch | 28 ------------------- .../{dovecot_2.4.1-4.bb => dovecot_2.4.2.bb} | 4 +-- 3 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch delete mode 100644 meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch rename meta-networking/recipes-support/dovecot/{dovecot_2.4.1-4.bb => dovecot_2.4.2.bb} (95%) diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch new file mode 100644 index 0000000000..b872587a88 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch @@ -0,0 +1,26 @@ +From fd3d65c65c778cf0a2fba6487c8d0eb30b6780b7 Mon Sep 17 00:00:00 2001 +From: Aki Tuomi <[email protected]> +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 <[email protected]> +--- + 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 \ diff --git a/meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch b/meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch deleted file mode 100644 index a09165e588..0000000000 --- a/meta-networking/recipes-support/dovecot/dovecot/fix-musl-compilation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 951e371b6e44e2051de83c9fe73c778858fa73a1 Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <[email protected]> -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 <[email protected]> ---- - 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> diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb b/meta-networking/recipes-support/dovecot/dovecot_2.4.2.bb similarity index 95% rename from meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb rename to meta-networking/recipes-support/dovecot/dovecot_2.4.2.bb index 40cf991ae1..e94306dd32 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.4.2.bb @@ -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"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122799): https://lists.openembedded.org/g/openembedded-devel/message/122799 Mute This Topic: https://lists.openembedded.org/mt/116906165/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
