Prereq: "3.10.6" diff -ur --new-file /var/tmp/postfix-3.10.6/src/global/mail_version.h ./src/global/mail_version.h --- /var/tmp/postfix-3.10.6/src/global/mail_version.h 2025-11-25 12:18:20.000000000 -0500 +++ ./src/global/mail_version.h 2025-12-05 15:02:59.000000000 -0500 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20251125" -#define MAIL_VERSION_NUMBER "3.10.6" +#define MAIL_RELEASE_DATE "20251205" +#define MAIL_VERSION_NUMBER "3.10.7" #ifdef SNAPSHOT #define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -ur --new-file /var/tmp/postfix-3.10.6/HISTORY ./HISTORY --- /var/tmp/postfix-3.10.6/HISTORY 2025-11-25 14:45:54.000000000 -0500 +++ ./HISTORY 2025-12-05 15:02:01.000000000 -0500 @@ -29248,3 +29248,13 @@ Bugfix (defect introduced: Postfix 2.9, date: 20120307): segfault with duplicate parameter name in "postconf -X" or "postconf -#'. File: postconf/postconf_edit.c. + +20251205 + + Compatibility: recent Linux distributions have C compilers + with a built-in 'bool' type (size=1) that conflicts with + Postfix's bool (an alias for int, typically size=4). Postfix + 3.11 adopts the built-in bool type, but that change is too + large for the stable releases. Instead, the command "make + makefiles" will figure out how to make the compiler + backwards-compatible. File: makedefs. diff -ur --new-file /var/tmp/postfix-3.10.6/makedefs ./makedefs --- /var/tmp/postfix-3.10.6/makedefs 2025-02-17 12:41:56.000000000 -0500 +++ ./makedefs 2025-12-05 14:42:26.000000000 -0500 @@ -1235,6 +1235,25 @@ -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \ -Wunused -Wno-missing-braces -fno-common'} +# C23 introduces a built-in type 'bool' (size 1) which breaks past Postfix +# practice where 'bool' is an alias for 'int' (typically, size 4). +# Fortunately, -std=gnu17 works with both gcc and clang. +cat >makedefs.test.c <<'EOF' +/* This appears in mail_params.h */ +typedef int bool; +EOF + +if eval ${CC} ${CCARGS} -c makedefs.test.c >/dev/null 2>&1 +then + : No further action needed. +elif eval ${CC} -std=gnu17 ${CCARGS} -c makedefs.test.c >/dev/null 2>&1 +then + CCARGS="-std=gnu17 $CCARGS" +else + error 'Please specify "CC=..." or "CCARGS=..." option to disable C23 bool' +fi +rm -f makedefs.test.[co] + # Extract map type names from -DHAS_XXX compiler options. We avoid # problems with tr(1) range syntax by using enumerations instead, # and we don't try to figure out which awk versions have tolower().