You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

56 lines
2.3 KiB

  1. diff --git a/config.mk b/config.mk
  2. index bfaa208..2a3e2bf 100644
  3. --- a/config.mk
  4. +++ b/config.mk
  5. @@ -87,7 +87,6 @@ WITH_SOCKS:=yes
  6. # Also bump lib/mosquitto.h, CMakeLists.txt,
  7. # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
  8. VERSION=1.4.15
  9. -TIMESTAMP:=$(shell date "+%F %T%z")
  10. # Client library SO version. Bump if incompatible API/ABI changes are made.
  11. SOVERSION=1
  12. @@ -115,7 +114,7 @@ LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
  13. LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
  14. LIB_LDFLAGS:=${LDFLAGS}
  15. -BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
  16. +BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER
  17. CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
  18. ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD)),)
  19. diff --git a/src/conf.c b/src/conf.c
  20. index 25d80a6..9ab0599 100644
  21. --- a/src/conf.c
  22. +++ b/src/conf.c
  23. @@ -338,7 +338,7 @@ void mqtt3_config_cleanup(struct mqtt3_config *config)
  24. static void print_usage(void)
  25. {
  26. - printf("mosquitto version %s (build date %s)\n\n", VERSION, TIMESTAMP);
  27. + printf("mosquitto version %s\n\n", VERSION);
  28. printf("mosquitto is an MQTT v3.1.1/v3.1 broker.\n\n");
  29. printf("Usage: mosquitto [-c config_file] [-d] [-h] [-p port]\n\n");
  30. printf(" -c : specify the broker config file.\n");
  31. diff --git a/src/mosquitto.c b/src/mosquitto.c
  32. index 22b6372..b581f45 100644
  33. --- a/src/mosquitto.c
  34. +++ b/src/mosquitto.c
  35. @@ -291,7 +291,7 @@ int main(int argc, char *argv[])
  36. rc = 1;
  37. return rc;
  38. }
  39. - _mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "mosquitto version %s (build date %s) starting", VERSION, TIMESTAMP);
  40. + _mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "mosquitto version %s starting", VERSION);
  41. if(int_db.config_file){
  42. _mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "Config loaded from %s.", int_db.config_file);
  43. }else{
  44. @@ -308,8 +308,6 @@ int main(int argc, char *argv[])
  45. /* Set static $SYS messages */
  46. snprintf(buf, 1024, "mosquitto version %s", VERSION);
  47. mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/version", 2, strlen(buf), buf, 1);
  48. - snprintf(buf, 1024, "%s", TIMESTAMP);
  49. - mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/timestamp", 2, strlen(buf), buf, 1);
  50. }
  51. #endif