Bump version number, update copyrights.

eclipse · Feb 28, 2018 · 5b2bf3d · 5b2bf3d
1 parent e6cbff0
commit 5b2bf3d
Show file tree

Hide file tree

Showing 67 changed files with 72 additions and 69 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(mosquitto)
 cmake_minimum_required(VERSION 2.8)
 # Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 1.4.14)
+set (VERSION 1.4.15)
 
 if (WIN32)
  execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,8 +1,11 @@
+1.4.15 - 20180228
+=================
+
 Security:
-- Fix CVE-xxxx-xxxx. If a SIGHUP is sent to the broker when there are no more
+- Fix CVE-2017-7652. If a SIGHUP is sent to the broker when there are no more
  file descriptors, then opening the configuration file will fail and security
  settings will be set back to their default values.
-- Fix CVE-xxxx-xxxx. Unauthenticated clients can cause excessive memory use by
+- Fix CVE-2017-7651. Unauthenticated clients can cause excessive memory use by
  setting "remaining length" to be a large value. This is now mitigated by
  limiting the size of remaining length to valid values. A "memory_limit"
  configuration option has also been added to allow the overall memory used by

diff --git a/client/client_shared.c b/client/client_shared.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014 Roger Light <[email protected]>
+Copyright (c) 2014-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/client/client_shared.h b/client/client_shared.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014 Roger Light <[email protected]>
+Copyright (c) 2014-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/client/pub_client.c b/client/pub_client.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/client/sub_client.c b/client/sub_client.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/config.mk b/config.mk
@@ -86,7 +86,7 @@ WITH_SOCKS:=yes
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=1.4.14
+VERSION=1.4.15
 TIMESTAMP:=$(shell date "+%F %T%z")
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.

diff --git a/installer/mosquitto-cygwin.nsi b/installer/mosquitto-cygwin.nsi
@@ -7,7 +7,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "mosquitto"
-!define VERSION 1.4.14
+!define VERSION 1.4.15
 OutFile "mosquitto-${VERSION}-install-cygwin.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"

diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "mosquitto"
-!define VERSION 1.4.14
+!define VERSION 1.4.15
 OutFile "mosquitto-${VERSION}-install-win32.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"

diff --git a/lib/cpp/mosquittopp.cpp b/lib/cpp/mosquittopp.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/cpp/mosquittopp.h b/lib/cpp/mosquittopp.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2013 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/logging_mosq.c b/lib/logging_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/logging_mosq.h b/lib/logging_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/memory_mosq.c b/lib/memory_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/messages_mosq.h b/lib/messages_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/mosquitto.c b/lib/mosquitto.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/mosquitto.h b/lib/mosquitto.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
@@ -45,7 +45,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 1
 #define LIBMOSQUITTO_MINOR 4
-#define LIBMOSQUITTO_REVISION 14
+#define LIBMOSQUITTO_REVISION 15
 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */
 #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION)
 

diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/mqtt3_protocol.h b/lib/mqtt3_protocol.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/net_mosq.c b/lib/net_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/net_mosq.h b/lib/net_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/read_handle.c b/lib/read_handle.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/read_handle.h b/lib/read_handle.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/read_handle_client.c b/lib/read_handle_client.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/read_handle_shared.c b/lib/read_handle_shared.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/send_client_mosq.c b/lib/send_client_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/send_mosq.c b/lib/send_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/send_mosq.h b/lib/send_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014 Roger Light <[email protected]>
+Copyright (c) 2014-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/socks_mosq.h b/lib/socks_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014 Roger Light <[email protected]>
+Copyright (c) 2014-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/srv_mosq.c b/lib/srv_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013,2014 Roger Light <[email protected]>
+Copyright (c) 2013-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/thread_mosq.c b/lib/thread_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2011-2014 Roger Light <[email protected]>
+Copyright (c) 2011-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/time_mosq.c b/lib/time_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013,2014 Roger Light <[email protected]>
+Copyright (c) 2013-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/time_mosq.h b/lib/time_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013,2014 Roger Light <[email protected]>
+Copyright (c) 2013-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/tls_mosq.c b/lib/tls_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013,2014 Roger Light <[email protected]>
+Copyright (c) 2013-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/tls_mosq.h b/lib/tls_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013,2014 Roger Light <[email protected]>
+Copyright (c) 2013-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/util_mosq.c b/lib/util_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/util_mosq.h b/lib/util_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/will_mosq.c b/lib/will_mosq.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/lib/will_mosq.h b/lib/will_mosq.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2010-2014 Roger Light <[email protected]>
+Copyright (c) 2010-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/set-version.sh b/set-version.sh
@@ -2,7 +2,7 @@
 
 MAJOR=1
 MINOR=4
-REVISION=14
+REVISION=15
 
 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
 

diff --git a/src/bridge.c b/src/bridge.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/conf.c b/src/conf.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/context.c b/src/context.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/database.c b/src/database.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/lib_load.h b/src/lib_load.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2012-2014 Roger Light <[email protected]>
+Copyright (c) 2012-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/logging.c b/src/logging.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/loop.c b/src/loop.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/mosquitto.c b/src/mosquitto.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/mosquitto_broker.h b/src/mosquitto_broker.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2014 Roger Light <[email protected]>
+Copyright (c) 2009-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/mosquitto_passwd.c b/src/mosquitto_passwd.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2012-2014 Roger Light <[email protected]>
+Copyright (c) 2012-2018 Roger Light <[email protected]>
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0