diff --git a/deps/Makefile b/deps/Makefile index 94b2e7627..93421fbcd 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -229,8 +229,8 @@ WITHASAN := $(shell echo $(WITHASAN)) mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/openssl/libssl.a cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true - cd mariadb-client-library && tar -zxf mariadb-connector-c-3.1.9-src.tar.gz - cd mariadb-client-library/mariadb_client && patch ./plugins/auth/CMakeLists.txt < ../plugin_auth_CMakeLists.txt.patch + cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz + cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch cd mariadb-client-library/mariadb_client && patch -p0 < ../ConnectorName.patch cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . ifeq ($(PROXYDEBUG),1) diff --git a/deps/mariadb-client-library/plugin_auth_CMakeLists.txt.patch b/deps/mariadb-client-library/plugin_auth_CMakeLists.txt.patch index 989b9cf56..ed4aca87d 100644 --- a/deps/mariadb-client-library/plugin_auth_CMakeLists.txt.patch +++ b/deps/mariadb-client-library/plugin_auth_CMakeLists.txt.patch @@ -1,4 +1,8 @@ -@@ -70,7 +70,7 @@ +diff --git plugins/auth/CMakeLists.txt plugins/auth/CMakeLists.txt +index 83e324b9..7c4ed019 100644 +--- plugins/auth/CMakeLists.txt ++++ plugins/auth/CMakeLists.txt +@@ -77,7 +77,7 @@ IF(CRYPTO_PLUGIN) REGISTER_PLUGIN(TARGET caching_sha2_password TYPE MARIADB_CLIENT_PLUGIN_AUTH CONFIGURATIONS DYNAMIC STATIC OFF @@ -7,7 +11,7 @@ SOURCES ${CC_SOURCE_DIR}/plugins/auth/caching_sha2_pw.c ${CRYPT_SOURCE} LIBRARIES ${CRYPT_LIBS}) -@@ -81,7 +81,7 @@ +@@ -88,7 +88,7 @@ IF(CRYPTO_PLUGIN) REGISTER_PLUGIN(TARGET sha256_password TYPE MARIADB_CLIENT_PLUGIN_AUTH CONFIGURATIONS DYNAMIC STATIC OFF @@ -16,7 +20,7 @@ SOURCES ${AUTH_DIR}/sha256_pw.c LIBRARIES ${CRYPT_LIBS}) ENDIF() -@@ -123,6 +123,6 @@ +@@ -137,6 +137,6 @@ REGISTER_PLUGIN(TARGET mysql_old_password REGISTER_PLUGIN(TARGET mysql_clear_password TYPE MARIADB_CLIENT_PLUGIN_AUTH CONFIGURATIONS DYNAMIC STATIC OFF