[SCM] Socket Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  3b6e207 Bump version to 1.2.5
      from  b94af54 socket_wrapper.c: let swrap_vioctl() handle SIOCOUTQ/TIOCOUTQ/FIONWRITE explicitly

https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3b6e2078e07cf379b5a65edb5e967d4f7c7b9e0a
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jun 22 16:53:36 2020 +0200

    Bump version to 1.2.5
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGELOG      | 5 +++++
 CMakeLists.txt | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CHANGELOG b/CHANGELOG
index bdb152d..3e89c08 100644
--- 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 db799ac..6b1643c 100644
--- 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})
 


-- 
Socket Wrapper Repository