Bump version to 1.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index e8dc418a3a75e5f34a58002b5295c9d9a833c148..9df9b6e7aeba709ed36fe367a5cf8e4bfa450c84 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
-ChangeLog
-==========
+CHANGELOG
+=========
+
+version 1.1.6 (released 2020-03-23)
+  * Added support for running with Sanitizers
+  * Added fake resolving of TXT records
+  * Improved logging support
+  * Fixed resolv.conf support on FreeBSD
+  * Fixed alignment issues on FreeBSD
+  * Fixed using IPv6 address with old glibc versions
 
 version 1.1.5 (released 2016-09-08)
   * Added support for faking PTR entries

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f56910173be23a9406f9c1e755c51d1919efaf22..12750760b28bcceea0fc26ae7ea1005d15205d0a 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(resolv_wrapper VERSION 1.1.5 LANGUAGES C)
+project(resolv_wrapper VERSION 1.1.6 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.0.5")
-set(LIBRARY_SOVERSION "0")
+#     Increment PATCH.
+set(LIBRARY_VERSION_MAJOR 0)
+set(LIBRARY_VERSION_MINOR 0)
+set(LIBRARY_VERSION_PATCH 6)
+set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
+set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH