Bump version to 1.2.4

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/CHANGELOG b/CHANGELOG
index 04a4245e05f6d50877e539ae3827576d9012f826..bdb152dbef2804caaa9fce96eda602ac3e221c9b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 ChangeLog
 ==========
 
+version 1.2.4 (released 2020-03-24)
+  * Added support for 10.53.57.0 network
+  * Added _{socket,close,connect,...} symbols on FreeBSD
+  * Fixed interaction with resolv_wrapper on FreeBSD
+
 version 1.2.3 (released 2019-03-21)
   * Fixed missing NULL check for socket_wrapper_dir()
   * Fixes building in Samba source tree

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef14e5794c7885ac36b8871a316c6b2e9d0d4eba..db799ac953ee9e50531c3176541af9bc94fdc41f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,20 +11,23 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 include(DefineCMakeDefaults)
 include(DefineCompilerFlags)
 
-project(socket_wrapper VERSION 1.2.3 LANGUAGES C)
+project(socket_wrapper VERSION 1.2.4 LANGUAGES C)
 
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
 
-# SOVERSION scheme: CURRENT.AGE.REVISION
+# SOVERSION scheme: MAJOR.MINOR.PATCH
 #   If there was an incompatible interface change:
-#     Increment CURRENT. Set AGE and REVISION to 0
+#     Increment MAJOR. Set MINOR and PATCH to 0
 #   If there was a compatible interface change:
-#     Increment AGE. Set REVISION to 0
+#     Increment MINOR. Set PATCH to 0
 #   If the source code was changed, but there were no interface changes:
-#     Increment REVISION.
-set(LIBRARY_VERSION "0.1.13")
-set(LIBRARY_SOVERSION "0")
+#     Increment PATCH.
+set(LIBRARY_VERSION_MAJOR 0)
+set(LIBRARY_VERSION_MINOR 1)
+set(LIBRARY_VERSION_PATCH 14)
+set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
+set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
 
 # add definitions
 include(DefinePlatformDefaults)