Update version to release 4.3.4

Update ABI to 3.1.1
obgm · Oct 4, 2023 · 69e1784 · 69e1784
1 parent 9fbce39
commit 69e1784
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,11 +12,11 @@ cmake_minimum_required(VERSION 3.10)
 
 project(
   libcoap
-  VERSION 4.3.3
+  VERSION 4.3.4
   LANGUAGES CXX C)
 
 set(LIBCOAP_API_VERSION 3)
-set(LIBCOAP_ABI_VERSION 3.1.0)
+set(LIBCOAP_ABI_VERSION 3.1.1)
 
 set(COAP_LIBRARY_NAME "coap-${LIBCOAP_API_VERSION}")
 

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2023-09-18  Olaf Bergmann  <[email protected]>
+
+	Change summary for version 4.3.4:
+
+        * Clean up use of tags.
+        * Support for MacOS with Contiki-NG builds.
+        * Support for Windows with OpenSSL 3.x builds.
+        * Reported bugs fixed.
+        * Documentation updated.
+
 2023-09-12  Olaf Bergmann  <[email protected]>
 
 	Change summary for version 4.3.3:

diff --git a/coap_config.h.contiki b/coap_config.h.contiki
@@ -83,7 +83,7 @@
 #define PACKAGE_NAME "libcoap"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libcoap 4.3.3"
+#define PACKAGE_STRING "libcoap 4.3.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libcoap"
@@ -92,7 +92,7 @@
 #define PACKAGE_URL "https://libcoap.net/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.3.3"
+#define PACKAGE_VERSION "4.3.4"
 
 #define WITH_CONTIKI 1
 

diff --git a/coap_config.h.riot b/coap_config.h.riot
@@ -313,10 +313,10 @@
 #define PACKAGE_NAME "libcoap"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.3.3"
+#define PACKAGE_VERSION "4.3.4"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libcoap 4.3.3"
+#define PACKAGE_STRING "libcoap 4.3.4"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

diff --git a/coap_config.h.windows b/coap_config.h.windows
@@ -145,7 +145,7 @@
 #define PACKAGE_NAME "libcoap"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libcoap 4.3.3"
+#define PACKAGE_STRING "libcoap 4.3.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libcoap"
@@ -154,7 +154,7 @@
 #define PACKAGE_URL "https://libcoap.net/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.3.3"
+#define PACKAGE_VERSION "4.3.4"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

diff --git a/configure.ac b/configure.ac
@@ -15,7 +15,7 @@
 # defined later.
 m4_define([libcoap_major_version], [4])
 m4_define([libcoap_minor_version], [3])
-m4_define([libcoap_micro_version], [3])
+m4_define([libcoap_micro_version], [4])
 
 # define an appending release state if needed, for example for pre-releases
 # like 'alpha' or 'rc1', for a full release keep the value empty!
@@ -137,8 +137,15 @@ LT_INIT([shared static])
 # To add to the confusion, if LIBCOAP_SO_VERSION is set to 3:0:1 (c:r:a), then the
 # .so version naming ends up as 2.1.0 (c-a:a:r) (as decided by libtool).
 
+#
+# CAUTION
+#
+# You will need to manually update VERSION and LIBCOAP_ABI_VERSION in CMakeLists.txt
+# if changes are made to libcoap_xx_version and LT_LIBCOAP_xx respectively.
+#
+
 LT_LIBCOAP_CURRENT=4
-LT_LIBCOAP_REVISION=0
+LT_LIBCOAP_REVISION=1
 LT_LIBCOAP_AGE=1
 LIBCOAP_SO_VERSION=$LT_LIBCOAP_CURRENT.$LT_LIBCOAP_REVISION.$LT_LIBCOAP_AGE
 
@@ -151,12 +158,12 @@ AC_SUBST(LIBCOAP_SO_VERSION)
 # Defining the API Version
 LIBCOAP_API_VERSION=3
 
-# calculate the ABI version
+# calculate the ABI version naming as calculated by libtool
 m4_pattern_allow(LT_TEMP)
 LT_TEMP=$LT_LIBCOAP_CURRENT
 LT_TEMP=`expr $LT_TEMP - $LT_LIBCOAP_AGE`
