diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2026-05-09 14:12:25 +0800 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-05-12 01:10:18 -0700 |
| commit | 58a491cdac1c925412d0d6cac614da3dca740ccd (patch) | |
| tree | be1d9bed677e39f70b4002f195b0a3a8056cdbb3 | |
| parent | e65e1a81e412421d6349f9ab1ef368c5c7ff84d1 (diff) | |
| download | meta-openembedded-58a491cdac1c925412d0d6cac614da3dca740ccd.tar.gz | |
postfix: upgrade 3.10.8 -> 3.10.9
Security fix: CVE-2026-43964
Add a patch to fix build with musl.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch | 50 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix_3.10.9.bb (renamed from meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb) | 3 |
2 files changed, 52 insertions, 1 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch new file mode 100644 index 0000000000..d09418eaac --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From cbe5ba0deeba6329eed63eade06bb8c062d0d445 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Fri, 8 May 2026 22:39:54 +0800 | ||
| 4 | Subject: [PATCH] Fix build with musl | ||
| 5 | |||
| 6 | Guard glibc-specific version check with __GLIBC__ macro. When building | ||
| 7 | with musl, __GLIBC__ is not defined, so the preprocessor previously fell | ||
| 8 | through to the #else branch and defined NO_SNPRINTF, causing a build | ||
| 9 | error: | ||
| 10 | |||
| 11 | vbuf_print.c: In function 'vbuf_print': | ||
| 12 | vbuf_print.c:208:46: error: macro 'VBUF_SNPRINTF' passed 5 arguments, but takes just 4 | ||
| 13 | 208 | VSTRING_ADDNUM(fmt, width); | ||
| 14 | | ^ | ||
| 15 | vbuf_print.c:126:9: note: macro 'VBUF_SNPRINTF' defined here | ||
| 16 | 126 | #define VBUF_SNPRINTF(bp, sz, fmt, arg) do { \ | ||
| 17 | | ^~~~~~~~~~~~~ | ||
| 18 | |||
| 19 | Wrap the entire block in #ifdef __GLIBC__ so that neither branch | ||
| 20 | is entered on musl. | ||
| 21 | |||
| 22 | Upstream-Status: Pending | ||
| 23 | |||
| 24 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 25 | --- | ||
| 26 | src/util/sys_defs.h | 2 ++ | ||
| 27 | 1 file changed, 2 insertions(+) | ||
| 28 | |||
| 29 | diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h | ||
| 30 | index 74319f2..6d3c7d2 100644 | ||
| 31 | --- a/src/util/sys_defs.h | ||
| 32 | +++ b/src/util/sys_defs.h | ||
| 33 | @@ -794,12 +794,14 @@ extern int initgroups(const char *, int); | ||
| 34 | #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" | ||
| 35 | #define NATIVE_COMMAND_DIR "/usr/sbin" | ||
| 36 | #define NATIVE_DAEMON_DIR "/usr/libexec/postfix" | ||
| 37 | +#ifdef __GLIBC__ | ||
| 38 | #if HAVE_GLIBC_API_VERSION_SUPPORT(2, 1) | ||
| 39 | #define SOCKADDR_SIZE socklen_t | ||
| 40 | #define SOCKOPT_SIZE socklen_t | ||
| 41 | #else | ||
| 42 | #define NO_SNPRINTF | ||
| 43 | #endif | ||
| 44 | +#endif | ||
| 45 | #ifndef NO_IPV6 | ||
| 46 | #define HAS_IPV6 | ||
| 47 | #if HAVE_GLIBC_API_VERSION_SUPPORT(2, 4) | ||
| 48 | -- | ||
| 49 | 2.34.1 | ||
| 50 | |||
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb b/meta-networking/recipes-daemons/postfix/postfix_3.10.9.bb index 6b82c04fbe..633e4a7a0d 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.10.9.bb | |||
| @@ -27,9 +27,10 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P | |||
| 27 | file://0004-Fix-icu-config.patch \ | 27 | file://0004-Fix-icu-config.patch \ |
| 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ | 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ |
| 29 | file://0001-makedefs-Account-for-linux-7.x-version.patch \ | 29 | file://0001-makedefs-Account-for-linux-7.x-version.patch \ |
| 30 | file://0001-Fix-build-with-musl.patch \ | ||
| 30 | " | 31 | " |
| 31 | 32 | ||
| 32 | SRC_URI[sha256sum] = "31d4b3eb8093d823b5a151f571719ff7c0462571bc95e6440d87ca525bfb096c" | 33 | SRC_URI[sha256sum] = "d4b4daab0af2e0c16c0d2d5ac3c7680d5ebd2001ea054f7f2a601c759801bc13" |
| 33 | 34 | ||
| 34 | UPSTREAM_CHECK_URI = "https://www.postfix.org/announcements.html" | 35 | UPSTREAM_CHECK_URI = "https://www.postfix.org/announcements.html" |
| 35 | UPSTREAM_CHECK_REGEX = "postfix-(?P<pver>\d+(\.\d+)+)" | 36 | UPSTREAM_CHECK_REGEX = "postfix-(?P<pver>\d+(\.\d+)+)" |
