postfix-2.12-20141214

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 7d568a39f31f61d47e94b9e44ce90fcaabbfe8db..cd8d5d5a36d73c8e88a680a5d9000a934d6a6089 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -21087,3 +21087,9 @@ Apologies for any names omitted.
 
        Shut up Clang unused assignment nag: global/mail_queue.h.
        sendmail/sendmail.c, smtpd/smtpd_proxy.c, smtp/smtp_sasl_proto.c.
+
+20141214
+
+        Bugfix (introduced: 20141212): typo in Clang function pointer
+        format check, making it a noop. Viktor Dukhovni. File: 
+        util/sys_defs.h.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index ec601d24a85fb2aecff3ecd06d34fadaf272026b..c579ef1426de6722b99ea08ba76316792478b510 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20141213"
+#define MAIL_RELEASE_DATE      "20141214"
 #define MAIL_VERSION_NUMBER    "2.12"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 55a6fdd6f00cf42e731681f553f5b37f01e82890..44ea370d7bcb0fdff298f6827517a772652e656f 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -1626,7 +1626,7 @@ typedef int pid_t;
 #if (__GNUC__ >= 3)                    /* XXX Rough estimate */
 #define PRINTFPTRLIKE(x,y) PRINTFLIKE(x,y)
 #elif defined(__clang__) && __has_attribute(__format__)
-#define PRINTFLIKE(x,y)        __attribute__ ((__format__ (__printf__, (x), (y))))
+#define PRINTFPTRLIKE(x,y) __attribute__ ((__format__ (__printf__, (x), (y))))
 #else
 #define PRINTFPTRLIKE(x,y)
 #endif