From 54109a5a336a999d2095bc8dd018bc2ed8c88a9f Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 18 Sep 2019 12:13:26 +0300 Subject: [PATCH 1/3] Add dependecy on 'gnutls' to the installation document --- .../Getting-Started/Install-MariaDB-MaxScale-Using-a-Tarball.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/Getting-Started/Install-MariaDB-MaxScale-Using-a-Tarball.md b/Documentation/Getting-Started/Install-MariaDB-MaxScale-Using-a-Tarball.md index b86303acc..d95d330da 100644 --- a/Documentation/Getting-Started/Install-MariaDB-MaxScale-Using-a-Tarball.md +++ b/Documentation/Getting-Started/Install-MariaDB-MaxScale-Using-a-Tarball.md @@ -9,6 +9,7 @@ In order to use the tarball, the following libraries are required: - libcurl - libaio - OpenSSL +- gnutls The tarball has been built with the assumption that it will be installed in `/usr/local`. However, it is possible to install it in any directory, but in that case MariaDB MaxScale From 9c007ff4012aa928b63509dee73ff8d6f1197948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 18 Sep 2019 12:09:51 +0300 Subject: [PATCH 2/3] Add missing workaround files to tgz installation 2.3 has new directories that must be present in the tarball. --- cmake/package_tgz.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/package_tgz.cmake b/cmake/package_tgz.cmake index 3098c3c5b..65aa4177f 100644 --- a/cmake/package_tgz.cmake +++ b/cmake/package_tgz.cmake @@ -22,6 +22,9 @@ install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/cache/ma install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/log/maxscale) install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/run/maxscale) install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxscale) +install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxscale/maxscale.cnf.d) +install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION etc/maxscale.modules.d) +install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/plugin) if(DISTRIB_SUFFIX) set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}") From ae99e8622f54143bc31c3a7cc4521e5f23c18fca Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Wed, 18 Sep 2019 15:05:41 +0300 Subject: [PATCH 3/3] Update 2.3 maintenance version --- VERSION23.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION23.cmake b/VERSION23.cmake index f6d1dc661..31a54387d 100644 --- a/VERSION23.cmake +++ b/VERSION23.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "12" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "13" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")