diff options
Diffstat (limited to 'databases')
6 files changed, 39 insertions, 33 deletions
diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile index b193b70e5a7..92758d91e71 100644 --- a/databases/mariadb-connector-c/Makefile +++ b/databases/mariadb-connector-c/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2018/08/16 18:54:28 adam Exp $ +# $NetBSD: Makefile,v 1.4 2018/09/18 08:41:33 fhajny Exp $ -DISTNAME= mariadb-connector-c-3.0.3 -PKGREVISION= 2 +DISTNAME= mariadb-connector-c-3.0.6 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GITHUB:=MariaDB/} diff --git a/databases/mariadb-connector-c/PLIST b/databases/mariadb-connector-c/PLIST index 1fd694e1928..5b42000b4a8 100644 --- a/databases/mariadb-connector-c/PLIST +++ b/databases/mariadb-connector-c/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2018/04/13 08:04:14 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.2 2018/09/18 08:41:33 fhajny Exp $ bin/mariadb_config include/mariadb/errmsg.h include/mariadb/ma_list.h @@ -22,3 +22,4 @@ ${PLIST.gss}lib/mariadb/plugin/auth_gssapi_client.so lib/mariadb/plugin/dialog.so lib/mariadb/plugin/mysql_clear_password.so ${PLIST.curl}lib/mariadb/plugin/remote_io.so +lib/mariadb/plugin/sha256_password.so diff --git a/databases/mariadb-connector-c/distinfo b/databases/mariadb-connector-c/distinfo index 0b30a31b59b..2beffe2ddd0 100644 --- a/databases/mariadb-connector-c/distinfo +++ b/databases/mariadb-connector-c/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1 2018/04/13 08:04:14 fhajny Exp $ +$NetBSD: distinfo,v 1.2 2018/09/18 08:41:33 fhajny Exp $ -SHA1 (mariadb-connector-c-3.0.3.tar.gz) = 73250ec95d493d84eff63e66bcfc3d9d9c39d3ea -RMD160 (mariadb-connector-c-3.0.3.tar.gz) = 574a38b779b70a3782cd7a2abe5e178506ce96eb -SHA512 (mariadb-connector-c-3.0.3.tar.gz) = 46845358a45c4fa1310d1e0126d2328e323457b162aba629fe569bf26a91b1cc5bdbb9c2d123d1b180a1362852e72774c5375c62d94c59117346776fbdbdd19d -Size (mariadb-connector-c-3.0.3.tar.gz) = 672982 bytes -SHA1 (patch-CMakeLists.txt) = ca3b3ada833da74f1708b293994bd96f9fb1ca92 +SHA1 (mariadb-connector-c-3.0.6.tar.gz) = 47aed053468f183ae7ed4b5752cdf62597ea6fc7 +RMD160 (mariadb-connector-c-3.0.6.tar.gz) = c8b55f8eae850bf4d74e673d07360c7f6ce887e5 +SHA512 (mariadb-connector-c-3.0.6.tar.gz) = 772a45e77eb5aa02dec944bb16d883924519472a0362e2e3ae3846ecd3ce668c83c17fbb6f8d0ff36d61992f08a62ec7f913c41e0c3e248ded7a58df83d1bbd4 +Size (mariadb-connector-c-3.0.6.tar.gz) = 672420 bytes +SHA1 (patch-CMakeLists.txt) = 438b1fc18e34f74ac3430ca73307a32cfa7be32c SHA1 (patch-cmake_CheckTypes.cmake) = 7b8184efcaee685d4b3db39441ed50ca08a8df6f -SHA1 (patch-cmake_plugins.cmake) = 27b3bfa8fb8436b8fee5ca37439f3d413e0e90b4 SHA1 (patch-libmariadb_ma__context.c) = 56ec0f9f4ab75826b87b0074523c235907e0507f +SHA1 (patch-plugins_auth_CMakeLists.txt) = 410c7cb8f1d04911628ab8b62563b91d65cf633e diff --git a/databases/mariadb-connector-c/patches/patch-CMakeLists.txt b/databases/mariadb-connector-c/patches/patch-CMakeLists.txt index 34c01da3558..7460d6d4cac 100644 --- a/databases/mariadb-connector-c/patches/patch-CMakeLists.txt +++ b/databases/mariadb-connector-c/patches/patch-CMakeLists.txt @@ -1,19 +1,19 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2018/04/13 08:04:14 fhajny Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2018/09/18 08:41:34 fhajny Exp $ Make sure Kerberos/GSS support can be turned off. ---- CMakeLists.txt.orig 2018-01-17 11:43:58.000000000 +0000 +--- CMakeLists.txt.orig 2018-07-31 07:44:20.000000000 +0000 +++ CMakeLists.txt -@@ -25,7 +25,7 @@ get_directory_property(IS_SUBPROJECT PAR +@@ -24,7 +24,7 @@ get_directory_property(IS_SUBPROJECT PAR # do not inherit include directories from the parent project SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES) - FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNITTEST + FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNIT_TESTS - WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_SQLITE WITH_SSL + WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_GSS WITH_SQLITE WITH_SSL INSTALL_LAYOUT WITH_TEST_SRCPKG) SET(${V} ${${OPT}${V}}) ENDFOREACH() -@@ -63,6 +63,7 @@ ADD_OPTION(WITH_UNITTEST "build test sui +@@ -62,6 +62,7 @@ ADD_OPTION(WITH_UNIT_TESTS "build test s ADD_OPTION(WITH_DYNCOL "Enables support of dynamic coluumns" ON) ADD_OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF) ADD_OPTION(WITH_CURL "Enables use of curl" ON) @@ -21,7 +21,7 @@ Make sure Kerberos/GSS support can be turned off. ADD_OPTION(WITH_SSL "Enables use of TLS/SSL library" ON) ############### -@@ -88,7 +89,7 @@ IF(WITH_RTC) +@@ -82,7 +83,7 @@ IF(WITH_RTC) SET(RTC_OPTIONS "/RTC1 /RTCc") ENDIF() @@ -30,7 +30,7 @@ Make sure Kerberos/GSS support can be turned off. INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake) IF(GSSAPI_FOUND) INCLUDE_DIRECTORIES(${GSSAPI_INCS}) -@@ -374,7 +375,7 @@ IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "OFF +@@ -361,7 +362,7 @@ IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "OFF ADD_DEFINITIONS("-DHAVE_REMOTEIO=1") ENDIF() ENDIF() diff --git a/databases/mariadb-connector-c/patches/patch-cmake_plugins.cmake b/databases/mariadb-connector-c/patches/patch-cmake_plugins.cmake deleted file mode 100644 index 1a73d3c61fc..00000000000 --- a/databases/mariadb-connector-c/patches/patch-cmake_plugins.cmake +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cmake_plugins.cmake,v 1.1 2018/04/13 08:04:14 fhajny Exp $ - -Make sure curl support can be turned off. - ---- cmake/plugins.cmake.orig 2018-01-17 11:43:58.000000000 +0000 -+++ cmake/plugins.cmake -@@ -96,7 +96,7 @@ ENDFOREACH() - MESSAGE1(plugin_config "Plugin configuration:${plugin_config}") - MESSAGE1(LIBMARIADB_SOURCES "STATIC PLUGIN SOURCES: ${LIBMARIADB_SOURCES}") - --IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "NO") -+IF(WITH_CURL AND NOT REMOTEIO_PLUGIN_TYPE MATCHES "NO") - FIND_PACKAGE(CURL) - ENDIF() - diff --git a/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt b/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt new file mode 100644 index 00000000000..f2cc03dd925 --- /dev/null +++ b/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt @@ -0,0 +1,21 @@ +$NetBSD: patch-plugins_auth_CMakeLists.txt,v 1.1 2018/09/18 08:41:34 fhajny Exp $ + +Make sure Kerberos/GSS support can be turned off. + +--- plugins/auth/CMakeLists.txt.orig 2018-07-31 07:44:20.000000000 +0000 ++++ plugins/auth/CMakeLists.txt +@@ -19,12 +19,12 @@ REGISTER_PLUGIN(TARGET dialog + ${CC_SOURCE_DIR}/libmariadb/get_password.c) + + #GSSAPI client authentication plugin +-IF(NOT WIN32) ++IF(WITH_GSS) + INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake) + IF(GSSAPI_FOUND) + SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c) + ENDIF() +-ELSE() ++ELIF(WIN32) + SET(GSSAPI_LIBS secur32) + SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/sspi_client.c ${AUTH_DIR}/sspi_errmsg.c) + ENDIF() |