From 55833eb9fb1bf602158d26fffb982a5f0345f77e Mon Sep 17 00:00:00 2001 From: fpagliughi Date: Tue, 24 Jun 2025 18:04:23 -0400 Subject: [PATCH] Bumped version to v1.5.4 --- CHANGELOG.md | 7 +++++++ CMakeLists.txt | 2 +- README.md | 6 +++--- dist/paho-cpp.spec | 2 +- include/mqtt/async_client.h | 8 ++++---- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 098a462..f243838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +- Fixed `topic_matcher` and `topic_filter` to properly match parent with multi-level ('#') wildcard. +- Slight optimization of `topic_filter` to do simple string comparison if the filter does not contain wildcards. +- [#556](https://github.com/eclipse-paho/paho.mqtt.cpp/pull/556) fix potential deadlock in `thread_queue` on capacity increase. +- [#559](https://github.com/eclipse-paho/paho.mqtt.cpp/pull/559) prevent undefined behaviour on empty topic matching + ## [Version 1.5.3](https://github.com/eclipse/paho.mqtt.cpp/compare/v1.5.2..v1.5.3) (2025-05-15) - Fix the bundled Paho C build foc C23 compilers by forcing C99 compliance in CMake build diff --git a/CMakeLists.txt b/CMakeLists.txt index 79ec8a1..33658ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 3.13) -project(PahoMqttCpp VERSION "1.5.3") +project(PahoMqttCpp VERSION "1.5.4") ## --- Build options --- diff --git a/README.md b/README.md index a032922..78ac016 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The primary changes in the v1.5 versions are: - Fix a large number of CMake build issues - Updated the GitHub CI - (v1.5.3) Fixes for building this library and the Paho C library with the latest C & C++ compilers, like Clang 20 and GCC 15 which created some breaking hcanges for legacy code. - +- (v1.5.4) Fixes for `topic_matcher` and `topic_filter` to match against parent with the multi-field wildcard. For the full list of updates in each release, see the [CHANGELOG](https://github.com/eclipse-paho/paho.mqtt.cpp/blob/master/CHANGELOG.md). @@ -102,7 +102,7 @@ This requires the CMake option `PAHO_WITH_MQTT_C` set. ``` $ git clone https://github.com/eclipse/paho.mqtt.cpp $ cd paho.mqtt.cpp -$ git co v1.5.3 +$ git co v1.5.4 $ git submodule init $ git submodule update @@ -175,7 +175,7 @@ If the Paho C library is not already installed, the recommended version can be b $ git clone https://github.com/eclipse/paho.mqtt.cpp $ cd paho.mqtt.cpp - $ git co v1.5.3 + $ git co v1.5.4 $ git submodule init $ git submodule update diff --git a/dist/paho-cpp.spec b/dist/paho-cpp.spec index 671433c..079af89 100644 --- a/dist/paho-cpp.spec +++ b/dist/paho-cpp.spec @@ -1,6 +1,6 @@ Summary: MQTT CPP Client Name: paho-cpp -Version: 1.5.3 +Version: 1.5.4 Release: 0%{?dist} License: Eclipse Eclipse Public License 2.0 and Distribution License 1.0 Group: Development/Tools diff --git a/include/mqtt/async_client.h b/include/mqtt/async_client.h index 99f065d..adf1a91 100644 --- a/include/mqtt/async_client.h +++ b/include/mqtt/async_client.h @@ -65,16 +65,16 @@ namespace mqtt { #if defined(PAHO_MQTTPP_VERSIONS) /** The version number for the client library. */ -const uint32_t PAHO_MQTTPP_VERSION = 0x01050003; +const uint32_t PAHO_MQTTPP_VERSION = 0x01050004; /** The version string for the client library */ -const string PAHO_MQTTPP_VERSION_STR("Paho MQTT C++ (mqttpp) v. 1.5.3"); +const string PAHO_MQTTPP_VERSION_STR("Paho MQTT C++ (mqttpp) v. 1.5.4"); /** Copyright notice for the client library */ const string PAHO_MQTTPP_COPYRIGHT("Copyright (c) 2013-2025 Frank Pagliughi"); #else /** The version number for the client library. */ -const uint32_t VERSION = 0x01050003; +const uint32_t VERSION = 0x01050004; /** The version string for the client library */ -const string VERSION_STR("Paho MQTT C++ (mqttpp) v. 1.5.3"); +const string VERSION_STR("Paho MQTT C++ (mqttpp) v. 1.5.4"); /** Copyright notice for the client library */ const string COPYRIGHT("Copyright (c) 2013-2025 Frank Pagliughi"); #endif