Skip to content

Commit 90790ba

Browse files
dgarskedgarske
authored
Merge pull request #416 from embhorn/v1.19.2_relprep
v1.19.2 release prep
2 parents 7e701ba + 781ccd3 commit 90790ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+97
-89
lines changed

‎.github/workflows/cifuzz.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
dry-run: false
2121
language: c
2222
- name: Upload Crash
23-
uses: actions/upload-artifact@v3
23+
uses: actions/upload-artifact@v4
2424
if: failure() && steps.build.outcome == 'success'
2525
with:
2626
name: artifacts

‎.github/workflows/zephyr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
133133
- name: Upload failure logs
134134
if: ${{ failure() && (steps.client-test.outcome == 'failure' || steps.client-tls-test.outcome == 'failure') }}
135-
uses: actions/upload-artifact@v3
135+
uses: actions/upload-artifact@v4
136136
with:
137137
name: zephyr-client-test-logs
138138
path: logs.zip

‎CMakeLists.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
cmake_minimum_required(VERSION 3.16)
2323

24-
project(wolfMQTT VERSION 1.19.1 LANGUAGES C)
24+
project(wolfMQTT VERSION 1.19.2 LANGUAGES C)
2525
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2626

2727
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/functions.cmake)
@@ -39,38 +39,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static on
3939
add_library(wolfmqtt ${MQTT_SOURCES})
4040

4141

42-
if (WITH_WOLFSSL)
43-
target_link_libraries(wolfmqtt PUBLIC wolfssl)
44-
target_include_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/include)
45-
target_link_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/lib)
46-
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
47-
elseif (WITH_WOLFSSL_TREE)
48-
set(WOLFSSL_EXAMPLES "no" CACHE STRING "")
49-
set(WOLFSSL_CRYPT_TESTS "no" CACHE STRING "")
50-
51-
add_subdirectory(${WITH_WOLFSSL_TREE} wolfssl)
52-
target_link_libraries(wolfmqtt PUBLIC wolfssl)
53-
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
54-
else()
55-
find_package(PkgConfig)
56-
pkg_check_modules(WOLFSSL wolfssl)
57-
58-
if (WOLFSSL_FOUND)
59-
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
60-
target_link_libraries(wolfmqtt PUBLIC ${WOLFSSL_LIBRARIES})
61-
target_include_directories(wolfmqtt PUBLIC ${WOLFSSL_INCLUDE_DIRS})
62-
target_link_directories(wolfmqtt PUBLIC ${WOLFSSL_LIBRARY_DIRS})
63-
target_compile_options(wolfmqtt PUBLIC ${WOLFSSL_CFLAGS_OTHER})
64-
else()
65-
# For support with vcpkg
66-
find_package(wolfssl CONFIG REQUIRED)
67-
if (wolfssl_FOUND)
68-
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
69-
target_link_libraries(wolfmqtt PUBLIC wolfssl::wolfssl)
70-
endif()
71-
endif()
72-
endif()
73-
7442

7543
set(WOLFMQTT_EXAMPLES "yes" CACHE BOOL
7644
"Build examples")
@@ -88,6 +56,38 @@ add_option(WOLFMQTT_TLS
8856
"Enable TLS support with wolfSSL"
8957
"yes" "yes;no")
9058
if (WOLFMQTT_TLS)
59+
if (WITH_WOLFSSL)
60+
target_link_libraries(wolfmqtt PUBLIC wolfssl)
61+
target_include_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/include)
62+
target_link_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/lib)
63+
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
64+
elseif (WITH_WOLFSSL_TREE)
65+
set(WOLFSSL_EXAMPLES "no" CACHE STRING "")
66+
set(WOLFSSL_CRYPT_TESTS "no" CACHE STRING "")
67+
68+
add_subdirectory(${WITH_WOLFSSL_TREE} wolfssl)
69+
target_link_libraries(wolfmqtt PUBLIC wolfssl)
70+
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
71+
else()
72+
find_package(PkgConfig)
73+
pkg_check_modules(WOLFSSL wolfssl)
74+
75+
if (WOLFSSL_FOUND)
76+
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
77+
target_link_libraries(wolfmqtt PUBLIC ${WOLFSSL_LIBRARIES})
78+
target_include_directories(wolfmqtt PUBLIC ${WOLFSSL_INCLUDE_DIRS})
79+
target_link_directories(wolfmqtt PUBLIC ${WOLFSSL_LIBRARY_DIRS})
80+
target_compile_options(wolfmqtt PUBLIC ${WOLFSSL_CFLAGS_OTHER})
81+
else()
82+
# For support with vcpkg
83+
find_package(wolfssl CONFIG REQUIRED)
84+
if (wolfssl_FOUND)
85+
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
86+
target_link_libraries(wolfmqtt PUBLIC wolfssl::wolfssl)
87+
endif()
88+
endif()
89+
endif()
90+
9191
list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
9292
endif()
9393

‎ChangeLog.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
## Release Notes
22

3+
### v1.19.2 (01/31/2025)
4+
Release 1.19.2 has been developed according to wolfSSL's development and QA
5+
process (see link below) and successfully passed the quality criteria.
6+
https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
7+
8+
* Handle connection error in mqttsimple client by @embhorn in #407
9+
* Fix stat reset for ping response by @embhorn in #414
10+
311
### v1.19.1 (11/06/2024)
412
Release 1.19.1 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
513
https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance

‎IDE/F767ZI-TOPPERS/user_settings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* user_settings.h
22
*
3-
* Copyright (C) 2006-2024 wolfSSL Inc.
3+
* Copyright (C) 2006-2025 wolfSSL Inc.
44
*
55
* This file is part of wolfMQTT.
66
*

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# All right reserved.
44

55
AC_COPYRIGHT([Copyright (C) 2014-2024 wolfSSL Inc.])
6-
AC_INIT([wolfmqtt],[1.19.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
6+
AC_INIT([wolfmqtt],[1.19.2],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
77

88
AC_PREREQ([2.63])
99
AC_CONFIG_AUX_DIR([build-aux])
@@ -24,7 +24,7 @@ AC_ARG_PROGRAM
2424
AC_CONFIG_MACRO_DIR([m4])
2525
AC_CONFIG_HEADERS([src/config.h])
2626

27-
WOLFMQTT_LIBRARY_VERSION=17:2:0
27+
WOLFMQTT_LIBRARY_VERSION=17:3:0
2828
# | | |
2929
# +------+ | +---+
3030
# | | |

‎examples/aws/awsiot.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* awsiot.c
22
*
3-
* Copyright (C) 2006-2024 wolfSSL Inc.
3+
* Copyright (C) 2006-2025 wolfSSL Inc.
44
*
55
* This file is part of wolfMQTT.
66
*

‎examples/aws/awsiot.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* awsiot.h
22
*
3-
* Copyright (C) 2006-2024 wolfSSL Inc.
3+
* Copyright (C) 2006-2025 wolfSSL Inc.
44
*
55
* This file is part of wolfMQTT.
66
*

‎examples/azure/azureiothub.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* azureiothub.c
22
*
3-
* Copyright (C) 2006-2024 wolfSSL Inc.
3+
* Copyright (C) 2006-2025 wolfSSL Inc.
44
*
55
* This file is part of wolfMQTT.
66
*

‎examples/azure/azureiothub.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* azureiothub.h
22
*
3-
* Copyright (C) 2006-2024 wolfSSL Inc.
3+
* Copyright (C) 2006-2025 wolfSSL Inc.
44
*
55
* This file is part of wolfMQTT.
66
*

0 commit comments

Comments
 (0)