From 060e42e1f22c5389707f693901bfdc8c2c48eae3 Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Fri, 22 Dec 2023 08:25:33 -0600
Subject: [PATCH 1/3] Release v1.18.0

---
 .github/workflows/macos-check.yml | 2 +-
 CMakeLists.txt                    | 2 +-
 configure.ac                      | 4 ++--
 wolfmqtt/version.h                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/macos-check.yml b/.github/workflows/macos-check.yml
index 18c724a22..5a87f441a 100644
--- a/.github/workflows/macos-check.yml
+++ b/.github/workflows/macos-check.yml
@@ -21,7 +21,7 @@ jobs:
         path: wolfssl
     - name: brew
       run: |
-        brew install automake libtool md5sha1sum mosquitto
+        brew install automake libtool md5sha1sum mosquitto coreutils
         echo "/usr/local/sbin/" >> $GITHUB_PATH
         echo "/usr/local/opt/mosquitto/sbin/" >> $GITHUB_PATH
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb73c91b5..da63b9ddf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(wolfMQTT VERSION 1.17.1 LANGUAGES C)
+project(wolfMQTT VERSION 1.18.0 LANGUAGES C)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(MQTT_SOURCES
diff --git a/configure.ac b/configure.ac
index 032735fe2..95e3fcfcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2023 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.17.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_INIT([wolfmqtt],[1.18.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
 
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -24,7 +24,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFMQTT_LIBRARY_VERSION=16:1:0
+WOLFMQTT_LIBRARY_VERSION=17:0:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
diff --git a/wolfmqtt/version.h b/wolfmqtt/version.h
index f8eedb3ed..11a43dc48 100644
--- a/wolfmqtt/version.h
+++ b/wolfmqtt/version.h
@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFMQTT_VERSION_STRING "1.17.1"
-#define LIBWOLFMQTT_VERSION_HEX 0x01017001
+#define LIBWOLFMQTT_VERSION_STRING "1.18.0"
+#define LIBWOLFMQTT_VERSION_HEX 0x01018000
 
 #ifdef __cplusplus
 }

From 597d2a6ddf104fed60a4ce12140775c8e8d26927 Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Fri, 22 Dec 2023 11:09:31 -0600
Subject: [PATCH 2/3] Change log

---
 ChangeLog.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 9d257bd24..3684f9c83 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,15 @@
 ## Release Notes
+### v1.18.0 (12/22/2023)
+Release 1.18.0 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
+https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
+
+* Add curl easy socket backend. by @philljj in #380
+* WOLFMQTT_EXAMPLE_CERT allowing static or extern cert assignment by @gojimmypi in #354
+* Tiny readme cleanup. by @philljj in #381
+* Fix high coverity issues by @embhorn in #379
+* Add broker check to scripts by @embhorn in #385
+* Cmake build fixes by @embhorn in #384
+
 ### v1.17.1 (11/29/2023)
 Release 1.17.1 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
 https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
@@ -12,7 +23,6 @@ https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assur
 * Fix Wild read in MqttProps_Free by @embhorn in #377
 * Fix fuzzer issues in MqttDecode_Props by @embhorn in #378
 
-
 ### v1.17.0 (11/2/2023)
 Release 1.17.0 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
 https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance

From e1d5c487fa76e85be4d2669dbcd8ea366a70fae7 Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Fri, 22 Dec 2023 11:14:50 -0600
Subject: [PATCH 3/3] Fix macos CI

---
 .github/workflows/macos-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/macos-check.yml b/.github/workflows/macos-check.yml
index 5a87f441a..f8d6f56d7 100644
--- a/.github/workflows/macos-check.yml
+++ b/.github/workflows/macos-check.yml
@@ -21,7 +21,7 @@ jobs:
         path: wolfssl
     - name: brew
       run: |
-        brew install automake libtool md5sha1sum mosquitto coreutils
+        brew install automake libtool mosquitto coreutils
         echo "/usr/local/sbin/" >> $GITHUB_PATH
         echo "/usr/local/opt/mosquitto/sbin/" >> $GITHUB_PATH