From cc47eaba09d024fc76915f3fd42c364b7cf5b309 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 10 Dec 2020 23:37:57 +0000
Subject: [PATCH] Bump version number and update webpage.

---
 CMakeLists.txt                                  |  2 +-
 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                           |  4 ++--
 ...-1-released.md => version-2-0-2-released.md} | 17 +++++++++++------
 9 files changed, 20 insertions(+), 15 deletions(-)
 rename www/posts/2020/12/{version-2-0-1-released.md => version-2-0-2-released.md} (74%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4855b3ce..71da9768 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(mosquitto)
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 2.0.1)
+set (VERSION 2.0.2)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
diff --git a/config.mk b/config.mk
index aa6bc4c8..d64e2d00 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.1
+VERSION=2.0.2
 
 # 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 b935c615..abbc8c2d 100644
--- a/include/mosquitto.h
+++ b/include/mosquitto.h
@@ -59,7 +59,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 2
 #define LIBMOSQUITTO_MINOR 0
-#define LIBMOSQUITTO_REVISION 1
+#define LIBMOSQUITTO_REVISION 2
 /* 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 f2fbe9e6..1fa75ffb 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.1
+!define VERSION 2.0.2
 OutFile "mosquitto-${VERSION}-install-windows-x86.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index 03d20805..274dd7d6 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.1
+!define VERSION 2.0.2
 OutFile "mosquitto-${VERSION}-install-windows-x64.exe"
 
 !include "x64.nsh"
diff --git a/set-version.sh b/set-version.sh
index 2f86fbaf..e01b89df 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -2,7 +2,7 @@
 
 MAJOR=2
 MINOR=0
-REVISION=1
+REVISION=2
 
 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ddcf45ed..c0155181 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mosquitto
-version: 2.0.1
+version: 2.0.2
 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 378de4e7..d015405f 100644
--- a/www/pages/download.md
+++ b/www/pages/download.md
@@ -1,7 +1,7 @@
 <!--
 .. title: Download
 .. slug: download
-.. date: 2020-12-10 14:36:38 UTC
+.. date: 2020-12-10 23:34:38 UTC
 .. tags: tag
 .. category: category
 .. link: link
@@ -11,7 +11,7 @@
 
 # Source
 
-* [mosquitto-2.0.1.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.1.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.1.tar.gz.asc))
+* [mosquitto-2.0.2.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.2.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.2.tar.gz.asc))
 * [Git source code repository](https://github.com/eclipse/mosquitto) (github.com)
 
 Older downloads are available at [https://mosquitto.org/files/](../files/)
diff --git a/www/posts/2020/12/version-2-0-1-released.md b/www/posts/2020/12/version-2-0-2-released.md
similarity index 74%
rename from www/posts/2020/12/version-2-0-1-released.md
rename to www/posts/2020/12/version-2-0-2-released.md
index 71f32a9c..b5b8c071 100644
--- a/www/posts/2020/12/version-2-0-1-released.md
+++ b/www/posts/2020/12/version-2-0-2-released.md
@@ -1,6 +1,6 @@
 <!--
-.. title: Version 2.0.1 released.
-.. slug: version-2-0-1-released
+.. title: Version 2.0.2 released.
+.. slug: version-2-0-2-released
 .. date: 2020-12-10 14:33:16 UTC+00:00
 .. tags: Releases
 .. category:
@@ -9,7 +9,12 @@
 .. type: text
 -->
 
-Version 2.0.1 of Mosquitto has been released. This is a bugfix release.
+Version 2.0.2 and 2.0.1 of Mosquitto has been released. These are bugfix releases.
+
+Version 2.0.2 fixes a build regression introduced in 2.0.1 when websockets
+support was enabled on non-Linux systems.
+
+The 2.0.1 changes are below.
 
 # Broker
 - Fix websockets connections on Windows blocking subsequent connections.
@@ -19,14 +24,14 @@ Version 2.0.1 of Mosquitto has been released. This is a bugfix release.
 - Fix websockets listeners not causing the main loop not to wake up.
   Closes [#1936].
 
-Client library:
+# Client library
 - Fix DH group not being set for TLS connections, which meant ciphers using
   DHE couldn't be used. Closes [#1925]. Closes [#1476].
 
-Apps:
+# Apps
 - Fix `mosquitto_passwd -U`
 
-Build:
+# Build
 - Fix cjson include paths.
 - Fix build using WITH_TLS=no when the openssl headers aren't available.
 - Distribute cmake/ and snap/ directories in tar.