-if [ "$LT_TEMP" != "LIBCOAP_API_VERSION" ] ; then
-   AC_MSG_ERROR([==> API version does not match base ABI version.])
+if test "$LT_TEMP" != "$LIBCOAP_API_VERSION" ; then
+   AC_MSG_ERROR([==> API version ($LIBCOAP_API_VERSION) does not match base of ABI ($LT_TEMP.$LT_LIBCOAP_AGE.$LT_LIBCOAP_REVISION) version.])
 fi
 LIBCOAP_ABI_VERSION=$LT_TEMP.$LT_LIBCOAP_AGE.$LT_LIBCOAP_REVISION
 AC_SUBST(LIBCOAP_ABI_VERSION)

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST = \
   upgrade_4.3.0_4.3.1.txt \
   upgrade_4.3.1_4.3.2.txt \
   upgrade_4.3.2_4.3.3.txt \
+  upgrade_4.3.3_4.3.4.txt \
   main.md \
   module_api_wrap.h
 
@@ -239,7 +240,7 @@ man-page-build: upg-page-build man-page-start
 	done
 
 if BUILD_MANPAGES
-UPG_LIST = upgrade_4.2.1_4.3.0.txt upgrade_4.3.0_4.3.1.txt upgrade_4.3.1_4.3.2.txt upgrade_4.3.2_4.3.3.txt
+UPG_LIST = upgrade_4.2.1_4.3.0.txt upgrade_4.3.0_4.3.1.txt upgrade_4.3.1_4.3.2.txt upgrade_4.3.2_4.3.3.txt upgrade_4.3.3_4.3.4.txt
 
 upg-page-build:
 	@for FILE in $(UPG_LIST) ; do \

diff --git a/doc/upgrade_4.3.3_4.3.4.txt b/doc/upgrade_4.3.3_4.3.4.txt
@@ -0,0 +1,5 @@
+= Upgrade from 4.3.3 to 4.3.4
+
+== Summary
+
+No code or binary changes required.
diff --git a/examples/lwip/config/coap_config.h b/examples/lwip/config/coap_config.h
@@ -57,8 +57,8 @@
 #endif
 
 #define PACKAGE_NAME "libcoap"
-#define PACKAGE_VERSION "4.3.3"
-#define PACKAGE_STRING "libcoap 4.3.3"
+#define PACKAGE_VERSION "4.3.4"
+#define PACKAGE_STRING "libcoap 4.3.4"
 
 #define assert(x) LWIP_ASSERT("CoAP assert failed", x)
 

diff --git a/include/coap3/coap.h.riot b/include/coap3/coap.h.riot
@@ -20,16 +20,16 @@
 #define LIBCOAP_PACKAGE_NAME "libcoap"
 
 /* Define the full name and version of libcoap. */
-#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.3"
+#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.4"
 
 /* Define the home page for libcoap. */
 #define LIBCOAP_PACKAGE_URL "https://libcoap.net/"
 
 /* Define the version of libcoap this file belongs to. */
-#define LIBCOAP_PACKAGE_VERSION "4.3.3"
+#define LIBCOAP_PACKAGE_VERSION "4.3.4"
 
 /* Define the numeric version identifier for libcoap */
-#define LIBCOAP_VERSION (4003003U)
+#define LIBCOAP_VERSION (4003004U)
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/coap3/coap.h.windows b/include/coap3/coap.h.windows
@@ -20,16 +20,16 @@
 #define LIBCOAP_PACKAGE_NAME "libcoap"
 
 /* Define the full name and version of libcoap. */
-#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.3"
+#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.4"
 
 /* Define the home page for libcoap. */
 #define LIBCOAP_PACKAGE_URL "https://libcoap.net/"
 
 /* Define the version of libcoap this file belongs to. */
-#define LIBCOAP_PACKAGE_VERSION "4.3.3"
+#define LIBCOAP_PACKAGE_VERSION "4.3.4"
 
 /* Define the numeric version identifier for libcoap */
-#define LIBCOAP_VERSION (4003003U)
+#define LIBCOAP_VERSION (4003004U)
 
 #ifdef __cplusplus
 extern "C" {