From: Wietse Z Venema <wietse@porcupine.org>
Date: Fri, 5 Dec 2025 05:00:00 +0000 (-0500)
Subject: postfix-3.10.7
X-Git-Tag: v3.10.7^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fpostfix-3.10;p=thirdparty%2Fpostfix.git

postfix-3.10.7
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 901ddb50c..4f503943d 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -29248,3 +29248,13 @@ Apologies for any names omitted.
 	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 --git a/postfix/makedefs b/postfix/makedefs
index a740e41ea..6f6b64662 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -1235,6 +1235,25 @@ ${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \
 	-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().
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 5aff5abd6..8223e29d3 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -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