DANE: Fix 2 messages from queue case

[users/heiko/exim.git] / src / src / version.c

diff --git a/src/src/version.c b/src/src/version.c
index 6cddce6d89d7207305108ac700f3a9fc2f8d3432..118ebbdf2166710fc673c010e234256200a18e65 100644 (file)
--- a/src/src/version.c
+++ b/src/src/version.c
@@ -1,18 +1,16 @@
-/* $Cambridge: exim/src/src/version.c,v 1.29 2010/01/04 19:35:50 nm4 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2010 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Function for setting up the version string. */
 
 #include "exim.h"
 
-
-#define THIS_VERSION  "4.73"
+#include "version.h"
 
 
 /* The header file cnumber.h contains a single line containing the
@@ -41,9 +39,19 @@ sprintf() call is the gcc -Wall warns about a \0 in a format string. */
 version_cnumber = cnumber_buffer;
 version_cnumber_format = US"%d\0<<eximcnumber>>";
 sprintf(CS version_cnumber, CS version_cnumber_format, cnumber);
-version_string = US THIS_VERSION "\0<<eximversion>>";
+version_string = US EXIM_VERSION_STR "\0<<eximversion>>";
+
+#ifdef EXIM_BUILD_DATE_OVERRIDE
+/* Reproducible build support; build tooling should have given us something looking like
+ * "25-Feb-2017 20:15:40" in EXIM_BUILD_DATE_OVERRIDE based on $SOURCE_DATE_EPOCH in environ
+ * per <https://reproducible-builds.org/specs/source-date-epoch/>
+ */
+version_date = date_buffer;
+version_date[0] = 0;
+Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, sizeof(date_buffer));
 
-Ustrcpy(today, __DATE__);
+#else
+Ustrcpy(today, US __DATE__);
 if (today[4] == ' ') today[4] = '0';
 today[3] = today[6] = '-';
 
@@ -52,8 +60,9 @@ version_date[0] = 0;
 Ustrncat(version_date, today+4, 3);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);
-Ustrcat(version_date, " ");
-Ustrcat(version_date, __TIME__);
+Ustrcat(version_date, US" ");
+Ustrcat(version_date, US __TIME__);
+#endif
 }
 
 /* End of version.c */