Skip to content

Commit

Permalink
Bump version numbers, update webpage.
Browse files Browse the repository at this point in the history
  • Loading branch information
ralight committed Sep 17, 2019
1 parent fe3b73a commit 0bd40a0
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.1)
set (VERSION 1.6.2)

add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")

Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.6.2 - 201905xx
1.6.2 - 20190430
================

Broker:
Expand Down
2 changes: 1 addition & 1 deletion config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ WITH_COVERAGE:=no

# Also bump lib/mosquitto.h, CMakeLists.txt,
# installer/mosquitto.nsi, installer/mosquitto64.nsi
VERSION=1.6.1
VERSION=1.6.2

# Client library SO version. Bump if incompatible API/ABI changes are made.
SOVERSION=1
Expand Down
2 changes: 1 addition & 1 deletion installer/mosquitto.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'

Name "Eclipse Mosquitto"
!define VERSION 1.6.1
!define VERSION 1.6.2
OutFile "mosquitto-${VERSION}-install-windows-x86.exe"

InstallDir "$PROGRAMFILES\mosquitto"
Expand Down
2 changes: 1 addition & 1 deletion installer/mosquitto64.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'

Name "Eclipse Mosquitto"
!define VERSION 1.6.1
!define VERSION 1.6.2
OutFile "mosquitto-${VERSION}-install-windows-x64.exe"

!include "x64.nsh"
Expand Down
2 changes: 1 addition & 1 deletion lib/mosquitto.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extern "C" {

#define LIBMOSQUITTO_MAJOR 1
#define LIBMOSQUITTO_MINOR 6
#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)

Expand Down
2 changes: 1 addition & 1 deletion set-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MAJOR=1
MINOR=6
REVISION=1
REVISION=2

sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk

Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: mosquitto
version: 1.6.1
version: 1.6.2
summary: Eclipse Mosquitto MQTT broker
description: This is a message broker that supports version 3.1 and 3.1.1 of the MQTT
protocol.
Expand Down
8 changes: 4 additions & 4 deletions www/pages/download.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
.. title: Download
.. slug: download
.. date: 2019-04-26 16:41:00 UTC+1
.. date: 2019-04-30 13:12:00 UTC+1
.. tags: tag
.. category: category
.. link: link
Expand All @@ -11,7 +11,7 @@

# Source

* [mosquitto-1.6.1.tar.gz](https://mosquitto.org/files/source/mosquitto-1.6.1.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-1.6.1.tar.gz.asc))
* [mosquitto-1.6.2.tar.gz](https://mosquitto.org/files/source/mosquitto-1.6.2.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-1.6.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/)
Expand All @@ -24,8 +24,8 @@ distributions.

## Windows

* [mosquitto-1.6.1-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-1.6.1-install-windows-x64.exe) (~360 kB) (64-bit build, Windows Vista and up, built with Visual Studio Community 2017)
* [mosquitto-1.6.1-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-1.6.1-install-windows-x86.exe) (~360 kB) (32-bit build, Windows Vista and up, built with Visual Studio Community 2017)
* [mosquitto-1.6.2-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-1.6.2-install-windows-x64.exe) (~360 kB) (64-bit build, Windows Vista and up, built with Visual Studio Community 2017)
* [mosquitto-1.6.2-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-1.6.2-install-windows-x86.exe) (~360 kB) (32-bit build, Windows Vista and up, built with Visual Studio Community 2017)

See also readme-windows.txt after installing.

Expand Down
3 changes: 3 additions & 0 deletions www/pages/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ follow the steps on [Eclipse Security] page to report it.
Listed with most recent first. Further information on security related issues
can be found in the [security category].

* April 2019: No CVE assigned. Affecting versions **1.6** and **1.6.1**,
fixed in **1.6.2**. More details at [version-162-released].
* December 2018: [CVE-2018-20145]. Affecting versions **1.5** to **1.5.4**
inclusive, fixed in **1.5.5.**. More details at [version-155-released].
* November 2018: No CVE assigned. Affecting versions **1.4** to **1.5.3**
Expand All @@ -45,6 +47,7 @@ can be found in the [security category].
inclusive, fixed in **1.4.12**. More details at
[security-advisory-cve-2017-7650].

[version-162-released]: /2019/04/version-1-6-2-released/
[version-155-released]: /2018/11/version-155-released/
[version-154-released]: /2018/11/version-154-released/
[security-advisory-cve-2018-12543]: /2018/09/security-advisory-cve-2018-12543/
Expand Down
46 changes: 46 additions & 0 deletions www/posts/2019/04/version-1-6-2-released.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<!--
.. title: Version 1.6.2 released
.. slug: version-1-6-2-released
.. date: 2019-04-30 13:07:00 UTC+1
.. tags: Releases
.. category:
.. link:
.. description:
.. type: text
-->

This is a security and bugfix release.

## Security

If a client connects using MQTT v5, will a Will message that has MQTT v5
properties attached, and the very first Will property is one of `content-type`,
`correlation-data`, `payload-format-indicator`, or `response-topic`, then at
the point the client disconnects, the broker will attempt to read from freed
memory, resulting in a possible crash.


## Broker
- Fix memory access after free, leading to possible crash, when v5 client with
Will message disconnects, where the Will message has as its first property
one of `content-type`, `correlation-data`, `payload-format-indicator`, or
`response-topic`. Closes [#1244].
- Fix build for `WITH_TLS=no`. Closes [#1250].
- Fix Will message not allowing `user-property` properties.
- Fix broker originated messages (e.g. `$SYS/broker/version`) not being
published when `check_retain_source` set to true. Closes [#1245].
- Fix `$SYS/broker/version` being incorrectly expired after 60 seconds.
Closes [#1245].

## Library
- Fix crash after client has been unable to connect to a broker. This occurs
when the client is exiting and is part of the final library cleanup routine.
Closes [#1246].

## Clients
- Fix `-L` url parsing. Closes [#1248].

[#1244]: https://github.com/eclipse/mosquitto/issues/1244
[#1245]: https://github.com/eclipse/mosquitto/issues/1245
[#1246]: https://github.com/eclipse/mosquitto/issues/1246
[#1250]: https://github.com/eclipse/mosquitto/issues/1250

0 comments on commit 0bd40a0

Please sign in to comment.