Rework SPA fix to avoid overflows. Bug 2571

[users/jgh/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 a2edbfe8ac011aa2485339bf74cd3016f370302d..c5931fc8d6c667bd1b692aed6b8889caaf151bf6 100644 (file)
--- a/src/exim_monitor/em_version.c
+++ b/src/exim_monitor/em_version.c
@@ -2,14 +2,20 @@
 *                  Exim Monitor                  *
 *************************************************/
 
 *                  Exim Monitor                  *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2017 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* See the file NOTICE for conditions of use and distribution. */
 

+#define EM_VERSION_C
+

 #include "mytypes.h"
 #include "mytypes.h"

+#include "store.h"

 #include "macros.h"
 #include <string.h>
 #include <stdlib.h>
 
 #include "macros.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,7 +27,17 @@ uschar today[20];
 
 version_string = US"2.06";
 
 
 version_string = US"2.06";
 

-Ustrcpy(today, __DATE__);
+#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, US __DATE__);

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


@@ -30,8 +46,9 @@ version_date[0] = 0;
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);
 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__);
+Ustrcat(version_date, US" ");
+Ustrcat(version_date, US __TIME__);
+#endif

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