diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-08-11 20:22:16 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-08-11 20:22:16 +0000 |
| commit | ad97e3ac489cea8784cb535e6395990c0890a5ce (patch) | |
| tree | 8934e302a7f844b2731a6d73e641fbfb94468dee /databases/mysql80-client | |
| parent | 48ff51cf3b1271fe20665932d341bc374021209d (diff) | |
| download | ports-ad97e3ac489cea8784cb535e6395990c0890a5ce.tar.gz ports-ad97e3ac489cea8784cb535e6395990c0890a5ce.zip | |
Notes
Diffstat (limited to 'databases/mysql80-client')
4 files changed, 5 insertions, 29 deletions
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 2d48a0d44d40..f666f66bf6f8 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-client/files/patch-CMakeLists.txt b/databases/mysql80-client/files/patch-CMakeLists.txt index 7481d9053a23..5e7e62c5f8df 100644 --- a/databases/mysql80-client/files/patch-CMakeLists.txt +++ b/databases/mysql80-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2018-05-03 10:27:45 UTC +++ CMakeLists.txt -@@ -835,14 +835,12 @@ ADD_SUBDIRECTORY(extra/regex) +@@ -835,6 +835,7 @@ ADD_SUBDIRECTORY(extra/regex) ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(libbinlogevents) ADD_SUBDIRECTORY(libbinlogstandalone) @@ -8,14 +8,6 @@ IF(NOT WITHOUT_SERVER) SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") - # Add storage engines and plugins. - CONFIGURE_PLUGINS() --ELSE() -- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1 -- ADD_SUBDIRECTORY(storage/ndb) - ENDIF() - - IF(NOT WITHOUT_SERVER) @@ -966,12 +964,10 @@ ENDIF() ADD_SUBDIRECTORY(packaging/WiX) ADD_SUBDIRECTORY(packaging/solaris) diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt index 3e59f3170ddd..8deeef6509d1 100644 --- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt @@ -35,11 +35,11 @@ @@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) ++ SET(${var} "${${var}}-pthread " ) ELSE() - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -430,19 +436,7 @@ ELSE() # On Unix, most of the files end up in the bin directory diff --git a/databases/mysql80-client/files/patch-sql-common_client.cc b/databases/mysql80-client/files/patch-sql-common_client.cc index 4067fc8f097f..9758da5c5dcd 100644 --- a/databases/mysql80-client/files/patch-sql-common_client.cc +++ b/databases/mysql80-client/files/patch-sql-common_client.cc @@ -1,21 +1,5 @@ --- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC +++ sql-common/client.cc -@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v - goto error; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -- cn = (char *)ASN1_STRING_data(cn_asn1); --#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - cn = (char *)ASN1_STRING_get0_data(cn_asn1); --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ -+ cn = (char *)ASN1_STRING_data(cn_asn1); -+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ - - // There should not be any NULL embedded in the CN - if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) { @@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, #endif break; |