Index: head/databases/mysql56-client/Makefile =================================================================== --- head/databases/mysql56-client/Makefile (revision 521873) +++ head/databases/mysql56-client/Makefile (revision 521874) @@ -1,36 +1,35 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 BROKEN_sparc64= Does not build: reports unsupported compiler MASTERDIR= ${.CURDIR}/../mysql56-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \ mysql[0-46-9][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes -EXTRA_PATCHES+= ${MASTERDIR}/files/patch-PR225888.diff .include "${MASTERDIR}/Makefile" Index: head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake =================================================================== --- head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake (revision 521873) +++ head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake (revision 521874) @@ -1,20 +1,20 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 -+++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 -@@ -25,7 +25,7 @@ IF(UNIX) +--- cmake/build_configurations/compiler_options.cmake.orig 2020-01-01 21:24:49.736077000 +0100 ++++ cmake/build_configurations/compiler_options.cmake 2020-01-01 21:25:22.307418000 +0100 +@@ -32,7 +32,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -34,7 +34,7 @@ IF(UNIX) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) +@@ -47,7 +47,7 @@ IF(UNIX) + IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0) + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") + ENDIF() - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") Index: head/databases/mysql56-server/Makefile =================================================================== --- head/databases/mysql56-server/Makefile (revision 521873) +++ head/databases/mysql56-server/Makefile (revision 521874) @@ -1,162 +1,162 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.45 +PORTVERSION= 5.6.46 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server MAINTAINER= mmokhi@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql56-client USES= bison:build cmake:noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libevent.so:devel/libevent \ liblz4.so:archivers/liblz4 CMAKE_BUILD_TYPE= Release CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DWITH_SSL=${OPENSSLBASE} \ -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \ -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:56 CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ mysql[0-46-9][0-9]-server-* \ mysqlwsrep* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysql56-server/distinfo =================================================================== --- head/databases/mysql56-server/distinfo (revision 521873) +++ head/databases/mysql56-server/distinfo (revision 521874) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565035854 -SHA256 (mysql-5.6.45.tar.gz) = 404d798974dd89aca4a19e67194b534eddc7508489982175978966360607aabb -SIZE (mysql-5.6.45.tar.gz) = 32525559 +TIMESTAMP = 1577785560 +SHA256 (mysql-5.6.46.tar.gz) = 12e1fbabf2086e6175359767ca89fa8a58f9274fcad40434aa6a56e582d65f49 +SIZE (mysql-5.6.46.tar.gz) = 32395002 Index: head/databases/mysql56-server/files/patch-PR225888.diff =================================================================== --- head/databases/mysql56-server/files/patch-PR225888.diff (revision 521873) +++ head/databases/mysql56-server/files/patch-PR225888.diff (nonexistent) @@ -1,302 +0,0 @@ -diff --git extra/yassl/include/openssl/ssl.h extra/yassl/include/openssl/ssl.h -index 10fa4913b7e..ff6cb696661 100644 ---- extra/yassl/include/openssl/ssl.h.orig -+++ extra/yassl/include/openssl/ssl.h -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. -+ Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -179,7 +179,7 @@ enum { /* X509 Constants */ - unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *); - void ERR_print_errors_fp(FILE*); - char* ERR_error_string(unsigned long,char*); --void ERR_remove_state(unsigned long); -+void ERR_remove_thread_state(const void *); - unsigned long ERR_get_error(void); - unsigned long ERR_peek_error(void); - int ERR_GET_REASON(int); -diff --git extra/yassl/src/ssl.cpp extra/yassl/src/ssl.cpp -index 39244a01b92..c992d446487 100644 ---- extra/yassl/src/ssl.cpp.orig -+++ extra/yassl/src/ssl.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. -+ Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -1615,7 +1615,7 @@ int SSLeay_add_ssl_algorithms() // compatibility only - } - - --void ERR_remove_state(unsigned long) -+void ERR_remove_thread_state(const void *) - { - GetErrors().Remove(); - } -diff --git mysys_ssl/my_aes_openssl.cc mysys_ssl/my_aes_openssl.cc -index 261ba8ab732..a0f8c147c7a 100644 ---- mysys_ssl/my_aes_openssl.cc.orig -+++ mysys_ssl/my_aes_openssl.cc -@@ -1,4 +1,4 @@ --/* Copyright (c) 2015, 2014 Oracle and/or its affiliates. All rights reserved. -+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -122,33 +122,46 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length, - const unsigned char *key, uint32 key_length, - enum my_aes_opmode mode, const unsigned char *iv) - { -- EVP_CIPHER_CTX ctx; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX stack_ctx; -+ EVP_CIPHER_CTX *ctx= &stack_ctx; -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new(); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - const EVP_CIPHER *cipher= aes_evp_type(mode); - int u_len, f_len; - /* The real key to be used for encryption */ - unsigned char rkey[MAX_AES_KEY_LENGTH / 8]; - my_aes_create_key(key, key_length, rkey, mode); - -- if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) -+ if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) - return MY_AES_BAD_DATA; - -- if (!EVP_EncryptInit(&ctx, cipher, rkey, iv)) -+ if (!EVP_EncryptInit(ctx, cipher, rkey, iv)) - goto aes_error; /* Error */ -- if (!EVP_CIPHER_CTX_set_padding(&ctx, 1)) -+ if (!EVP_CIPHER_CTX_set_padding(ctx, 1)) - goto aes_error; /* Error */ -- if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length)) -+ if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length)) - goto aes_error; /* Error */ - -- if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len)) -+ if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len)) - goto aes_error; /* Error */ - -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX_cleanup(ctx); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ EVP_CIPHER_CTX_free(ctx); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - return u_len + f_len; - - aes_error: - /* need to explicitly clean up the error if we want to ignore it */ - ERR_clear_error(); -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX_cleanup(ctx); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ EVP_CIPHER_CTX_free(ctx); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - return MY_AES_BAD_DATA; - } - -@@ -159,7 +172,12 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length, - enum my_aes_opmode mode, const unsigned char *iv) - { - -- EVP_CIPHER_CTX ctx; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX stack_ctx; -+ EVP_CIPHER_CTX *ctx= &stack_ctx; -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new(); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - const EVP_CIPHER *cipher= aes_evp_type(mode); - int u_len, f_len; - -@@ -167,27 +185,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length, - unsigned char rkey[MAX_AES_KEY_LENGTH / 8]; - - my_aes_create_key(key, key_length, rkey, mode); -- if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) -+ if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) - return MY_AES_BAD_DATA; - -- EVP_CIPHER_CTX_init(&ctx); -- -- if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv)) -+ if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv)) - goto aes_error; /* Error */ -- if (!EVP_CIPHER_CTX_set_padding(&ctx, 1)) -+ if (!EVP_CIPHER_CTX_set_padding(ctx, 1)) - goto aes_error; /* Error */ -- if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length)) -+ if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length)) - goto aes_error; /* Error */ -- if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len)) -+ if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len)) - goto aes_error; /* Error */ - -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX_cleanup(ctx); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ EVP_CIPHER_CTX_free(ctx); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ - return u_len + f_len; - - aes_error: - /* need to explicitly clean up the error if we want to ignore it */ - ERR_clear_error(); -- EVP_CIPHER_CTX_cleanup(&ctx); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX_cleanup(ctx); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ EVP_CIPHER_CTX_free(ctx); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - return MY_AES_BAD_DATA; - } - -diff --git sql-common/client.c sql-common/client.c -index 19faefe8323..f1192306ccb 100644 ---- sql-common/client.c.orig -+++ sql-common/client.c -@@ -2744,7 +2744,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c - goto error; - } - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - cn= (char *) ASN1_STRING_data(cn_asn1); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ cn= (char *) ASN1_STRING_get0_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)) -diff --git sql/mysqld.cc sql/mysqld.cc -index 4acff4e4d9b..307778771be 100644 ---- sql/mysqld.cc.orig -+++ sql/mysqld.cc -@@ -3408,7 +3408,11 @@ static int init_ssl() - { - #ifdef HAVE_OPENSSL - #ifndef HAVE_YASSL -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_malloc_init(); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ OPENSSL_malloc_init(); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - #endif - ssl_start(); - #ifndef EMBEDDED_LIBRARY -@@ -3434,7 +3438,9 @@ static int init_ssl() - opt_ssl_cipher, &error, - opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags); - DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); -- ERR_remove_state(0); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_remove_thread_state(0); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - if (!ssl_acceptor_fd) - { - /* -diff --git sql/rpl_slave.cc sql/rpl_slave.cc -index aee13e12cb2..37a20870bd4 100644 ---- sql/rpl_slave.cc.orig -+++ sql/rpl_slave.cc -@@ -6026,7 +6026,9 @@ ignore_log_space_limit=%d", - mysql_mutex_unlock(&mi->run_lock); - DBUG_LEAVE; // Must match DBUG_ENTER() - my_thread_end(); -- ERR_remove_state(0); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_remove_thread_state(0); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - pthread_exit(0); - return(0); // Avoid compiler warnings - } -@@ -6256,7 +6258,9 @@ extern "C" void *handle_slave_worker(void *arg) - } - - my_thread_end(); -- ERR_remove_state(0); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_remove_thread_state(0); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - pthread_exit(0); - DBUG_RETURN(0); - } -@@ -7597,7 +7601,9 @@ llstr(rli->get_group_master_log_pos(), llbuff)); - - DBUG_LEAVE; // Must match DBUG_ENTER() - my_thread_end(); -- ERR_remove_state(0); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_remove_thread_state(0); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - pthread_exit(0); - return 0; // Avoid compiler warnings - } -diff --git vio/viossl.c vio/viossl.c -index 5622cb7ee92..f738570f832 100644 ---- vio/viossl.c.orig -+++ vio/viossl.c -@@ -1,4 +1,4 @@ --/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. -+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -419,7 +421,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, - for (j = 0; j < n; j++) - { - SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); -+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c))); -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - } - } - #endif -diff --git vio/viosslfactories.c vio/viosslfactories.c -index f50678a37b3..d3891fd8b12 100644 ---- vio/viosslfactories.c.orig -+++ vio/viosslfactories.c -@@ -1,4 +1,4 @@ --/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. -+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -121,13 +121,21 @@ static DH *get_dh2048(void) - DH *dh; - if ((dh=DH_new())) - { -- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); -- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); -- if (! dh->p || ! dh->g) -- { -+ BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); -+ BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); -+ if (!p || !g -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ || !DH_set0_pqg(dh, p, NULL, g) -+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ -+ ) { -+ /* DH_free() will free 'p' and 'g' at once. */ - DH_free(dh); -- dh=0; -+ return NULL; - } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ dh->p= p; -+ dh->g= g; -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - } - return(dh); - } Property changes on: head/databases/mysql56-server/files/patch-PR225888.diff ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysql56-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql56-server/files/patch-CMakeLists.txt (revision 521873) +++ head/databases/mysql56-server/files/patch-CMakeLists.txt (revision 521874) @@ -1,41 +1,42 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 -@@ -500,12 +500,10 @@ +--- CMakeLists.txt.orig 2020-01-01 20:46:13.771078000 +0100 ++++ CMakeLists.txt 2020-01-01 20:49:28.631677000 +0100 +@@ -558,12 +558,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -514,10 +512,7 @@ +@@ -572,10 +570,7 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(sql-bench) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -572,6 +567,7 @@ +@@ -634,6 +629,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +593,6 @@ + INSTALL(FILES + README +@@ -652,6 +648,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) - ENDIF() +ENDIF() + ENDIF() INCLUDE(CPack) Index: head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt (revision 521873) +++ head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt (revision 521874) @@ -1,41 +1,42 @@ ---- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 -+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 -@@ -173,7 +173,7 @@ +--- libmysql/CMakeLists.txt.orig 2020-01-01 21:38:55.670126000 +0100 ++++ libmysql/CMakeLists.txt 2020-01-01 21:47:51.799099000 +0100 +@@ -205,7 +205,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -200,19 +200,22 @@ +@@ -234,20 +234,23 @@ IF(UNIX) ENDMACRO() ENDIF() +IF(FALSE) IF(UNIX) GET_TARGET_NAME(mysqlclient lib_name) INSTALL_SYMLINK(mysqlclient ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+ IF(FALSE) ++ COMPONENT SharedLibraries NOINSTALL) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) ++ IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -271,4 +274,5 @@ +@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED) ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() + ENDIF() ENDIF()