moparisthebest
/
socat
mirror of https://github.com/moparisthebest/socat
1
0
Fork 0
Code Issues Releases Wiki Activity

Debian Bug 764251: Set the build timestamp to a deterministic time

This commit is contained in:
Gerhard Rieger 2015-01-04 20:22:13 +01:00
parent 6f6d7ccb86
commit 3ee5ac5275
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -97,6 +97,10 @@ porting:
broke cross compiling. The particular check gets reverted. broke cross compiling. The particular check gets reverted.
Thanks to Ross Burton and Danomi Manchego for reporting this issue. Thanks to Ross Burton and Danomi Manchego for reporting this issue.
Debian Bug#764251: Set the build timestamp to a deterministic time:
support external BUILD_DATE env var to allow to build reproducable
binaries
testing: testing:
Do not distribute testcert.conf with socat source but generate it Do not distribute testcert.conf with socat source but generate it
(and new testcert6.conf) during test.sh run. (and new testcert6.conf) during test.sh run.

2
config.h.in
View File

@ -584,4 +584,6 @@
#undef WITH_MSGLEVEL #undef WITH_MSGLEVEL
#define BUILD_DATE __DATE__ " " __TIME__
#endif /* !defined(__config_h_included) */ #endif /* !defined(__config_h_included) */

7
configure.in
View File

@ -1863,4 +1863,11 @@ if test -n "$WITH_FIPS"; then
fi fi
AC_SUBST(FIPSLD_CC) AC_SUBST(FIPSLD_CC)
# allow BUILD_DATE to be externally set for build reproducibility
if test "$BUILD_DATE"; then
AC_DEFINE_UNQUOTED(BUILD_DATE, ["$BUILD_DATE"])
else
AC_DEFINE(BUILD_DATE, [__DATE__" "__TIME__])
fi
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)

2
socat.c
View File

@ -70,7 +70,7 @@ static int socat_newchild(void);
static const char socatversion[] = static const char socatversion[] =
#include "./VERSION" #include "./VERSION"
; ;
static const char timestamp[] = __DATE__" "__TIME__; static const char timestamp[] = BUILD_DATE;
const char copyright_socat[] = "socat by Gerhard Rieger - see www.dest-unreach.org"; const char copyright_socat[] = "socat by Gerhard Rieger - see www.dest-unreach.org";
#if WITH_OPENSSL #if WITH_OPENSSL