Bump version to 1.2.5

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

diff --git a/CHANGELOG b/CHANGELOG
index bdb152dbef2804caaa9fce96eda602ac3e221c9b..3e89c08a6dde69cc6449e197ed24583fcf5d0a22 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 ChangeLog
 ==========
 
+version 1.2.5 (released 2020-06-22)
+  * Added basic support for TCP_INFO and SIOCOUTQ/TIOCOUTQ/FIONWRITE
+  * Add SOCKET_WRAPPER_DIR_ALLOW_ORIG and abort() early if
+    SOCKET_WRAPPER_DIR is unusable
+
 version 1.2.4 (released 2020-03-24)
   * Added support for 10.53.57.0 network
   * Added _{socket,close,connect,...} symbols on FreeBSD

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db799ac953ee9e50531c3176541af9bc94fdc41f..6b1643cc7cabe822a748f9c43bde225dbf5c24d9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 include(DefineCMakeDefaults)
 include(DefineCompilerFlags)
 
-project(socket_wrapper VERSION 1.2.4 LANGUAGES C)
+project(socket_wrapper VERSION 1.2.5 LANGUAGES C)
 
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
@@ -25,7 +25,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 #     Increment PATCH.
 set(LIBRARY_VERSION_MAJOR 0)
 set(LIBRARY_VERSION_MINOR 1)
-set(LIBRARY_VERSION_PATCH 14)
+set(LIBRARY_VERSION_PATCH 15)
 set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
 set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})