diff --git a/CHANGES b/CHANGES index 47fd528c20..0589092d19 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.5-903 | 2018-08-23 16:54:24 -0500 + + * Fix finding of kerberos and libmaxminddb CMake < 3.3 (Daniel Thayer) + + * BIT-1885: fix "kill" threading message (Jon Siwek, Corelight) + 2.5-900 | 2018-08-23 15:18:48 -0500 * Improve readability of the Travis job log (Daniel Thayer) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcafffbae2..80e3d5049a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ include_directories(BEFORE set(USE_GEOIP false) find_package(LibMMDB) -if (LibMMDB_FOUND) +if (LIBMMDB_FOUND) set(USE_GEOIP true) include_directories(BEFORE ${LibMMDB_INCLUDE_DIR}) list(APPEND OPTLIBS ${LibMMDB_LIBRARY}) @@ -143,7 +143,7 @@ endif () set(USE_KRB5 false) if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux ) find_package(LibKrb5) - if (LibKrb5_FOUND) + if (LIBKRB5_FOUND) set(USE_KRB5 true) list(APPEND OPTLIBS ${LibKrb5_LIBRARY}) endif () diff --git a/VERSION b/VERSION index 4dc4e31e6a..7e0a9018c5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-900 +2.5-903