Attachment 206680 Details for Bug 239272 – This patch is not complete. There are pkg-plist errors on mysql80-client.

[patch] This patch is not complete. There are pkg-plist errors on mysql80-client.

patch-mysql80.dms (text/plain), 81.15 KB, created by Dan Langille on 2019-08-18 22:32:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2019-08-18 22:32:11 UTC

Size: 81.15 KB

patch

obsolete

>Index: databases/mysql80-client/Makefile
>===================================================================
>--- databases/mysql80-client/Makefile	(revision 509206)
>+++ databases/mysql80-client/Makefile	(working copy)
>@@ -20,6 +20,8 @@
> 			mariadb[0-9][0-9]-client-* \
> 			percona[0-9][0-9]-client-*
> 
>+BUILD_DEPENDS+=	libunwind>0:devel/libunwind
>+
> CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
> 
> USE_LDCONFIG+=	${PREFIX}/lib/mysql
>Index: databases/mysql80-client/files/patch-CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2019-01-21 18:42:44 UTC
>+--- CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ CMakeLists.txt
>-@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex)
>+@@ -1213,6 +1213,7 @@ ADD_SUBDIRECTORY(mysys)
>  ADD_SUBDIRECTORY(libmysql)
>  ADD_SUBDIRECTORY(libbinlogevents)
>  ADD_SUBDIRECTORY(libbinlogstandalone)
>@@ -7,8 +7,8 @@
> +ADD_SUBDIRECTORY(support-files)
>  
>  IF(NOT WITHOUT_SERVER)
>-   SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
>-@@ -1146,12 +1147,13 @@ ENDIF() 
>+   # Build failure on Solaris 11.3 for debug builds with NDBCLUSTER.
>+@@ -1365,12 +1366,13 @@ ENDIF() 
>  ADD_SUBDIRECTORY(packaging/WiX)
>  ADD_SUBDIRECTORY(packaging/solaris)
>  
>@@ -25,11 +25,11 @@
>  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>    INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
>    INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
>-@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+@@ -1388,6 +1390,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+     PATTERN "sp-imp-spec.txt" EXCLUDE
>      PATTERN "README.build" EXCLUDE
>    )
>++ENDIF()
>  ENDIF()
>-+ENDIF()
>  
>  # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
>- # we can safely enable ASan on Clang/Win32 if needed.
>Index: databases/mysql80-client/files/patch-client_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-client_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-client_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- client/CMakeLists.txt.orig	2019-04-13 13:46:31.000000000 +0200
>-+++ client/CMakeLists.txt	2019-04-30 00:27:10.627236000 +0200
>-@@ -35,10 +35,12 @@
>+--- client/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
>++++ client/CMakeLists.txt
>+@@ -35,10 +35,12 @@ IF(UNIX)
>    TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
>  ENDIF(UNIX)
>  
>@@ -13,19 +13,20 @@
>  
>  SET(MYSQLTEST_SRC
>    mysqltest/error_names.cc
>-@@ -48,9 +50,11 @@
>+@@ -49,10 +51,12 @@ SET(MYSQLTEST_SRC
>    mysqltest/utils.cc
>  )
>  
> +IF(FALSE)
>  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)
>+ SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
>  TARGET_LINK_LIBRARIES(mysqltest mysqlclient)
>  ADD_DEPENDENCIES(mysqltest GenError GenClientError)
> +ENDIF()
>  
>- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
>+ ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
>  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
>-@@ -108,8 +112,10 @@
>+@@ -111,8 +115,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
>  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
>  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
>  
>@@ -35,4 +36,4 @@
> +ENDIF()
>  
>  MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
>- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
>+ TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys)
>Index: databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake
>===================================================================
>--- databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake	(revision 509206)
>+++ databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake	(working copy)
>@@ -1,8 +1,8 @@
>---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
>+--- cmake/os/FreeBSD.cmake.orig	2019-06-25 10:23:30 UTC
> +++ cmake/os/FreeBSD.cmake
>-@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
>-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
>-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
>+@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
>+       MESSAGE(FATAL_ERROR
>+         "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
>      ENDIF()
> -  ELSE()
> -    MESSAGE(FATAL_ERROR "Unsupported compiler!")
>@@ -23,10 +23,3 @@
>    ENDIF()
>  ENDIF()
>  
>- # Should not be needed any more, but kept for easy resurrection if needed
>- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
>- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
>--
>-+# For GCC maybe it's also good idea to use
>-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
>-+    
>Index: databases/mysql80-client/files/patch-cmake_ssl.cmake
>===================================================================
>--- databases/mysql80-client/files/patch-cmake_ssl.cmake	(revision 509206)
>+++ databases/mysql80-client/files/patch-cmake_ssl.cmake	(working copy)
>@@ -1,9 +1,6 @@
>---- cmake/ssl.cmake.orig	2018-04-29 16:21:47 UTC
>+--- cmake/ssl.cmake.orig	2019-06-25 10:23:30 UTC
> +++ cmake/ssl.cmake
>-@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL)
>-         OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
>-         )
>-     ENDIF()
>+@@ -310,7 +310,7 @@ MACRO (MYSQL_CHECK_SSL)
>      IF(OPENSSL_INCLUDE_DIR AND
>         OPENSSL_LIBRARY   AND
>         CRYPTO_LIBRARY      AND
>Index: databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
>===================================================================
>--- databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h	(revision 509206)
>+++ databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- extra/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
>-+++ extra/libedit/chartype.h
>-@@ -49,7 +49,7 @@
>-   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
>- #if !defined(__NetBSD__) && !defined(__sun) \
>-   && !(defined(__APPLE__) && defined(__MACH__)) \
>--  && !defined(__FreeBSD__) && !defined(_AIX)
>-+  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
>- #ifndef __STDC_ISO_10646__
>- /* In many places it is assumed that the first 127 code points are ASCII
>-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
>
>Property changes on: databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
>___________________________________________________________________
>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: databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
>===================================================================
>--- databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c	(revision 509206)
>+++ databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c	(nonexistent)
>@@ -1,20 +0,0 @@
>---- extra/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
>-+++ extra/libedit/vi.c
>-@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
>-  * NB: posix implies that we should enter insert mode, however
>-  * this is against historical precedent...
>-  */
>--#if defined(__weak_reference) && !defined(__FreeBSD__)
>-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>- __weakref_visible char *my_get_alias_text(const char *)
>-     __weak_reference(get_alias_text);
>- #endif
>-@@ -928,7 +928,7 @@ protected el_action_t
>- vi_alias(EditLine *el __attribute__((__unused__)),
>- 	 Int c __attribute__((__unused__)))
>- {
>--#if defined(__weak_reference) && !defined(__FreeBSD__)
>-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>- 	char alias_name[3];
>- 	char *alias_text;
>- 
>
>Property changes on: databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
>___________________________________________________________________
>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: databases/mysql80-client/files/patch-extra_libedit_chartype.h
>===================================================================
>--- databases/mysql80-client/files/patch-extra_libedit_chartype.h	(nonexistent)
>+++ databases/mysql80-client/files/patch-extra_libedit_chartype.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- extra/libedit/chartype.h.orig	2019-06-25 10:23:30 UTC
>++++ extra/libedit/chartype.h
>+@@ -49,7 +49,7 @@
>+   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
>+ #if !defined(__NetBSD__) && !defined(__sun) \
>+   && !(defined(__APPLE__) && defined(__MACH__)) \
>+-  && !defined(__FreeBSD__) && !defined(_AIX)
>++  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
>+ #ifndef __STDC_ISO_10646__
>+ /* In many places it is assumed that the first 127 code points are ASCII
>+  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
>
>Property changes on: databases/mysql80-client/files/patch-extra_libedit_chartype.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-client/files/patch-extra_libedit_vi.c
>===================================================================
>--- databases/mysql80-client/files/patch-extra_libedit_vi.c	(nonexistent)
>+++ databases/mysql80-client/files/patch-extra_libedit_vi.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- extra/libedit/vi.c.orig	2019-06-25 10:23:30 UTC
>++++ extra/libedit/vi.c
>+@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __attribute__((__un
>+  * NB: posix implies that we should enter insert mode, however
>+  * this is against historical precedent...
>+  */
>+-#if defined(__weak_reference) && !defined(__FreeBSD__)
>++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>+ __weakref_visible char *my_get_alias_text(const char *)
>+     __weak_reference(get_alias_text);
>+ #endif
>+@@ -928,7 +928,7 @@ protected el_action_t
>+ vi_alias(EditLine *el __attribute__((__unused__)),
>+ 	 Int c __attribute__((__unused__)))
>+ {
>+-#if defined(__weak_reference) && !defined(__FreeBSD__)
>++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>+ 	char alias_name[3];
>+ 	char *alias_text;
>+ 
>
>Property changes on: databases/mysql80-client/files/patch-extra_libedit_vi.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-client/files/patch-include_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-include_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-include_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- include/CMakeLists.txt.orig	2017-09-21 15:51:58 UTC
>+--- include/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ include/CMakeLists.txt
>-@@ -30,11 +30,173 @@ SET(HEADERS
>+@@ -36,10 +36,172 @@ SET(HEADERS
>    ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
>    ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
>    field_types.h
>@@ -124,7 +124,7 @@
>  SET(HEADERS_MYSQL_DIR
>    mysql/client_plugin.h
>    mysql/plugin_auth_common.h
>-   mysql/udf_registration_types.h
>++  mysql/udf_registration_types.h
> +  mysql/client_authentication.h
> +  mysql/client_plugin.h.pp
> +  mysql/com_data.h
>@@ -170,7 +170,6 @@
> +  mysql/services.h.pp
> +  mysql/thread_pool_priv.h
> +  mysql/thread_type.h
>-+  mysql/udf_registration_types.h
>+   mysql/udf_registration_types.h
>  )
>  
>- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>Index: databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-libmysql_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-libmysql_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- libmysql/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
>+--- libmysql/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ libmysql/CMakeLists.txt
>-@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
>+@@ -194,6 +194,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
>    )
>  ENDIF()
>  
>@@ -12,12 +12,3 @@
>  #
>  # Include protocol tracing infrastructure and the test
>  # trace plugin if enabled by build options.
>-@@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED)
>-     COMPONENT SharedLibraries)
>-   IF(UNIX)
>-     # libtool compatability
>--    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
>-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
>-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
>-     ELSE()
>-       SET(OS_SHARED_LIB_VERSION
>Index: databases/mysql80-client/files/patch-man_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-man_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-man_CMakeLists.txt	(working copy)
>@@ -1,12 +1,16 @@
>---- man/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
>+--- man/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ man/CMakeLists.txt
>-@@ -22,9 +22,6 @@
>+@@ -21,11 +21,8 @@
>+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
>  
>  # Copy man pages
>- FILE(GLOB MAN1 *.1)
>+-FILE(GLOB MAN1 *.1)
> -FILE(GLOB MAN1_NDB ndb*.1)
>+-FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
> -FILE(GLOB MAN8 *.8)
> -FILE(GLOB MAN8_NDB ndb*.8)
>++FILE(GLOB MAN1 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)
>++FILE(GLOB MAN1_ROUTER mysqlroutercomp_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)
>  IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
>    LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
>  ENDIF()
>Index: databases/mysql80-client/files/patch-mysys__ssl_my__default.cc
>===================================================================
>--- databases/mysql80-client/files/patch-mysys__ssl_my__default.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-mysys__ssl_my__default.cc	(nonexistent)
>@@ -1,60 +0,0 @@
>---- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
>-+++ mysys_ssl/my_default.cc
>-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
>- 
>- /* Which directories are searched for options (and in which order) */
>- 
>--#define MAX_DEFAULT_DIRS 6
>-+#define MAX_DEFAULT_DIRS 7
>- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
>- static const char **default_directories = NULL;
>- 
>-@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
>-       return 1; /* Ignore wrong files */
>-   }
>- 
>-+  if (strstr(name, "/etc") == name)
>-+  {
>-+    fprintf(stderr,
>-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
>-+             name,name);
>-+      goto err;
>-+  }
>-+
>-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {
>-     line++;
>-     /* Ignore comment and empty lines */
>-@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
>-             end[(strlen(end) - 1)] = ' ';
>-           else
>-             strxmov(end, conf_file, *ext, " ", NullS);
>--          fputs(name, stdout);
>-+          if (strstr(name, "/etc") != name)
>-+            fputs(name, stdout);
>-         }
>-       }
>-     }
>-@@ -1411,13 +1420,8 @@ static const char **init_default_directo
>- 
>- #else
>- 
>--  errors += add_directory(alloc, "/etc/", dirs);
>--  errors += add_directory(alloc, "/etc/mysql/", dirs);
>--
>--#if defined(DEFAULT_SYSCONFDIR)
>--  if (DEFAULT_SYSCONFDIR[0])
>--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>--#endif /* DEFAULT_SYSCONFDIR */
>-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
>-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
>- 
>- #endif
>- 
>-@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
>-   MY_STAT stat_info;
>- 
>--  if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
>-+  if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
>-   /*
>-     Ignore .mylogin.cnf file if not exclusively readable/writable
>-     by current user.
>
>Property changes on: databases/mysql80-client/files/patch-mysys__ssl_my__default.cc
>___________________________________________________________________
>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: databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc
>===================================================================
>--- databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- mysys_ssl/my_md5.cc.orig	2018-04-08 06:44:49 UTC
>-+++ mysys_ssl/my_md5.cc
>-@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
>- int compute_md5_hash(char *digest, const char *buf, int len) {
>-   int retval = 0;
>-   int fips_mode = 0;
>--#if !defined(HAVE_WOLFSSL)
>-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>-   fips_mode = FIPS_mode();
>- #endif /* HAVE_WOLFSSL */
>-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
>
>Property changes on: databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc
>___________________________________________________________________
>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: databases/mysql80-client/files/patch-mysys_my__default.cc
>===================================================================
>--- databases/mysql80-client/files/patch-mysys_my__default.cc	(nonexistent)
>+++ databases/mysql80-client/files/patch-mysys_my__default.cc	(working copy)
>@@ -0,0 +1,62 @@
>+--- mysys/my_default.cc.orig	2019-06-25 10:23:30 UTC
>++++ mysys/my_default.cc
>+@@ -203,7 +203,7 @@ bool no_defaults = false;
>+ 
>+ /* Which directories are searched for options (and in which order) */
>+ 
>+-#define MAX_DEFAULT_DIRS 6
>++#define MAX_DEFAULT_DIRS 7
>+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
>+ static const char **default_directories = NULL;
>+ 
>+@@ -909,6 +909,14 @@ static int search_default_file_with_ext(Process_option
>+       return 1; /* Ignore wrong files */
>+   }
>+ 
>++  if (strstr(name, "/etc") == name)
>++  {
>++    fprintf(stderr,
>++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
>++             name,name);
>++      goto err;
>++  }
>++
>+   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {
>+     line++;
>+     /* Ignore comment and empty lines */
>+@@ -1228,7 +1236,8 @@ void my_print_default_files(const char *conf_file) {
>+             end[(strlen(end) - 1)] = ' ';
>+           else
>+             strxmov(end, conf_file, *ext, " ", NullS);
>+-          fputs(name, stdout);
>++          if (strstr(name, "/etc") != name)
>++            fputs(name, stdout);
>+         }
>+       }
>+     }
>+@@ -1565,14 +1574,9 @@ static const char **init_default_directories(MEM_ROOT 
>+ 
>+ #else
>+ 
>+-  errors += add_directory(alloc, "/etc/", dirs);
>+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
>++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
>++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
>+ 
>+-#if defined(DEFAULT_SYSCONFDIR)
>+-  if (DEFAULT_SYSCONFDIR[0])
>+-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>+-#endif /* DEFAULT_SYSCONFDIR */
>+-
>+ #endif
>+ 
>+   if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
>+@@ -1635,7 +1639,7 @@ int check_file_permissions(const char *file_name, bool
>+ #if !defined(_WIN32)
>+   MY_STAT stat_info;
>+ 
>+-  if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
>++  if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
>+   /*
>+     Ignore .mylogin.cnf file if not exclusively readable/writable
>+     by current user.
>
>Property changes on: databases/mysql80-client/files/patch-mysys_my__default.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-client/files/patch-mysys_my__md5.cc
>===================================================================
>--- databases/mysql80-client/files/patch-mysys_my__md5.cc	(nonexistent)
>+++ databases/mysql80-client/files/patch-mysys_my__md5.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- mysys/my_md5.cc.orig	2019-06-25 10:23:30 UTC
>++++ mysys/my_md5.cc
>+@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigne
>+ int compute_md5_hash(char *digest, const char *buf, int len) {
>+   int retval = 0;
>+   int fips_mode = 0;
>+-#if !defined(HAVE_WOLFSSL)
>++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>+   fips_mode = FIPS_mode();
>+ #endif /* HAVE_WOLFSSL */
>+   /* If fips mode is ON/STRICT restricted method calls will result into abort,
>
>Property changes on: databases/mysql80-client/files/patch-mysys_my__md5.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc
>===================================================================
>--- databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- plugin/x/client/xconnection_impl.cc.orig	2018-04-08 06:44:49 UTC
>+--- plugin/x/client/xconnection_impl.cc.orig	2019-06-25 10:23:30 UTC
> +++ plugin/x/client/xconnection_impl.cc
>-@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio, 
>+@@ -221,12 +221,12 @@ XError ssl_verify_server_cert(Vio *vio, const std::str
>      return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"};
>    }
>  
>@@ -17,7 +17,7 @@
>    const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
>  
>    // There should not be any NULL embedded in the CN
>-@@ -451,7 +451,7 @@ XError Connection_impl::get_ssl_error(co
>+@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_
>    return XError(CR_SSL_CONNECTION_ERROR, buffer);
>  }
>  
>@@ -26,7 +26,7 @@
>  /**
>    Set fips mode in openssl library,
>    When we set fips mode ON/STRICT, it will perform following operations:
>-@@ -501,7 +501,7 @@ XError Connection_impl::activate_tls() {
>+@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() {
>    if (!m_context->m_ssl_config.is_configured())
>      return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
>  
>Index: databases/mysql80-client/files/patch-scripts_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- scripts/CMakeLists.txt.orig	2018-10-07 08:44:22 UTC
>+--- scripts/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ scripts/CMakeLists.txt
>-@@ -80,6 +80,7 @@ ELSE()
>+@@ -76,6 +76,7 @@ ELSE()
>    MESSAGE(FATAL_ERROR "Cannot concatenate files")
>  ENDIF()
>  
>@@ -8,7 +8,7 @@
>  # Build mysql_fix_privilege_tables.h
>  ADD_CUSTOM_COMMAND(
>    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
>-@@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
>+@@ -96,6 +97,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
>    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
>    ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
>  )
>@@ -16,7 +16,7 @@
>  
>  # If we do not have performance schema compiled in then sys will not work,
>  # so only create an empty sys database with an auto-generated file,
>-@@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER)
>+@@ -212,6 +214,7 @@ IF(NOT WITHOUT_SERVER)
>    )
>  ENDIF()
>  
>@@ -24,7 +24,7 @@
>  IF(UNIX)
>   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
>     "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
>-@@ -211,6 +214,7 @@ IF(UNIX)
>+@@ -219,6 +222,7 @@ IF(UNIX)
>    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
>  )
>  ENDIF()
>@@ -32,7 +32,7 @@
>  
>  # TCMalloc hacks
>  IF(MALLOC_LIB)
>-@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>+@@ -363,7 +367,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>      LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
>      FOREACH(lib ${${target}_LIB_DEPENDS})
>        # Filter out "general", it is not a library, just CMake hint
>@@ -40,8 +40,8 @@
> +      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
>          IF (lib MATCHES "^\\-l")
>            SET(${var} "${${var}} ${lib} ")
>-         ELSEIF(lib MATCHES "^/")
>-@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>+         ELSEIF (lib MATCHES "^\\-L")
>+@@ -373,6 +377,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} " )
>@@ -50,9 +50,9 @@
>          ELSE()
>            SET(${var} "${${var}}-l${lib} " )
>          ENDIF()
>-@@ -454,19 +460,7 @@ ELSE()
>+@@ -457,19 +463,7 @@ ELSE()
>    # On Unix, most of the files end up in the bin directory
>-   SET(mysql_config_COMPONENT COMPONENT Development)
>+   SET(mysql_config_COMPONENT Development)
>  
> -  IF(WITH_SYSTEMD)
> -    SET(BIN_SCRIPTS
>Index: databases/mysql80-client/files/patch-share_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-share_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-share_CMakeLists.txt	(working copy)
>@@ -1,14 +1,14 @@
>---- share/CMakeLists.txt.orig	2017-10-03 10:54:31 UTC
>+--- share/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ share/CMakeLists.txt
>-@@ -45,6 +45,7 @@ SET(files 
>+@@ -52,6 +52,7 @@ SET(files 
>   dictionary.txt
>  )
>  
> +IF (FALSE)
>  FOREACH (dir ${dirs})
>-   INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} 
>+   INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir}
>            DESTINATION ${INSTALL_MYSQLSHAREDIR}
>-@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
>+@@ -64,13 +65,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets
>          COMPONENT Server
>          PATTERN "languages.html" EXCLUDE
>  )
>Index: databases/mysql80-client/files/patch-sql-common_client.cc
>===================================================================
>--- databases/mysql80-client/files/patch-sql-common_client.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-sql-common_client.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
>+--- sql-common/client.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql-common/client.cc
>-@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
>+@@ -7602,7 +7602,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
>  #endif
>        break;
>      case MYSQL_OPT_SSL_FIPS_MODE: {
>@@ -8,4 +8,4 @@
> +#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>        char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
>        ENSURE_EXTENSIONS_PRESENT(&mysql->options);
>-       mysql->options.extension->ssl_fips_mode = *(uint *)arg;
>+       mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
>Index: databases/mysql80-client/files/patch-sql_mysqld.cc
>===================================================================
>--- databases/mysql80-client/files/patch-sql_mysqld.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-sql_mysqld.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- sql/mysqld.cc.orig	2018-05-06 19:15:48 UTC
>+--- sql/mysqld.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql/mysqld.cc
>-@@ -4321,7 +4321,7 @@ static void init_ssl() {
>+@@ -4812,7 +4812,7 @@ static void my_openssl_free(void *ptr FILE_LINE_ARGS) 
>  
>  static void init_ssl() {
>  #ifdef HAVE_OPENSSL
>Index: databases/mysql80-client/files/patch-sql_sys__vars.cc
>===================================================================
>--- databases/mysql80-client/files/patch-sql_sys__vars.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-sql_sys__vars.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- sql/sys_vars.cc.orig	2018-05-06 19:16:02 UTC
>+--- sql/sys_vars.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql/sys_vars.cc
>-@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version(
>-     READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION),
>-     IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2");
>+@@ -4377,7 +4377,7 @@ static Sys_var_ulong Sys_max_execution_time(
>+     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
>+     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
>  
> -#ifndef HAVE_WOLFSSL
> +#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>@@ -9,7 +9,7 @@
>  static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
>    char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
>    if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
>-@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *, 
>+@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_va
>  }
>  #endif
>  
>@@ -18,8 +18,8 @@
>  static const char *ssl_fips_mode_names[] = {"OFF", 0};
>  #else
>  static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
>-@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
>-     GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE),
>+@@ -4406,7 +4406,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
>+     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
>      ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
>      ON_CHECK(NULL),
> -#ifndef HAVE_WOLFSSL
>Index: databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc
>===================================================================
>--- databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- storage/myisam/mi_dynrec.cc.orig	2016-03-28 18:06:12 UTC
>+--- storage/myisam/mi_dynrec.cc.orig	2019-06-25 10:23:30 UTC
> +++ storage/myisam/mi_dynrec.cc
>-@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my
>+@@ -83,17 +83,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
>      DBUG_RETURN(1);
>    }
>    /*
>@@ -19,4 +19,4 @@
> +      MAP_SHARED, info->dfile, 0L);
>    if (info->s->file_map == (uchar *)MAP_FAILED) {
>      info->s->file_map = NULL;
>-
>+     DBUG_RETURN(1);
>Index: databases/mysql80-client/files/patch-support-files_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-support-files_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-support-files_CMakeLists.txt	(working copy)
>@@ -1,23 +1,15 @@
>---- support-files/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
>+--- support-files/CMakeLists.txt.orig	2019-08-18 22:16:38 UTC
> +++ support-files/CMakeLists.txt
>-@@ -46,6 +46,7 @@ IF(UNIX)
>-   ELSE()
>-     SET (PIDOF "pgrep -d' ' -f")
>-   ENDIF()
>+@@ -39,6 +39,7 @@ ELSE()
>+   SET (PIDOF "pgrep -d' ' -f")
>+ ENDIF()
>+ 
> +IF (FALSE)
>-   SET(prefix ${CMAKE_INSTALL_PREFIX})
>-   FOREACH(script  mysqld_multi.server mysql-log-rotate)
>-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
>-@@ -63,9 +64,12 @@
>-        DESTINATION ${inst_location} COMPONENT ${comp}
>-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
>-   ENDFOREACH()
>+ FOREACH(script
>+     mysql.server
>+     mysqld_multi.server
>+@@ -54,3 +55,4 @@ FOREACH(script
>+     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
>+     )
>+ ENDFOREACH()
> +ENDIF()
>-+ENDIF()
>- 
>-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
>-   
>-+IF (FALSE)
>-   SET(bindir ${prefix}/${INSTALL_BINDIR})
>-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
>-   SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
>Index: databases/mysql80-client/files/patch-utilities_CMakeLists.txt
>===================================================================
>--- databases/mysql80-client/files/patch-utilities_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-client/files/patch-utilities_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- utilities/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
>+--- utilities/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ utilities/CMakeLists.txt
>-@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR
>+@@ -57,6 +57,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${INSTALL_MY
>  
>  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
>                     ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys
>@@ -8,19 +8,19 @@
>                     COMMAND comp_err
>                      --charset=${PROJECT_SOURCE_DIR}/share/charsets
>                      --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
>-@@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_
>+@@ -94,6 +95,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB)
>    ADD_DEPENDENCIES(comp_err copy_openssl_dlls)
>  ENDIF()
>  
> +IF(FALSE)
>  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
>- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
>- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
>-@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
>-   ADD_DEPENDENCIES(ibd2sdi GenError)
>+ TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
>  
>+@@ -109,6 +111,7 @@ ENDIF()
>+ IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
>+   MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
>+   TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
>++ENDIF()
>  ENDIF()
>-+ENDIF()
>  
>- # In published release builds on Solaris, we need to bundle gcc source.
>- # PB2 will take care of putting it in extra/ when needed
>+ IF(WITH_INNOBASE_STORAGE_ENGINE)
>Index: databases/mysql80-client/files/patch-vio_viosslfactories.cc
>===================================================================
>--- databases/mysql80-client/files/patch-vio_viosslfactories.cc	(revision 509206)
>+++ databases/mysql80-client/files/patch-vio_viosslfactories.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- vio/viosslfactories.cc.orig	2018-04-08 06:44:49 UTC
>+--- vio/viosslfactories.cc.orig	2019-06-25 10:23:30 UTC
> +++ vio/viosslfactories.cc
>-@@ -37,6 +37,7 @@
>+@@ -38,6 +38,7 @@
>  
>  #ifdef HAVE_OPENSSL
>  #include <openssl/dh.h>
>@@ -8,7 +8,7 @@
>  
>  #define TLS_VERSION_OPTION_SIZE 256
>  #define SSL_CIPHER_LIST_SIZE 4096
>-@@ -135,7 +136,7 @@ static DH *get_dh2048(void) {
>+@@ -136,7 +137,7 @@ static DH *get_dh2048(void) {
>      BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
>      BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
>      if (!p || !g
>@@ -17,7 +17,7 @@
>          || !DH_set0_pqg(dh, p, NULL, g)
>  #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
>      ) {
>-@@ -426,7 +427,7 @@ void ssl_start() {
>+@@ -429,7 +430,7 @@ void ssl_start() {
>    }
>  }
>  
>@@ -26,7 +26,7 @@
>  /**
>    Set fips mode in openssl library,
>    When we set fips mode ON/STRICT, it will perform following operations:
>-@@ -449,6 +450,10 @@ int set_fips_mode(const uint fips_mode, 
>+@@ -452,6 +453,10 @@ int set_fips_mode(const uint fips_mode, char err_strin
>    int rc = -1;
>    unsigned int fips_mode_old = -1;
>    unsigned long err_library = 0;
>@@ -37,7 +37,7 @@
>    if (fips_mode > 2) {
>      goto EXIT;
>    }
>-@@ -462,6 +467,7 @@ int set_fips_mode(const uint fips_mode, 
>+@@ -465,6 +470,7 @@ int set_fips_mode(const uint fips_mode, char err_strin
>      ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
>      err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
>    }
>Index: databases/mysql80-server/Makefile
>===================================================================
>--- databases/mysql80-server/Makefile	(revision 509206)
>+++ databases/mysql80-server/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME?=		mysql
>-PORTVERSION=		8.0.16
>-PORTREVISION?=		4
>+PORTVERSION=		8.0.17
>+PORTREVISION?=		0
> CATEGORIES=		databases ipv6
> MASTER_SITES=		MYSQL/MySQL-8.0
> PKGNAMESUFFIX?=		80-server
>@@ -18,7 +18,7 @@
> 
> SLAVEDIRS=	databases/mysql80-client
> USES=		bison:build cmake:noninja compiler:c++14-lang cpe \
>-		libedit localbase perl5 shebangfix ssl
>+		libedit localbase perl5 shebangfix ssl pkgconfig
> 
> USE_PERL5=	run
> 
>@@ -69,7 +69,7 @@
> 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.
>+.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} \
>Index: databases/mysql80-server/distinfo
>===================================================================
>--- databases/mysql80-server/distinfo	(revision 509206)
>+++ databases/mysql80-server/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1556566256
>-SHA256 (mysql-boost-8.0.16.tar.gz) = 7c936aa7bc9f4c462b24bade2e9abe1b3a6869ea19c46e78ec0a9b2a87a3d17f
>-SIZE (mysql-boost-8.0.16.tar.gz) = 145939027
>+TIMESTAMP = 1566134384
>+SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a
>+SIZE (mysql-boost-8.0.17.tar.gz) = 189322239
>Index: databases/mysql80-server/files/patch-CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-CMakeLists.txt	(working copy)
>@@ -1,7 +1,7 @@
>---- CMakeLists.txt.orig	2019-01-21 19:00:53 UTC
>+--- CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ CMakeLists.txt
>-@@ -1045,7 +1045,6 @@ IF(UNIX)
>- ENDIF()
>+@@ -1254,7 +1254,6 @@ ADD_SUBDIRECTORY(share)
>+ ADD_SUBDIRECTORY(libservices)
>  
>  IF(NOT WITHOUT_SERVER)
> -  ADD_SUBDIRECTORY(testclients)
>@@ -8,7 +8,7 @@
>    ADD_SUBDIRECTORY(sql)
>  ENDIF()
>  
>-@@ -1054,8 +1053,6 @@ ENDIF()
>+@@ -1263,8 +1262,6 @@ ENDIF()
>  ADD_SUBDIRECTORY(scripts)
>  
>  IF(NOT WITHOUT_SERVER)
>@@ -17,7 +17,7 @@
>    ADD_SUBDIRECTORY(support-files)
>    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
>      ADD_SUBDIRECTORY(internal)
>-@@ -1152,6 +1149,7 @@ ENDIF()
>+@@ -1371,6 +1368,7 @@ ENDIF()
>  #
>  # RPM installs documentation directly from the source tree
>  #
>@@ -25,11 +25,11 @@
>  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>    INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
>    INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
>-@@ -1170,6 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+@@ -1388,6 +1386,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+     PATTERN "sp-imp-spec.txt" EXCLUDE
>      PATTERN "README.build" EXCLUDE
>    )
>++ENDIF()
>  ENDIF()
>-+ENDIF()
>  
>  # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
>- # we can safely enable ASan on Clang/Win32 if needed.
>Index: databases/mysql80-server/files/patch-client_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-client_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-client_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- client/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
>+--- client/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ client/CMakeLists.txt
>-@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
>+@@ -26,14 +26,14 @@ INCLUDE_DIRECTORIES(
>  
>  ## Subdirectory with common client code.
>  ADD_SUBDIRECTORY(base)
>@@ -17,8 +17,8 @@
>  
>  IF(NOT WITHOUT_SERVER)
>    MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
>-@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
>- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
>+@@ -57,6 +57,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenClientError)
>+ ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
>  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
>  
> +IF(FALSE)
>@@ -25,7 +25,7 @@
>  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
>  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
>  
>-@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
>+@@ -69,7 +70,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
>  
>  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
>  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
>@@ -35,7 +35,7 @@
>  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
>  SET(MYSQLBINLOG_LIB_SOURCES
>    ${CMAKE_SOURCE_DIR}/strings/decimal.cc
>-@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
>+@@ -110,10 +113,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
>  
>  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
>  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
>@@ -46,8 +46,5 @@
>  
> +IF(FALSE)
>  MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
>- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
>-+ENDIF()
>+ TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys)
>  
>- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
>- IF(WIN32)
>Index: databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
>===================================================================
>--- databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake	(revision 509206)
>+++ databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake	(nonexistent)
>@@ -1,31 +0,0 @@
>---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
>-+++ cmake/os/FreeBSD.cmake
>-@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
>-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
>-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
>-     ENDIF()
>-+    CHECK_C_SOURCE_RUNS("
>-+      int main()
>-+      {
>-+        return (__clang_major__ >= 4);
>-+      }" I386_ATOMIC_BUILTINS)
>-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
>-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
>-+    ENDIF()
>-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
>-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
>-+                    OUTPUT_VARIABLE GCC_VERSION)
>-+    IF(GCC_VERSION VERSION_LESS 4.4)
>-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
>-+    ENDIF()
>-   ELSE()
>-     MESSAGE(FATAL_ERROR "Unsupported compiler!")
>-   ENDIF()
>-@@ -38,4 +52,6 @@ ENDIF()
>- # Should not be needed any more, but kept for easy resurrection if needed
>- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
>- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
>--
>-+# For GCC maybe it's also good idea to use
>-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
>-+    
>
>Property changes on: databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
>___________________________________________________________________
>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: databases/mysql80-server/files/patch-cmake_plugin.cmake
>===================================================================
>--- databases/mysql80-server/files/patch-cmake_plugin.cmake	(revision 509206)
>+++ databases/mysql80-server/files/patch-cmake_plugin.cmake	(working copy)
>@@ -1,6 +1,6 @@
>---- cmake/plugin.cmake.orig	2017-06-27 11:44:29 UTC
>+--- cmake/plugin.cmake.orig	2019-06-25 10:23:30 UTC
> +++ cmake/plugin.cmake
>-@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN)
>+@@ -246,9 +246,6 @@ MACRO(MYSQL_ADD_PLUGIN)
>        MYSQL_INSTALL_TARGETS(${target}
>          DESTINATION ${INSTALL_PLUGINDIR}
>          COMPONENT ${INSTALL_COMPONENT})
>Index: databases/mysql80-server/files/patch-cmake_ssl.cmake
>===================================================================
>--- databases/mysql80-server/files/patch-cmake_ssl.cmake	(revision 509206)
>+++ databases/mysql80-server/files/patch-cmake_ssl.cmake	(working copy)
>@@ -1,9 +1,6 @@
>---- cmake/ssl.cmake.orig	2018-04-29 16:21:47 UTC
>+--- cmake/ssl.cmake.orig	2019-06-25 10:23:30 UTC
> +++ cmake/ssl.cmake
>-@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL)
>-         OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
>-         )
>-     ENDIF()
>+@@ -310,7 +310,7 @@ MACRO (MYSQL_CHECK_SSL)
>      IF(OPENSSL_INCLUDE_DIR AND
>         OPENSSL_LIBRARY   AND
>         CRYPTO_LIBRARY      AND
>Index: databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h
>===================================================================
>--- databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h	(revision 509206)
>+++ databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- extra/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
>-+++ extra/libedit/chartype.h
>-@@ -49,7 +49,7 @@
>-   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
>- #if !defined(__NetBSD__) && !defined(__sun) \
>-   && !(defined(__APPLE__) && defined(__MACH__)) \
>--  && !defined(__FreeBSD__) && !defined(_AIX)
>-+  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
>- #ifndef __STDC_ISO_10646__
>- /* In many places it is assumed that the first 127 code points are ASCII
>-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
>
>Property changes on: databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h
>___________________________________________________________________
>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: databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c
>===================================================================
>--- databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c	(revision 509206)
>+++ databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c	(nonexistent)
>@@ -1,20 +0,0 @@
>---- extra/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
>-+++ extra/libedit/vi.c
>-@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
>-  * NB: posix implies that we should enter insert mode, however
>-  * this is against historical precedent...
>-  */
>--#if defined(__weak_reference) && !defined(__FreeBSD__)
>-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>- __weakref_visible char *my_get_alias_text(const char *)
>-     __weak_reference(get_alias_text);
>- #endif
>-@@ -928,7 +928,7 @@ protected el_action_t
>- vi_alias(EditLine *el __attribute__((__unused__)),
>- 	 Int c __attribute__((__unused__)))
>- {
>--#if defined(__weak_reference) && !defined(__FreeBSD__)
>-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>- 	char alias_name[3];
>- 	char *alias_text;
>- 
>
>Property changes on: databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c
>___________________________________________________________________
>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: databases/mysql80-server/files/patch-extra_libedit_chartype.h
>===================================================================
>--- databases/mysql80-server/files/patch-extra_libedit_chartype.h	(nonexistent)
>+++ databases/mysql80-server/files/patch-extra_libedit_chartype.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- extra/libedit/chartype.h.orig	2019-06-25 10:23:30 UTC
>++++ extra/libedit/chartype.h
>+@@ -49,7 +49,7 @@
>+   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
>+ #if !defined(__NetBSD__) && !defined(__sun) \
>+   && !(defined(__APPLE__) && defined(__MACH__)) \
>+-  && !defined(__FreeBSD__) && !defined(_AIX)
>++  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
>+ #ifndef __STDC_ISO_10646__
>+ /* In many places it is assumed that the first 127 code points are ASCII
>+  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
>
>Property changes on: databases/mysql80-server/files/patch-extra_libedit_chartype.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-server/files/patch-extra_libedit_vi.c
>===================================================================
>--- databases/mysql80-server/files/patch-extra_libedit_vi.c	(nonexistent)
>+++ databases/mysql80-server/files/patch-extra_libedit_vi.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- extra/libedit/vi.c.orig	2019-06-25 10:23:30 UTC
>++++ extra/libedit/vi.c
>+@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __attribute__((__un
>+  * NB: posix implies that we should enter insert mode, however
>+  * this is against historical precedent...
>+  */
>+-#if defined(__weak_reference) && !defined(__FreeBSD__)
>++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>+ __weakref_visible char *my_get_alias_text(const char *)
>+     __weak_reference(get_alias_text);
>+ #endif
>+@@ -928,7 +928,7 @@ protected el_action_t
>+ vi_alias(EditLine *el __attribute__((__unused__)),
>+ 	 Int c __attribute__((__unused__)))
>+ {
>+-#if defined(__weak_reference) && !defined(__FreeBSD__)
>++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
>+ 	char alias_name[3];
>+ 	char *alias_text;
>+ 
>
>Property changes on: databases/mysql80-server/files/patch-extra_libedit_vi.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-server/files/patch-include_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-include_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-include_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- include/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
>+--- include/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ include/CMakeLists.txt
>-@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR
>+@@ -43,8 +43,10 @@ SET(HEADERS_MYSQL_DIR
>    mysql/udf_registration_types.h
>  )
>  
>@@ -8,3 +8,6 @@
>  INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>  INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development)
> +ENDIF()
>+ 
>+ # openssl/applink.c must be built into applications linking with libmysql.dll
>+ IF (WIN32 AND OPENSSL_APPLINK_C)
>Index: databases/mysql80-server/files/patch-include_my__thread__os__id.h
>===================================================================
>--- databases/mysql80-server/files/patch-include_my__thread__os__id.h	(revision 509206)
>+++ databases/mysql80-server/files/patch-include_my__thread__os__id.h	(working copy)
>@@ -1,6 +1,6 @@
>---- include/my_thread_os_id.h.orig	2016-03-28 18:06:12 UTC
>+--- include/my_thread_os_id.h.orig	2019-06-25 10:23:30 UTC
> +++ include/my_thread_os_id.h
>-@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
>+@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
>    return pthread_getthreadid_np();
>  #else
>  #ifdef HAVE_INTEGER_PTHREAD_SELF
>Index: databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-libmysql_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-libmysql_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- libmysql/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
>+--- libmysql/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ libmysql/CMakeLists.txt
>-@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica
>+@@ -245,7 +245,7 @@ MESSAGE(STATUS "Creating LDAP authentication SASL clie
>  ADD_SUBDIRECTORY(authentication_ldap)
>    
>  # Merge several convenience libraries into one big mysqlclient
>@@ -9,19 +9,16 @@
>  TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
>  
>  # Visual Studio users need debug  static library for debug projects
>-@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED)
>+@@ -285,7 +285,7 @@ IF(NOT DISABLE_SHARED)
>    # and link them together into shared library.
>    MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
>-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
>+     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS}
> -    COMPONENT SharedLibraries)
> +    COMPONENT SharedLibraries SKIP_INSTALL)
>    TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
>  
>-+IF(FALSE)
>    IF(WIN32)
>-     # So that libmysql_api_test below can find the .dll
>-     ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
>-@@ -338,6 +339,7 @@ ENDIF()
>+@@ -343,6 +343,7 @@ ENDIF()
>  # to initialize api_calls[] array in api_test.c
>  #
>  SET(CLIENT_API_FUNCTION_LIST "")
>Index: databases/mysql80-server/files/patch-libservices_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-libservices_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-libservices_CMakeLists.txt	(working copy)
>@@ -1,9 +1,12 @@
>---- libservices/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
>+--- libservices/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ libservices/CMakeLists.txt
>-@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
>-   mysql_keyring_service.c)
>+@@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES
>+   plugin_registry_service.c)
>  
>- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
>+ ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES})
> +IF(FALSE)
>- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
>+ IF(INSTALL_STATIC_LIBRARIES)
>+   INSTALL(TARGETS mysqlservices
>+     DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
> +ENDIF()
>+ ENDIF()
>Index: databases/mysql80-server/files/patch-man_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-man_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-man_CMakeLists.txt	(working copy)
>@@ -1,10 +1,14 @@
>---- man/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
>+--- man/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ man/CMakeLists.txt
>-@@ -22,7 +22,6 @@
>+@@ -21,9 +21,8 @@
>+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
>  
>  # Copy man pages
>- FILE(GLOB MAN1 *.1)
>+-FILE(GLOB MAN1 *.1)
> -FILE(GLOB MAN1_NDB ndb*.1)
>+-FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
>++FILE(GLOB MAN1 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)
>++FILE(GLOB MAN1_ROUTER mysqlroutermy_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)
>  FILE(GLOB MAN8 *.8)
>  FILE(GLOB MAN8_NDB ndb*.8)
>  IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
>Index: databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
>===================================================================
>--- databases/mysql80-server/files/patch-mysys__ssl_my__default.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-mysys__ssl_my__default.cc	(nonexistent)
>@@ -1,60 +0,0 @@
>---- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
>-+++ mysys_ssl/my_default.cc
>-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
>- 
>- /* Which directories are searched for options (and in which order) */
>- 
>--#define MAX_DEFAULT_DIRS 6
>-+#define MAX_DEFAULT_DIRS 7
>- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
>- static const char **default_directories = NULL;
>- 
>-@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
>-       return 1; /* Ignore wrong files */
>-   }
>- 
>-+  if (strstr(name, "/etc") == name)
>-+  {
>-+    fprintf(stderr,
>-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
>-+             name,name);
>-+      goto err;
>-+  }
>-+
>-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {
>-     line++;
>-     /* Ignore comment and empty lines */
>-@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
>-             end[(strlen(end) - 1)] = ' ';
>-           else
>-             strxmov(end, conf_file, *ext, " ", NullS);
>--          fputs(name, stdout);
>-+          if (strstr(name, "/etc") != name)
>-+            fputs(name, stdout);
>-         }
>-       }
>-     }
>-@@ -1411,13 +1420,8 @@ static const char **init_default_directo
>- 
>- #else
>- 
>--  errors += add_directory(alloc, "/etc/", dirs);
>--  errors += add_directory(alloc, "/etc/mysql/", dirs);
>--
>--#if defined(DEFAULT_SYSCONFDIR)
>--  if (DEFAULT_SYSCONFDIR[0])
>--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>--#endif /* DEFAULT_SYSCONFDIR */
>-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
>-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
>- 
>- #endif
>- 
>-@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
>-   MY_STAT stat_info;
>- 
>--  if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
>-+  if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
>-   /*
>-     Ignore .mylogin.cnf file if not exclusively readable/writable
>-     by current user.
>
>Property changes on: databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
>___________________________________________________________________
>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: databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc
>===================================================================
>--- databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- mysys_ssl/my_md5.cc.orig	2018-04-08 06:44:49 UTC
>-+++ mysys_ssl/my_md5.cc
>-@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
>- int compute_md5_hash(char *digest, const char *buf, int len) {
>-   int retval = 0;
>-   int fips_mode = 0;
>--#if !defined(HAVE_WOLFSSL)
>-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>-   fips_mode = FIPS_mode();
>- #endif /* HAVE_WOLFSSL */
>-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
>
>Property changes on: databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc
>___________________________________________________________________
>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: databases/mysql80-server/files/patch-mysys_my__default.cc
>===================================================================
>--- databases/mysql80-server/files/patch-mysys_my__default.cc	(nonexistent)
>+++ databases/mysql80-server/files/patch-mysys_my__default.cc	(working copy)
>@@ -0,0 +1,62 @@
>+--- mysys/my_default.cc.orig	2019-06-25 10:23:30 UTC
>++++ mysys/my_default.cc
>+@@ -203,7 +203,7 @@ bool no_defaults = false;
>+ 
>+ /* Which directories are searched for options (and in which order) */
>+ 
>+-#define MAX_DEFAULT_DIRS 6
>++#define MAX_DEFAULT_DIRS 7
>+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
>+ static const char **default_directories = NULL;
>+ 
>+@@ -909,6 +909,14 @@ static int search_default_file_with_ext(Process_option
>+       return 1; /* Ignore wrong files */
>+   }
>+ 
>++  if (strstr(name, "/etc") == name)
>++  {
>++    fprintf(stderr,
>++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
>++             name,name);
>++      goto err;
>++  }
>++
>+   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {
>+     line++;
>+     /* Ignore comment and empty lines */
>+@@ -1228,7 +1236,8 @@ void my_print_default_files(const char *conf_file) {
>+             end[(strlen(end) - 1)] = ' ';
>+           else
>+             strxmov(end, conf_file, *ext, " ", NullS);
>+-          fputs(name, stdout);
>++          if (strstr(name, "/etc") != name)
>++            fputs(name, stdout);
>+         }
>+       }
>+     }
>+@@ -1565,14 +1574,9 @@ static const char **init_default_directories(MEM_ROOT 
>+ 
>+ #else
>+ 
>+-  errors += add_directory(alloc, "/etc/", dirs);
>+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
>++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
>++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
>+ 
>+-#if defined(DEFAULT_SYSCONFDIR)
>+-  if (DEFAULT_SYSCONFDIR[0])
>+-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>+-#endif /* DEFAULT_SYSCONFDIR */
>+-
>+ #endif
>+ 
>+   if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
>+@@ -1635,7 +1639,7 @@ int check_file_permissions(const char *file_name, bool
>+ #if !defined(_WIN32)
>+   MY_STAT stat_info;
>+ 
>+-  if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
>++  if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
>+   /*
>+     Ignore .mylogin.cnf file if not exclusively readable/writable
>+     by current user.
>
>Property changes on: databases/mysql80-server/files/patch-mysys_my__default.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-server/files/patch-mysys_my__md5.cc
>===================================================================
>--- databases/mysql80-server/files/patch-mysys_my__md5.cc	(nonexistent)
>+++ databases/mysql80-server/files/patch-mysys_my__md5.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- mysys/my_md5.cc.orig	2019-06-25 10:23:30 UTC
>++++ mysys/my_md5.cc
>+@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigne
>+ int compute_md5_hash(char *digest, const char *buf, int len) {
>+   int retval = 0;
>+   int fips_mode = 0;
>+-#if !defined(HAVE_WOLFSSL)
>++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>+   fips_mode = FIPS_mode();
>+ #endif /* HAVE_WOLFSSL */
>+   /* If fips mode is ON/STRICT restricted method calls will result into abort,
>
>Property changes on: databases/mysql80-server/files/patch-mysys_my__md5.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
>===================================================================
>--- databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- plugin/password_validation/validate_password.cc.orig	2017-06-27 11:44:29 UTC
>+--- plugin/password_validation/validate_password.cc.orig	2019-06-25 10:23:30 UTC
> +++ plugin/password_validation/validate_password.cc
>-@@ -17,6 +17,8 @@
>+@@ -25,6 +25,8 @@
>  #include <mysql/plugin_validate_password.h>
>  #include <mysql/service_my_plugin_log.h>
>  #include <mysql/service_mysql_string.h>
>@@ -9,4 +9,3 @@
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <string.h>
>-
>Index: databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- plugin/x/CMakeLists.txt.orig	2018-04-08 06:44:49 UTC
>+--- plugin/x/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ plugin/x/CMakeLists.txt
>-@@ -80,11 +80,14 @@ INCLUDE_DIRECTORIES(
>+@@ -83,11 +83,14 @@ INCLUDE_DIRECTORIES(
>    ${MYSQLX_GENERATE_DIR}
>    ${MYSQLX_PROTOCOL_INCLUDE_DIR}
>    ${MYSQLX_CLIENT_INCLUDE_DIR}
>@@ -14,3 +14,4 @@
> +MY_INCLUDE_SYSTEM_DIRECTORIES(ZLIB)
>  
>  SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB
>+     ${MYSQLX_PROTOCOL_LIB}
>Index: databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc
>===================================================================
>--- databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- plugin/x/client/xconnection_impl.cc.orig	2018-04-08 06:44:49 UTC
>+--- plugin/x/client/xconnection_impl.cc.orig	2019-06-25 10:23:30 UTC
> +++ plugin/x/client/xconnection_impl.cc
>-@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio, 
>+@@ -221,12 +221,12 @@ XError ssl_verify_server_cert(Vio *vio, const std::str
>      return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"};
>    }
>  
>@@ -17,7 +17,7 @@
>    const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
>  
>    // There should not be any NULL embedded in the CN
>-@@ -451,7 +451,7 @@ XError Connection_impl::get_ssl_error(co
>+@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_
>    return XError(CR_SSL_CONNECTION_ERROR, buffer);
>  }
>  
>@@ -26,7 +26,7 @@
>  /**
>    Set fips mode in openssl library,
>    When we set fips mode ON/STRICT, it will perform following operations:
>-@@ -501,7 +501,7 @@ XError Connection_impl::activate_tls() {
>+@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() {
>    if (!m_context->m_ssl_config.is_configured())
>      return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
>  
>Index: databases/mysql80-server/files/patch-plugin_x_configure.cmake
>===================================================================
>--- databases/mysql80-server/files/patch-plugin_x_configure.cmake	(revision 509206)
>+++ databases/mysql80-server/files/patch-plugin_x_configure.cmake	(working copy)
>@@ -1,7 +1,7 @@
>---- plugin/x/configure.cmake.orig	2018-04-08 06:44:49 UTC
>+--- plugin/x/configure.cmake.orig	2019-06-25 10:23:30 UTC
> +++ plugin/x/configure.cmake
>-@@ -44,6 +44,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
>- CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
>+@@ -46,6 +46,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
>+ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in
>                 ${MYSQLX_GENERATE_DIR}/mysqlx_version.h )
>  
> +IF(FALSE)
>@@ -8,7 +8,7 @@
>  INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_error.h
>          DESTINATION ${INSTALL_INCLUDEDIR}
>          COMPONENT Development)
>-@@ -55,3 +56,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mys
>+@@ -57,3 +58,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_ername.h
>  INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h
>          DESTINATION ${INSTALL_INCLUDEDIR}
>          COMPONENT Development)
>Index: databases/mysql80-server/files/patch-scripts_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-scripts_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-scripts_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
>+--- scripts/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ scripts/CMakeLists.txt
>-@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>+@@ -373,6 +373,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} " )
>@@ -9,9 +9,9 @@
>          ELSE()
>            SET(${var} "${${var}}-l${lib} " )
>          ENDIF()
>-@@ -430,14 +432,13 @@ ELSE()
>+@@ -457,14 +459,13 @@ ELSE()
>    # On Unix, most of the files end up in the bin directory
>-   SET(mysql_config_COMPONENT COMPONENT Development)
>+   SET(mysql_config_COMPONENT Development)
>  
> +
>    IF(WITH_SYSTEMD)
>@@ -25,7 +25,7 @@
>        mysqldumpslow
>        mysqld_multi
>        mysqld_safe
>-@@ -471,7 +472,7 @@ ELSE()
>+@@ -498,7 +499,7 @@ ELSE()
>    FOREACH(file ${BIN_SCRIPTS})
>      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
>        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
>Index: databases/mysql80-server/files/patch-sql-common_client.cc
>===================================================================
>--- databases/mysql80-server/files/patch-sql-common_client.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-sql-common_client.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
>+--- sql-common/client.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql-common/client.cc
>-@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
>+@@ -7602,7 +7602,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
>  #endif
>        break;
>      case MYSQL_OPT_SSL_FIPS_MODE: {
>@@ -8,4 +8,4 @@
> +#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>        char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
>        ENSURE_EXTENSIONS_PRESENT(&mysql->options);
>-       mysql->options.extension->ssl_fips_mode = *(uint *)arg;
>+       mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
>Index: databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
>===================================================================
>--- databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- sql/conn_handler/socket_connection.cc.orig	2019-01-21 20:10:03 UTC
>+--- sql/conn_handler/socket_connection.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql/conn_handler/socket_connection.cc
>-@@ -873,9 +873,11 @@ bool check_connection_refused_by_tcp_wra
>+@@ -927,9 +927,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
>    signal(SIGCHLD, SIG_DFL);
>    request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,
>                 mysql_socket_getfd(connect_sock), NULL);
>@@ -14,7 +14,7 @@
>      /*
>        This may be stupid but refuse() includes an exit(0)
>        which we surely don't want...
>-@@ -887,12 +889,13 @@ bool check_connection_refused_by_tcp_wra
>+@@ -941,12 +943,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
>        This is unproblematic as TCP-wrapper is unix specific,
>        anyway.
>      */
>Index: databases/mysql80-server/files/patch-sql_mysqld.cc
>===================================================================
>--- databases/mysql80-server/files/patch-sql_mysqld.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-sql_mysqld.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- sql/mysqld.cc.orig	2018-10-07 08:44:22 UTC
>+--- sql/mysqld.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql/mysqld.cc
>-@@ -4493,7 +4493,7 @@ static int warn_self_signed_ca() {
>+@@ -4795,7 +4795,7 @@ static int init_thread_environment() {
>  
>  static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
>  
>@@ -9,7 +9,7 @@
>  #define FILE_LINE_ARGS
>  #else
>  #define FILE_LINE_ARGS , const char *, int
>-@@ -4530,7 +4530,7 @@ static void init_ssl() {
>+@@ -4812,7 +4812,7 @@ static void my_openssl_free(void *ptr FILE_LINE_ARGS) 
>  
>  static void init_ssl() {
>  #ifdef HAVE_OPENSSL
>Index: databases/mysql80-server/files/patch-sql_sys__vars.cc
>===================================================================
>--- databases/mysql80-server/files/patch-sql_sys__vars.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-sql_sys__vars.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- sql/sys_vars.cc.orig	2018-04-08 06:44:49 UTC
>+--- sql/sys_vars.cc.orig	2019-06-25 10:23:30 UTC
> +++ sql/sys_vars.cc
>-@@ -1792,7 +1792,7 @@ static Sys_var_ulong Sys_interactive_tim
>+@@ -2068,7 +2068,7 @@ static Sys_var_ulong Sys_interactive_timeout(
>      "The number of seconds the server waits for activity on an interactive "
>      "connection before closing it",
>      SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG),
>@@ -9,7 +9,7 @@
>  
>  static Sys_var_ulong Sys_join_buffer_size(
>      "join_buffer_size", "The size of the buffer that is used for full joins",
>-@@ -2594,7 +2594,7 @@ static Sys_var_ulong Sys_net_read_timeou
>+@@ -2852,7 +2852,7 @@ static Sys_var_ulong Sys_net_read_timeout(
>      "Number of seconds to wait for more data from a connection before "
>      "aborting the read",
>      SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
>@@ -18,7 +18,7 @@
>      NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
>      ON_UPDATE(fix_net_read_timeout));
>  
>-@@ -2615,7 +2615,7 @@ static Sys_var_ulong Sys_net_write_timeo
>+@@ -2873,7 +2873,7 @@ static Sys_var_ulong Sys_net_write_timeout(
>      "Number of seconds to wait for a block to be written to a connection "
>      "before aborting the write",
>      SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
>@@ -27,9 +27,9 @@
>      NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
>      ON_UPDATE(fix_net_write_timeout));
>  
>-@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version(
>-     READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION),
>-     IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2");
>+@@ -4377,7 +4377,7 @@ static Sys_var_ulong Sys_max_execution_time(
>+     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
>+     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
>  
> -#ifndef HAVE_WOLFSSL
> +#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
>@@ -36,7 +36,7 @@
>  static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
>    char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
>    if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
>-@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *, 
>+@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_va
>  }
>  #endif
>  
>@@ -45,8 +45,8 @@
>  static const char *ssl_fips_mode_names[] = {"OFF", 0};
>  #else
>  static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
>-@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
>-     GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE),
>+@@ -4406,7 +4406,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
>+     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
>      ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
>      ON_CHECK(NULL),
> -#ifndef HAVE_WOLFSSL
>@@ -54,7 +54,7 @@
>      ON_UPDATE(update_fips_mode),
>  #else
>      ON_UPDATE(NULL),
>-@@ -4429,7 +4429,7 @@ static Sys_var_ulong Sys_net_wait_timeou
>+@@ -4703,7 +4703,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
>      "The number of seconds the server waits for activity on a "
>      "connection before closing it",
>      SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
>Index: databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h
>===================================================================
>--- databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h	(revision 509206)
>+++ databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h	(working copy)
>@@ -1,6 +1,6 @@
>---- storage/innobase/include/srv0mon.h.orig	2016-03-28 18:06:12 UTC
>+--- storage/innobase/include/srv0mon.h.orig	2019-06-25 10:23:30 UTC
> +++ storage/innobase/include/srv0mon.h
>-@@ -34,6 +34,10 @@ Created 12/15/2009	Jimmy Yang
>+@@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>  /* Required for FreeBSD so that INT64_MAX is defined. */
>  #define __STDC_LIMIT_MACROS
>  #endif /* __STDC_LIMIT_MACROS */
>Index: databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc
>===================================================================
>--- databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- storage/myisam/mi_dynrec.cc.orig	2016-03-28 18:06:12 UTC
>+--- storage/myisam/mi_dynrec.cc.orig	2019-06-25 10:23:30 UTC
> +++ storage/myisam/mi_dynrec.cc
>-@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my
>+@@ -83,17 +83,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
>      DBUG_RETURN(1);
>    }
>    /*
>@@ -19,4 +19,4 @@
> +      MAP_SHARED, info->dfile, 0L);
>    if (info->s->file_map == (uchar *)MAP_FAILED) {
>      info->s->file_map = NULL;
>-
>+     DBUG_RETURN(1);
>Index: databases/mysql80-server/files/patch-support-files_CMakeLists.txt
>===================================================================
>--- databases/mysql80-server/files/patch-support-files_CMakeLists.txt	(revision 509206)
>+++ databases/mysql80-server/files/patch-support-files_CMakeLists.txt	(working copy)
>@@ -1,12 +1,13 @@
>---- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
>+--- support-files/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
> +++ support-files/CMakeLists.txt
>-@@ -69,7 +69,9 @@ IF(UNIX)
>-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
>-   ENDIF()
>+@@ -24,8 +24,10 @@ IF(NOT UNIX)
>+   RETURN()
>+ ENDIF()
>  
> +IF(FALSE)
>-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
>+ INSTALL(FILES mysql.m4
>+   DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
> +ENDIF()
>-   
>-   SET(bindir ${prefix}/${INSTALL_BINDIR})
>-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
>+ 
>+ SET(localstatedir "${MYSQL_DATADIR}")
>+ 
>Index: databases/mysql80-server/files/patch-vio_viosslfactories.cc
>===================================================================
>--- databases/mysql80-server/files/patch-vio_viosslfactories.cc	(revision 509206)
>+++ databases/mysql80-server/files/patch-vio_viosslfactories.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- vio/viosslfactories.cc.orig	2018-04-08 06:44:49 UTC
>+--- vio/viosslfactories.cc.orig	2019-06-25 10:23:30 UTC
> +++ vio/viosslfactories.cc
>-@@ -37,6 +37,7 @@
>+@@ -38,6 +38,7 @@
>  
>  #ifdef HAVE_OPENSSL
>  #include <openssl/dh.h>
>@@ -8,7 +8,7 @@
>  
>  #define TLS_VERSION_OPTION_SIZE 256
>  #define SSL_CIPHER_LIST_SIZE 4096
>-@@ -135,7 +136,7 @@ static DH *get_dh2048(void) {
>+@@ -136,7 +137,7 @@ static DH *get_dh2048(void) {
>      BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
>      BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
>      if (!p || !g
>@@ -17,7 +17,7 @@
>          || !DH_set0_pqg(dh, p, NULL, g)
>  #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
>      ) {
>-@@ -143,7 +144,7 @@ static DH *get_dh2048(void) {
>+@@ -144,7 +145,7 @@ static DH *get_dh2048(void) {
>        DH_free(dh);
>        return NULL;
>      }
>@@ -26,7 +26,7 @@
>      dh->p = p;
>      dh->g = g;
>  #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
>-@@ -426,7 +427,7 @@ void ssl_start() {
>+@@ -429,7 +430,7 @@ void ssl_start() {
>    }
>  }
>  
>@@ -35,7 +35,7 @@
>  /**
>    Set fips mode in openssl library,
>    When we set fips mode ON/STRICT, it will perform following operations:
>-@@ -449,6 +450,10 @@ int set_fips_mode(const uint fips_mode, 
>+@@ -452,6 +453,10 @@ int set_fips_mode(const uint fips_mode, char err_strin
>    int rc = -1;
>    unsigned int fips_mode_old = -1;
>    unsigned long err_library = 0;
>@@ -46,7 +46,7 @@
>    if (fips_mode > 2) {
>      goto EXIT;
>    }
>-@@ -462,6 +467,7 @@ int set_fips_mode(const uint fips_mode, 
>+@@ -465,6 +470,7 @@ int set_fips_mode(const uint fips_mode, char err_strin
>      ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
>      err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
>    }

Actions: View | Diff

Attachments on bug 239272: 206680