d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove build timestamp information for reproducible builds.

Browse Source
This commit is contained in:
Roger A. Light 2018-01-12 13:41:09 +00:00
parent 2cd553c883
commit 2283585e39
7 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -13,15 +13,7 @@ cmake_minimum_required(VERSION 2.8)
set (VERSION 1.4.90)
if (WIN32)
execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
OUTPUT_STRIP_TRAILING_WHITESPACE)
else (WIN32)
execute_process(COMMAND date "+%F %T%z" OUTPUT_VARIABLE TIMESTAMP
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif (WIN32)
add_definitions (-DCMAKE -DVERSION=\"${VERSION}\" -DTIMESTAMP=\"${TIMESTAMP}\")
add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
if (WIN32)
set (BINDIR .)

2
ChangeLog.txt
View File

@ -42,6 +42,8 @@ Broker:
- When using the include_dir configuration option sort the files
alphabetically before loading them. Closes #17.
- IPv6 is no longer disabled for websockets listeners.
- Remove all build timestamp information including $SYS/broker/timestamp.
Close #651.
Client library:
- Outgoing messages with QoS>1 are no longer retried after a timeout period.

3
config.mk
View File

@ -108,7 +108,6 @@ SOVERSION=1
XSLTPROC=xsltproc
# For html generation
DB_HTML_XSL=man/html.xsl
TIMESTAMP:=$(shell date "+%F %T%z")
#MANCOUNTRIES=en_GB
@ -128,7 +127,7 @@ LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
LIB_LDFLAGS:=${LDFLAGS}
BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER
CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD)),)

12
man/mosquitto.8.xml
View File

@ -343,18 +343,6 @@
<para>The total number of subscriptions active on the broker.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>$SYS/broker/timestamp</option></term>
<listitem>
<para>The timestamp at which this particular build of the broker was made. Static.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>$SYS/broker/uptime</option></term>
<listitem>
<para>The amount of time in seconds the broker has been online.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>$SYS/broker/version</option></term>
<listitem>

2
src/conf.c
View File

@ -331,7 +331,7 @@ void config__cleanup(struct mosquitto__config *config)
static void print_usage(void)
{
printf("mosquitto version %s (build date %s)\n\n", VERSION, TIMESTAMP);
printf("mosquitto version %s\n\n", VERSION);
printf("mosquitto is an MQTT v3.1.1 broker.\n\n");
printf("Usage: mosquitto [-c config_file] [-d] [-h] [-p port]\n\n");
printf(" -c : specify the broker config file.\n");

2
src/mosquitto.c
View File

@ -268,7 +268,7 @@ int main(int argc, char *argv[])
rc = 1;
return rc;
}
log__printf(NULL, MOSQ_LOG_INFO, "mosquitto version %s (build date %s) starting", VERSION, TIMESTAMP);
log__printf(NULL, MOSQ_LOG_INFO, "mosquitto version %s starting", VERSION);
if(config.config_file){
log__printf(NULL, MOSQ_LOG_INFO, "Config loaded from %s.", config.config_file);
}else{

2
src/sys_tree.c
View File

@ -53,8 +53,6 @@ void sys_tree__init(struct mosquitto_db *db)
/* Set static $SYS messages */
snprintf(buf, 64, "mosquitto version %s", VERSION);
db__messages_easy_queue(db, NULL, "$SYS/broker/version", SYS_TREE_QOS, strlen(buf), buf, 1);
snprintf(buf, 64, "%s", TIMESTAMP);
db__messages_easy_queue(db, NULL, "$SYS/broker/timestamp", SYS_TREE_QOS, strlen(buf), buf, 1);
}
static void sys_tree__update_clients(struct mosquitto_db *db, char *buf)