From 5a565da82b26d60cdbf246a1da293ce2e7b114c1 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Tue, 22 Dec 2020 16:56:07 +0000
Subject: [PATCH] Bump version number. Update changelog and web pages.

---
 CMakeLists.txt                              |  2 +-
 ChangeLog.txt                               |  3 ++
 config.mk                                   |  2 +-
 include/mosquitto.h                         |  2 +-
 installer/mosquitto.nsi                     |  2 +-
 installer/mosquitto64.nsi                   |  2 +-
 set-version.sh                              |  2 +-
 snap/snapcraft.yaml                         |  2 +-
 www/pages/download.md                       |  8 +++---
 www/posts/2020/12/version-2-0-3-released.md |  2 +-
 www/posts/2020/12/version-2-0-4-released.md | 31 +++++++++++++++++++++
 11 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 www/posts/2020/12/version-2-0-4-released.md

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9167f9e5..187fd882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0042 NEW)
 
 project(mosquitto)
-set (VERSION 2.0.3)
+set (VERSION 2.0.4)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
 
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4d091abb..d65a9fa1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2.0.4 - 2020-12-22
+==================
+
 Broker:
 - Fix $SYS/broker/publish/messages/+ counters not being updated for QoS 1, 2
   messages. Closes #1968.
diff --git a/config.mk b/config.mk
index de328ea3..a807c606 100644
--- a/config.mk
+++ b/config.mk
@@ -125,7 +125,7 @@ WITH_XTREPORT=no
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto64.nsi
-VERSION=2.0.3
+VERSION=2.0.4
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.
 SOVERSION=1
diff --git a/include/mosquitto.h b/include/mosquitto.h
index 5d12e075..b2c15cc6 100644
--- a/include/mosquitto.h
+++ b/include/mosquitto.h
@@ -66,7 +66,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 2
 #define LIBMOSQUITTO_MINOR 0
-#define LIBMOSQUITTO_REVISION 3
+#define LIBMOSQUITTO_REVISION 4
 /* 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/installer/mosquitto.nsi b/installer/mosquitto.nsi
index 702a0a98..2498c845 100644
--- a/installer/mosquitto.nsi
+++ b/installer/mosquitto.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "Eclipse Mosquitto"
-!define VERSION 2.0.3
+!define VERSION 2.0.4
 OutFile "mosquitto-${VERSION}-install-windows-x86.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index b40ef29e..783c2e66 100644
--- a/installer/mosquitto64.nsi
+++ b/installer/mosquitto64.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "Eclipse Mosquitto"
-!define VERSION 2.0.3
+!define VERSION 2.0.4
 OutFile "mosquitto-${VERSION}-install-windows-x64.exe"
 
 !include "x64.nsh"
diff --git a/set-version.sh b/set-version.sh
index 11de2bda..a062b1ad 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -2,7 +2,7 @@
 
 MAJOR=2
 MINOR=0
-REVISION=3
+REVISION=4
 
 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3e7257bc..4730229a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mosquitto
-version: 2.0.3
+version: 2.0.4
 summary: Eclipse Mosquitto MQTT broker
 description: This is a message broker that supports version 5.0, 3.1.1, and 3.1 of the MQTT
     protocol.
diff --git a/www/pages/download.md b/www/pages/download.md
index 7436afda..fb141c5d 100644
--- a/www/pages/download.md
+++ b/www/pages/download.md
@@ -1,7 +1,7 @@
 <!--
 .. title: Download
 .. slug: download
-.. date: 2020-12-17 14:21:38 UTC
+.. date: 2020-12-22 16:52:38 UTC
 .. tags: tag
 .. category: category
 .. link: link
@@ -11,7 +11,7 @@
 
 # Source
 
-* [mosquitto-2.0.3.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.3.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.3.tar.gz.asc))
+* [mosquitto-2.0.4.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.4.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.4.tar.gz.asc))
 * [Git source code repository](https://github.com/eclipse/mosquitto) (github.com)
 
 Older downloads are available at [https://mosquitto.org/files/](../files/)
@@ -24,8 +24,8 @@ distributions.
 
 ## Windows
 
-* [mosquitto-2.0.3-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-2.0.3-install-windows-x64.exe) (64-bit build, Windows Vista and up, built with Visual Studio Community 2019)
-* [mosquitto-2.0.3-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-2.0.3-install-windows-x86.exe) (32-bit build, Windows Vista and up, built with Visual Studio Community 2019)
+* [mosquitto-2.0.4-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-2.0.4-install-windows-x64.exe) (64-bit build, Windows Vista and up, built with Visual Studio Community 2019)
+* [mosquitto-2.0.4-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-2.0.4-install-windows-x86.exe) (32-bit build, Windows Vista and up, built with Visual Studio Community 2019)
 
 Older installers can be found at [https://mosquitto.org/files/binary/](https://mosquitto.org/files/binary/).
 
diff --git a/www/posts/2020/12/version-2-0-3-released.md b/www/posts/2020/12/version-2-0-3-released.md
index 123a1c2a..aed11166 100644
--- a/www/posts/2020/12/version-2-0-3-released.md
+++ b/www/posts/2020/12/version-2-0-3-released.md
@@ -1,6 +1,6 @@
 <!--
 .. title: Version 2.0.3 released.
-.. slug: version-2-0-1-released
+.. slug: version-2-0-3-released
 .. date: 2020-12-17 14:22:16 UTC+00:00
 .. tags: Releases
 .. category:
diff --git a/www/posts/2020/12/version-2-0-4-released.md b/www/posts/2020/12/version-2-0-4-released.md
new file mode 100644
index 00000000..dcbc6b2a
--- /dev/null
+++ b/www/posts/2020/12/version-2-0-4-released.md
@@ -0,0 +1,31 @@
+<!--
+.. title: Version 2.0.4 released.
+.. slug: version-2-0-4-released
+.. date: 2020-12-17 14:22:16 UTC+00:00
+.. tags: Releases
+.. category:
+.. link:
+.. description:
+.. type: text
+-->
+
+Version 2.0.4 of Mosquitto has been released. This is a bugfix release.
+
+# Broker
+- Fix $SYS/broker/publish/messages/+ counters not being updated for QoS 1, 2
+  messages. Closes #1968.
+- `mosquitto_connect_bind_async()` and `mosquitto_connect_bind_v5()` should not
+  reset the bind address option if called with `bind_address == NULL`.
+- Fix dynamic security configuration possibly not being reloaded on Windows
+  only. Closes #1962.
+- Add more log messages for dynsec load/save error conditions.
+- Fix websockets connections blocking non-websockets connections on Windows.
+  Closes #1934.
+
+# Build
+- Fix man pages not being built when using CMake. Closes #1969.
+
+[#1934]: https://github.com/eclipse/mosquitto/issues/1934
+[#1962]: https://github.com/eclipse/mosquitto/issues/1962
+[#1968]: https://github.com/eclipse/mosquitto/issues/1968
+[#1969]: https://github.com/eclipse/mosquitto/issues/1969