Merge branch 'bug/2390-tmpfile-race'

[users/heiko/exim.git] / src / exim_monitor / em_version.c

diff --git a/src/exim_monitor/em_version.c b/src/exim_monitor/em_version.c
index 871fbf199d72591eb969e11640fdbf93ff71e3a1..ff9ac5c58578320904e2184fe5fb23856f1170b3 100644 (file)
--- a/src/exim_monitor/em_version.c
+++ b/src/exim_monitor/em_version.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_version.c,v 1.4 2007/01/08 10:50:17 ph10 Exp $ */
-

 /*************************************************
 *                  Exim Monitor                  *
 *************************************************/
 
 /*************************************************
 *                  Exim Monitor                  *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2007 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "mytypes.h"
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "mytypes.h"


@@ -12,6 +10,8 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

+#include "version.h"
+

 extern uschar *version_string;
 extern uschar *version_date;
 
 extern uschar *version_string;
 extern uschar *version_date;
 


@@ -21,19 +21,30 @@ version_init(void)
 int i = 0;
 uschar today[20];
 
 int i = 0;
 uschar today[20];
 

-version_string = US"2.05";
+version_string = US"2.06";
+
+#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 = US malloc(32);
+version_date[0] = 0;
+Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, 31);

 
 

+#else

 Ustrcpy(today, __DATE__);
 if (today[4] == ' ') i = 1;
 today[3] = today[6] = '-';
 
 Ustrcpy(today, __DATE__);
 if (today[4] == ' ') i = 1;
 today[3] = today[6] = '-';
 

-version_date = (uschar *)malloc(32);
+version_date = US malloc(32);

 version_date[0] = 0;
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);
 Ustrcat(version_date, " ");
 Ustrcat(version_date, __TIME__);
 version_date[0] = 0;
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);
 Ustrcat(version_date, " ");
 Ustrcat(version_date, __TIME__);

+#endif

 }
 
 /* End of em_version.c */
 }
 
 /* End of em_version.c */