Fix for LibreSSL version number: We need to read LIBRESSL_VERSION_TEX…

…T, since

OPENSSL_VERSION_NUMBER is always 2.0.0
Bumped the client version number to 10.2.5 (same as current 10.2 server version)

CMakeLists.txt

@@ -158,8 +158,8 @@ ENDIF()
 
 SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !
 SET(MARIADB_CLIENT_VERSION_MAJOR "10")
-SET(MARIADB_CLIENT_VERSION_MINOR "1")
-SET(MARIADB_CLIENT_VERSION_PATCH "7")
+SET(MARIADB_CLIENT_VERSION_MINOR "2")
+SET(MARIADB_CLIENT_VERSION_PATCH "5")
 SET(MARIADB_CLIENT_VERSION "${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}.${MARIADB_CLIENT_VERSION_PATCH}")
 MATH(EXPR MARIADB_VERSION_ID "${MARIADB_CLIENT_VERSION_MAJOR} * 10000 +
                               ${MARIADB_CLIENT_VERSION_MINOR} * 100   +
@@ -241,6 +241,10 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/CheckFunctions.cmake)
 # check for various types
 INCLUDE(${CC_SOURCE_DIR}/cmake/CheckTypes.cmake)
 
+# convert SSL options to uppercase
+IF(WITH_SSL)
+  STRING(TOUPPER ${WITH_SSL} WITH_SSL)
+ENDIF()
 IF(WITH_SSL STREQUAL "ON")
   IF(WIN32)
     SET(WITH_SSL "SCHANNEL")
@@ -259,16 +263,19 @@ IF(NOT WITH_SSL STREQUAL "OFF")
       SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c")
       SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
       INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIR})
-      MESSAGE1(OPENSSL_VERSION "OpenSSL version: ${OPENSSL_VERSION}")
 
-      CHECK_SYMBOL_EXISTS(LIBRESSL_VERSION_NUMBER "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" HAVE_LIBRESSL)
+      TRY_RUN(LIBRESSL_RESULT HAVE_LIBRESSL
+              ${CMAKE_BINARY_DIR}
+              ${CMAKE_SOURCE_DIR}/cmake/libressl_version.c
+              COMPILE_DEFINITIONS "-I${OPENSSL_INCLUDE_DIR}"
+              RUN_OUTPUT_VARIABLE LIBRESSL_VERSION)
       IF(HAVE_LIBRESSL)
-        SET(TLS_LIBRARY_VERSION "LibreSSL ${OPENSSL_VERSION}")
+        SET(TLS_LIBRARY_VERSION ${LIBRESSL_VERSION})
       ELSE()
         SET(TLS_LIBRARY_VERSION "OpenSSL ${OPENSSL_VERSION}")
       ENDIF()
     ELSE()
-      MESSAGE1(OPENSSL_VERSION "OpenSSL not found")
+      MESSAGE1(TLS_LIBRARY_VERSION "OpenSSL/LibreSSL not found")
     ENDIF()
   ENDIF()
   IF(WITH_SSL STREQUAL "GNUTLS")
@@ -288,9 +295,10 @@ IF(NOT WITH_SSL STREQUAL "OFF")
       SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/schannel.c" "${CC_SOURCE_DIR}/libmariadb/secure/ma_schannel.c")
       INCLUDE_DIRECTORIES("${CC_SOURCE_DIR}/plugins/pvio/")
       SET(SSL_LIBRARIES secur32)
-      SET(TLS_LIBRARY_VERSION "Schannel")
+      SET(TLS_LIBRARY_VERSION "Schannel ${CMAKE_SYSTEM_VERSION}")
     ENDIF()
   ENDIF()
+  MESSAGE1(TLS_LIBRARY_VERSION "TLS library/version: ${TLS_LIBRARY_VERSION}")
 
   MARK_AS_ADVANCED(SSL_SOURCES)
 ENDIF()