New version - up to date MariaDB and Go

Author: rupor-github

CMakeLists.txt

@@ -14,7 +14,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # Project version number
 set(PRJ_VERSION_MAJOR 9)
-set(PRJ_VERSION_MINOR 4)
+set(PRJ_VERSION_MINOR 41)
 configure_file("${PROJECT_SOURCE_DIR}/cmake/version.h.in" "${PROJECT_BINARY_DIR}/version.h")
 include_directories("${PROJECT_BINARY_DIR}")
 
@@ -69,7 +69,7 @@ find_package(Threads)
 if(DEFINED ENV{MYSQL_PROPER})
     find_package(MySQL 5.7.17 REQUIRED EXACT)
 else()
-    find_package(MariaDB 10.1.24 REQUIRED)
+    find_package(MariaDB 10.1.26 REQUIRED)
 endif()
 find_package(ZLIB REQUIRED)
 find_package(EXPAT REQUIRED)
@@ -122,7 +122,7 @@ if(CMAKE_CROSSCOMPILING OR WIN32)
 endif()
 install(FILES ${MYSQL_LIB_DIR}/../share/english/errmsg.sys DESTINATION ${PROJECT_BINARY_DIR}/language CONFIGURATIONS Release Debug)
 
-find_package(Go 1.8.1 REQUIRED)
+find_package(Go 1.9 REQUIRED)
 find_package(Glide 0.12.3 REQUIRED)
 # Proper go build structure will be here
 set(GO_PATH "${CMAKE_BINARY_DIR}/go")

get-maria.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 ver_major=10.1
-ver_minor=24
+ver_minor=26
 
 declare -A checkmap
 
@@ -16,21 +16,21 @@ for _mingw in ${ARCH_INSTALLS}; do
 			file=mariadb-${ver_major}.${ver_minor}-${arch}.zip
 			prefix=i686
 			packagedir=${arch}-packages
-			checkmap[${arch}]="3f28aaece4cb00d57fb643873ca4a4b29546cf5852d956094517b36ba8eafba3"
+			checkmap[${arch}]="08b546950f448763459ac66f8f81e0097c8cd4378a3e0075b6e50275682bd7ed"
 		;;
 		win64)
 			arch=winx64
 			file=mariadb-${ver_major}.${ver_minor}-${arch}.zip
 			prefix=x86_64
 			packagedir=${arch}-packages
-			checkmap[${arch}]="cca8b38e640508cd8fa3ba28c872ccc79497d6a74164a1ae9cdd04aaef9ef6cd"
+			checkmap[${arch}]="ece635977ec4f1d1c192fb156cef02229cff1925bd76cab488a48e63d8cf97fc"
 		;;
 		linux)
 			arch=$(uname -m)
 			file=mariadb-${ver_major}.${ver_minor}-linux-glibc_214-${arch}.tar.gz
 			prefix=
 			packagedir=bintar-linux-glibc_214-${arch}
-			checkmap[${arch}]="04491b686a83ba994122f5609adb9f86cb5af6275f87bfa4ee6010e2e28db465"
+			checkmap[${arch}]="b993c521f283bacec18760ae72b7d768c3e032007a244e0a8b13032c0278508f"
 		;;
 		*)
 			echo "Unsupported environment!"