Attachment #206680 for bug #239272

View | Details | Raw Unified | Return to bug 239272
Collapse All | Expand All

Lines 20-25 Link Here

(-)databases/mysql80-client/Makefile (+2 lines)
20	mariadb[0-9][0-9]-client-* \	20	mariadb[0-9][0-9]-client-* \
21	percona[0-9][0-9]-client-*	21	percona[0-9][0-9]-client-*
22		22
		23	BUILD_DEPENDS+= libunwind>0:devel/libunwind
		24
23	CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0	25	CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
24		26
25	USE_LDCONFIG+= ${PREFIX}/lib/mysql	27	USE_LDCONFIG+= ${PREFIX}/lib/mysql




--- CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ CMakeLists.txt
@@ -1213,6 +1213,7 @@ ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(libmysql)
 ADD_SUBDIRECTORY(libbinlogevents)
 ADD_SUBDIRECTORY(libbinlogstandalone)

+ADD_SUBDIRECTORY(support-files)
 
 IF(NOT WITHOUT_SERVER)
   # Build failure on Solaris 11.3 for debug builds with NDBCLUSTER.
@@ -1365,12 +1366,13 @@ ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)
 ADD_SUBDIRECTORY(packaging/solaris)
 

 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})
@@ -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.




--- 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)
 

 
 SET(MYSQLTEST_SRC
   mysqltest/error_names.cc
@@ -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_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
@@ -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)
 

+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)




--- cmake/os/FreeBSD.cmake.orig	2019-06-25 10:23:30 UTC
+++ cmake/os/FreeBSD.cmake
@@ -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!")

   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)
+    

Lines 1-9 Link Here

(-)databases/mysql80-client/files/patch-cmake_ssl.cmake (-5 / +2 lines)
1	--- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC	1	--- cmake/ssl.cmake.orig 2019-06-25 10:23:30 UTC
2	+++ cmake/ssl.cmake	2	+++ cmake/ssl.cmake
3	@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL)	3	@@ -310,7 +310,7 @@ MACRO (MYSQL_CHECK_SSL)
4	OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
5	)
6	ENDIF()
7	IF(OPENSSL_INCLUDE_DIR AND	4	IF(OPENSSL_INCLUDE_DIR AND
8	OPENSSL_LIBRARY AND	5	OPENSSL_LIBRARY AND
9	CRYPTO_LIBRARY AND	6	CRYPTO_LIBRARY AND

Lines 1-11 Link Here

(-)databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h (-11 lines)
1	--- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
2	+++ extra/libedit/chartype.h
3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
5	#if !defined(__NetBSD__) && !defined(__sun) \
6	&& !(defined(__APPLE__) && defined(__MACH__)) \
7	- && !defined(__FreeBSD__) && !defined(_AIX)
8	+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
9	#ifndef __STDC_ISO_10646__
10	/* In many places it is assumed that the first 127 code points are ASCII
11	* compatible, so ensure wchar_t indeed does ISO 10646 and not some other




--- 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;
 

Line 0 Link Here

(-)databases/mysql80-client/files/patch-extra_libedit_chartype.h (+11 lines)
	1	--- extra/libedit/chartype.h.orig 2019-06-25 10:23:30 UTC
	2	+++ extra/libedit/chartype.h
	3	@@ -49,7 +49,7 @@
	4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
	5	#if !defined(__NetBSD__) && !defined(__sun) \
	6	&& !(defined(__APPLE__) && defined(__MACH__)) \
	7	- && !defined(__FreeBSD__) && !defined(_AIX)
	8	+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
	9	#ifndef __STDC_ISO_10646__
	10	/* In many places it is assumed that the first 127 code points are ASCII
	11	* compatible, so ensure wchar_t indeed does ISO 10646 and not some other




--- 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;
 




--- include/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ include/CMakeLists.txt
@@ -36,10 +36,172 @@ SET(HEADERS
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
   ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
   field_types.h

 SET(HEADERS_MYSQL_DIR
   mysql/client_plugin.h
   mysql/plugin_auth_common.h
+  mysql/udf_registration_types.h
+  mysql/client_authentication.h
+  mysql/client_plugin.h.pp
+  mysql/com_data.h

+  mysql/services.h.pp
+  mysql/thread_pool_priv.h
+  mysql/thread_type.h
   mysql/udf_registration_types.h
 )
 
 INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)




--- libmysql/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ libmysql/CMakeLists.txt
@@ -194,6 +194,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
   )
 ENDIF()
 

 #
 # 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

Lines 1-12 Link Here

(-)databases/mysql80-client/files/patch-man_CMakeLists.txt (-3 / +7 lines)
1	--- man/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC	1	--- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -22,9 +22,6 @@	3	@@ -21,11 +21,8 @@
		4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4		5
5	# Copy man pages	6	# Copy man pages
6	FILE(GLOB MAN1 *.1)	7	-FILE(GLOB MAN1 *.1)
7	-FILE(GLOB MAN1_NDB ndb*.1)	8	-FILE(GLOB MAN1_NDB ndb*.1)
		9	-FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
8	-FILE(GLOB MAN8 *.8)	10	-FILE(GLOB MAN8 *.8)
9	-FILE(GLOB MAN8_NDB ndb*.8)	11	-FILE(GLOB MAN8_NDB ndb*.8)
		12	+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)
		13	+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)
10	IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)	14	IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
11	LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})	15	LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
12	ENDIF()	16	ENDIF()




--- 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.

Lines 1-11 Link Here

(-)databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc (-11 lines)
1	--- mysys_ssl/my_md5.cc.orig 2018-04-08 06:44:49 UTC
2	+++ mysys_ssl/my_md5.cc
3	@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
4	int compute_md5_hash(char digest, const char buf, int len) {
5	int retval = 0;
6	int fips_mode = 0;
7	-#if !defined(HAVE_WOLFSSL)
8	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
9	fips_mode = FIPS_mode();
10	#endif /* HAVE_WOLFSSL */
11	/* If fips mode is ON/STRICT restricted method calls will result into abort,




--- 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.

Line 0 Link Here

(-)databases/mysql80-client/files/patch-mysys_my__md5.cc (+11 lines)
	1	--- mysys/my_md5.cc.orig 2019-06-25 10:23:30 UTC
	2	+++ mysys/my_md5.cc
	3	@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigne
	4	int compute_md5_hash(char digest, const char buf, int len) {
	5	int retval = 0;
	6	int fips_mode = 0;
	7	-#if !defined(HAVE_WOLFSSL)
	8	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
	9	fips_mode = FIPS_mode();
	10	#endif /* HAVE_WOLFSSL */
	11	/* If fips mode is ON/STRICT restricted method calls will result into abort,




--- plugin/x/client/xconnection_impl.cc.orig	2019-06-25 10:23:30 UTC
+++ plugin/x/client/xconnection_impl.cc
@@ -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"};
   }
 

   const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
 
   // There should not be any NULL embedded in the CN
@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_
   return XError(CR_SSL_CONNECTION_ERROR, buffer);
 }
 

 /**
   Set fips mode in openssl library,
   When we set fips mode ON/STRICT, it will perform following operations:
@@ -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};
 




--- scripts/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ scripts/CMakeLists.txt
@@ -76,6 +76,7 @@ ELSE()
   MESSAGE(FATAL_ERROR "Cannot concatenate files")
 ENDIF()
 

 # Build mysql_fix_privilege_tables.h
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
@@ -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
 )

 
 # 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,
@@ -212,6 +214,7 @@ IF(NOT WITHOUT_SERVER)
   )
 ENDIF()
 

 IF(UNIX)
  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
    "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
@@ -219,6 +222,7 @@ IF(UNIX)
   COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
 )
 ENDIF()

 
 # TCMalloc hacks
 IF(MALLOC_LIB)
@@ -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

+      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 "^\\-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} " )

         ELSE()
           SET(${var} "${${var}}-l${lib} " )
         ENDIF()
@@ -457,19 +463,7 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(mysql_config_COMPONENT Development)
 
-  IF(WITH_SYSTEMD)
-    SET(BIN_SCRIPTS




--- share/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ share/CMakeLists.txt
@@ -52,6 +52,7 @@ SET(files 
  dictionary.txt
 )
 
+IF (FALSE)
 FOREACH (dir ${dirs})
   INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir}
           DESTINATION ${INSTALL_MYSQLSHAREDIR}
@@ -64,13 +65,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets
         COMPONENT Server
         PATTERN "languages.html" EXCLUDE
 )

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-sql-common_client.cc (-3 / +3 lines)
1	--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC	1	--- sql-common/client.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql-common/client.cc	2	+++ sql-common/client.cc
3	@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql,	3	@@ -7602,7 +7602,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
4	#endif	4	#endif
5	break;	5	break;
6	case MYSQL_OPT_SSL_FIPS_MODE: {	6	case MYSQL_OPT_SSL_FIPS_MODE: {
Lines 8-11 Link Here
8	+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)	8	+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
9	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};	9	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
10	ENSURE_EXTENSIONS_PRESENT(&mysql->options);	10	ENSURE_EXTENSIONS_PRESENT(&mysql->options);
11	mysql->options.extension->ssl_fips_mode = (uint )arg;	11	mysql->options.extension->ssl_fips_mode = static_cast<const uint >(arg);

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-sql_mysqld.cc (-2 / +2 lines)
1	--- sql/mysqld.cc.orig 2018-05-06 19:15:48 UTC	1	--- sql/mysqld.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -4321,7 +4321,7 @@ static void init_ssl() {	3	@@ -4812,7 +4812,7 @@ static void my_openssl_free(void *ptr FILE_LINE_ARGS)
4		4
5	static void init_ssl() {	5	static void init_ssl() {
6	#ifdef HAVE_OPENSSL	6	#ifdef HAVE_OPENSSL




--- sql/sys_vars.cc.orig	2019-06-25 10:23:30 UTC
+++ sql/sys_vars.cc
@@ -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)

 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) {
@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_va
 }
 #endif
 

 static const char *ssl_fips_mode_names[] = {"OFF", 0};
 #else
 static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
@@ -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

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc (-3 / +3 lines)
1	--- storage/myisam/mi_dynrec.cc.orig 2016-03-28 18:06:12 UTC	1	--- storage/myisam/mi_dynrec.cc.orig 2019-06-25 10:23:30 UTC
2	+++ storage/myisam/mi_dynrec.cc	2	+++ storage/myisam/mi_dynrec.cc
3	@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my	3	@@ -83,17 +83,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
4	DBUG_RETURN(1);	4	DBUG_RETURN(1);
5	}	5	}
6	/*	6	/*
Lines 19-22 Link Here
19	+ MAP_SHARED, info->dfile, 0L);	19	+ MAP_SHARED, info->dfile, 0L);
20	if (info->s->file_map == (uchar *)MAP_FAILED) {	20	if (info->s->file_map == (uchar *)MAP_FAILED) {
21	info->s->file_map = NULL;	21	info->s->file_map = NULL;
22		22	DBUG_RETURN(1);




--- support-files/CMakeLists.txt.orig	2019-08-18 22:16:38 UTC
+++ support-files/CMakeLists.txt
@@ -39,6 +39,7 @@ ELSE()
   SET (PIDOF "pgrep -d' ' -f")
 ENDIF()
 
+IF (FALSE)
 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})




--- utilities/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ utilities/CMakeLists.txt
@@ -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

                    COMMAND comp_err
                     --charset=${PROJECT_SOURCE_DIR}/share/charsets
                     --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
@@ -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)
 SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(ibd2sdi GenError)
 
@@ -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()
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
 # PB2 will take care of putting it in extra/ when needed




--- vio/viosslfactories.cc.orig	2019-06-25 10:23:30 UTC
+++ vio/viosslfactories.cc
@@ -38,6 +38,7 @@
 
 #ifdef HAVE_OPENSSL
 #include <openssl/dh.h>

 
 #define TLS_VERSION_OPTION_SIZE 256
 #define SSL_CIPHER_LIST_SIZE 4096
@@ -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

         || !DH_set0_pqg(dh, p, NULL, g)
 #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
     ) {
@@ -429,7 +430,7 @@ void ssl_start() {
   }
 }
 

 /**
   Set fips mode in openssl library,
   When we set fips mode ON/STRICT, it will perform following operations:
@@ -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;

   if (fips_mode > 2) {
     goto EXIT;
   }
@@ -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';
   }




# $FreeBSD$

PORTNAME?=		mysql
PORTVERSION=		8.0.17
PORTREVISION?=		0
CATEGORIES=		databases ipv6
MASTER_SITES=		MYSQL/MySQL-8.0
PKGNAMESUFFIX?=		80-server


SLAVEDIRS=	databases/mysql80-client
USES=		bison:build cmake:noninja compiler:c++14-lang cpe \
		libedit localbase perl5 shebangfix ssl pkgconfig

USE_PERL5=	run


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} \

Lines 1-3 Link Here

(-)databases/mysql80-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1556566256	1	TIMESTAMP = 1566134384
2	SHA256 (mysql-boost-8.0.16.tar.gz) = 7c936aa7bc9f4c462b24bade2e9abe1b3a6869ea19c46e78ec0a9b2a87a3d17f	2	SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a
3	SIZE (mysql-boost-8.0.16.tar.gz) = 145939027	3	SIZE (mysql-boost-8.0.17.tar.gz) = 189322239




--- CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ CMakeLists.txt
@@ -1254,7 +1254,6 @@ ADD_SUBDIRECTORY(share)
 ADD_SUBDIRECTORY(libservices)
 
 IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(testclients)

   ADD_SUBDIRECTORY(sql)
 ENDIF()
 
@@ -1263,8 +1262,6 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

   ADD_SUBDIRECTORY(support-files)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
@@ -1371,6 +1368,7 @@ ENDIF()
 #
 # RPM installs documentation directly from the source tree
 #

 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})
@@ -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.




--- client/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ client/CMakeLists.txt
@@ -26,14 +26,14 @@ INCLUDE_DIRECTORIES(
 
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.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)

 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
 
@@ -69,7 +70,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 SET(MYSQLBINLOG_LIB_SOURCES
   ${CMAKE_SOURCE_DIR}/strings/decimal.cc
@@ -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)

 
+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)
+ENDIF()
 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)




--- 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)
+    

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-cmake_plugin.cmake (-2 / +2 lines)
1	--- cmake/plugin.cmake.orig 2017-06-27 11:44:29 UTC	1	--- cmake/plugin.cmake.orig 2019-06-25 10:23:30 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN)	3	@@ -246,9 +246,6 @@ MACRO(MYSQL_ADD_PLUGIN)
4	MYSQL_INSTALL_TARGETS(${target}	4	MYSQL_INSTALL_TARGETS(${target}
5	DESTINATION ${INSTALL_PLUGINDIR}	5	DESTINATION ${INSTALL_PLUGINDIR}
6	COMPONENT ${INSTALL_COMPONENT})	6	COMPONENT ${INSTALL_COMPONENT})

Lines 1-9 Link Here

(-)databases/mysql80-server/files/patch-cmake_ssl.cmake (-5 / +2 lines)
1	--- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC	1	--- cmake/ssl.cmake.orig 2019-06-25 10:23:30 UTC
2	+++ cmake/ssl.cmake	2	+++ cmake/ssl.cmake
3	@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL)	3	@@ -310,7 +310,7 @@ MACRO (MYSQL_CHECK_SSL)
4	OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
5	)
6	ENDIF()
7	IF(OPENSSL_INCLUDE_DIR AND	4	IF(OPENSSL_INCLUDE_DIR AND
8	OPENSSL_LIBRARY AND	5	OPENSSL_LIBRARY AND
9	CRYPTO_LIBRARY AND	6	CRYPTO_LIBRARY AND

Lines 1-11 Link Here

(-)databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h (-11 lines)
1	--- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
2	+++ extra/libedit/chartype.h
3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
5	#if !defined(__NetBSD__) && !defined(__sun) \
6	&& !(defined(__APPLE__) && defined(__MACH__)) \
7	- && !defined(__FreeBSD__) && !defined(_AIX)
8	+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
9	#ifndef __STDC_ISO_10646__
10	/* In many places it is assumed that the first 127 code points are ASCII
11	* compatible, so ensure wchar_t indeed does ISO 10646 and not some other




--- 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;
 

Line 0 Link Here

(-)databases/mysql80-server/files/patch-extra_libedit_chartype.h (+11 lines)
	1	--- extra/libedit/chartype.h.orig 2019-06-25 10:23:30 UTC
	2	+++ extra/libedit/chartype.h
	3	@@ -49,7 +49,7 @@
	4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
	5	#if !defined(__NetBSD__) && !defined(__sun) \
	6	&& !(defined(__APPLE__) && defined(__MACH__)) \
	7	- && !defined(__FreeBSD__) && !defined(_AIX)
	8	+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
	9	#ifndef __STDC_ISO_10646__
	10	/* In many places it is assumed that the first 127 code points are ASCII
	11	* compatible, so ensure wchar_t indeed does ISO 10646 and not some other




--- 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;
 

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-include_CMakeLists.txt (-2 / +5 lines)
1	--- include/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC	1	--- include/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR	3	@@ -43,8 +43,10 @@ SET(HEADERS_MYSQL_DIR
4	mysql/udf_registration_types.h	4	mysql/udf_registration_types.h
5	)	5	)
6		6
Lines 8-10 Link Here
8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)	8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
9	INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development)	9	INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development)
10	+ENDIF()	10	+ENDIF()
		11
		12	# openssl/applink.c must be built into applications linking with libmysql.dll
		13	IF (WIN32 AND OPENSSL_APPLINK_C)

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-include_my__thread__os__id.h (-2 / +2 lines)
1	--- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC	1	--- include/my_thread_os_id.h.orig 2019-06-25 10:23:30 UTC
2	+++ include/my_thread_os_id.h	2	+++ include/my_thread_os_id.h
3	@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa	3	@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
4	return pthread_getthreadid_np();	4	return pthread_getthreadid_np();
5	#else	5	#else
6	#ifdef HAVE_INTEGER_PTHREAD_SELF	6	#ifdef HAVE_INTEGER_PTHREAD_SELF




--- libmysql/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ libmysql/CMakeLists.txt
@@ -245,7 +245,7 @@ MESSAGE(STATUS "Creating LDAP authentication SASL clie
 ADD_SUBDIRECTORY(authentication_ldap)
   
 # Merge several convenience libraries into one big mysqlclient

 TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
 
 # Visual Studio users need debug  static library for debug projects
@@ -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} ${CLIENT_API_NONBLOCKING_FUNCTIONS}
-    COMPONENT SharedLibraries)
+    COMPONENT SharedLibraries SKIP_INSTALL)
   TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
 
+IF(FALSE)
   IF(WIN32)
@@ -343,6 +343,7 @@ ENDIF()
     ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
@@ -338,6 +339,7 @@ ENDIF()
 # to initialize api_calls[] array in api_test.c
 #
 SET(CLIENT_API_FUNCTION_LIST "")

Lines 1-9 Link Here

(-)databases/mysql80-server/files/patch-libservices_CMakeLists.txt (-5 / +8 lines)
1	--- libservices/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC	1	--- libservices/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ libservices/CMakeLists.txt	2	+++ libservices/CMakeLists.txt
3	@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES	3	@@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES
4	mysql_keyring_service.c)	4	plugin_registry_service.c)
5		5
6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})	6	ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES})
7	+IF(FALSE)	7	+IF(FALSE)
8	INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)	8	IF(INSTALL_STATIC_LIBRARIES)
		9	INSTALL(TARGETS mysqlservices
		10	DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
9	+ENDIF()	11	+ENDIF()
		12	ENDIF()

Lines 1-10 Link Here

(-)databases/mysql80-server/files/patch-man_CMakeLists.txt (-3 / +7 lines)
1	--- man/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC	1	--- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -22,7 +22,6 @@	3	@@ -21,9 +21,8 @@
		4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4		5
5	# Copy man pages	6	# Copy man pages
6	FILE(GLOB MAN1 *.1)	7	-FILE(GLOB MAN1 *.1)
7	-FILE(GLOB MAN1_NDB ndb*.1)	8	-FILE(GLOB MAN1_NDB ndb*.1)
		9	-FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
		10	+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)
		11	+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)
8	FILE(GLOB MAN8 *.8)	12	FILE(GLOB MAN8 *.8)
9	FILE(GLOB MAN8_NDB ndb*.8)	13	FILE(GLOB MAN8_NDB ndb*.8)
10	IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)	14	IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)




--- 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.

Lines 1-11 Link Here

(-)databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc (-11 lines)
1	--- mysys_ssl/my_md5.cc.orig 2018-04-08 06:44:49 UTC
2	+++ mysys_ssl/my_md5.cc
3	@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
4	int compute_md5_hash(char digest, const char buf, int len) {
5	int retval = 0;
6	int fips_mode = 0;
7	-#if !defined(HAVE_WOLFSSL)
8	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
9	fips_mode = FIPS_mode();
10	#endif /* HAVE_WOLFSSL */
11	/* If fips mode is ON/STRICT restricted method calls will result into abort,




--- 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.

Line 0 Link Here

(-)databases/mysql80-server/files/patch-mysys_my__md5.cc (+11 lines)
	1	--- mysys/my_md5.cc.orig 2019-06-25 10:23:30 UTC
	2	+++ mysys/my_md5.cc
	3	@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigne
	4	int compute_md5_hash(char digest, const char buf, int len) {
	5	int retval = 0;
	6	int fips_mode = 0;
	7	-#if !defined(HAVE_WOLFSSL)
	8	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
	9	fips_mode = FIPS_mode();
	10	#endif /* HAVE_WOLFSSL */
	11	/* If fips mode is ON/STRICT restricted method calls will result into abort,

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (-3 / +2 lines)
1	--- plugin/password_validation/validate_password.cc.orig 2017-06-27 11:44:29 UTC	1	--- plugin/password_validation/validate_password.cc.orig 2019-06-25 10:23:30 UTC
2	+++ plugin/password_validation/validate_password.cc	2	+++ plugin/password_validation/validate_password.cc
3	@@ -17,6 +17,8 @@	3	@@ -25,6 +25,8 @@
4	#include <mysql/plugin_validate_password.h>	4	#include <mysql/plugin_validate_password.h>
5	#include <mysql/service_my_plugin_log.h>	5	#include <mysql/service_my_plugin_log.h>
6	#include <mysql/service_mysql_string.h>	6	#include <mysql/service_mysql_string.h>
Lines 9-12 Link Here
9	#include <stdio.h>	9	#include <stdio.h>
10	#include <stdlib.h>	10	#include <stdlib.h>
11	#include <string.h>	11	#include <string.h>
12

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt (-2 / +3 lines)
1	--- plugin/x/CMakeLists.txt.orig 2018-04-08 06:44:49 UTC	1	--- plugin/x/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ plugin/x/CMakeLists.txt	2	+++ plugin/x/CMakeLists.txt
3	@@ -80,11 +80,14 @@ INCLUDE_DIRECTORIES(	3	@@ -83,11 +83,14 @@ INCLUDE_DIRECTORIES(
4	${MYSQLX_GENERATE_DIR}	4	${MYSQLX_GENERATE_DIR}
5	${MYSQLX_PROTOCOL_INCLUDE_DIR}	5	${MYSQLX_PROTOCOL_INCLUDE_DIR}
6	${MYSQLX_CLIENT_INCLUDE_DIR}	6	${MYSQLX_CLIENT_INCLUDE_DIR}
Lines 14-16 Link Here
14	+MY_INCLUDE_SYSTEM_DIRECTORIES(ZLIB)	14	+MY_INCLUDE_SYSTEM_DIRECTORIES(ZLIB)
15		15
16	SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB	16	SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB
		17	${MYSQLX_PROTOCOL_LIB}




--- plugin/x/client/xconnection_impl.cc.orig	2019-06-25 10:23:30 UTC
+++ plugin/x/client/xconnection_impl.cc
@@ -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"};
   }
 

   const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
 
   // There should not be any NULL embedded in the CN
@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_
   return XError(CR_SSL_CONNECTION_ERROR, buffer);
 }
 

 /**
   Set fips mode in openssl library,
   When we set fips mode ON/STRICT, it will perform following operations:
@@ -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};
 

Lines 1-7 Link Here

(-)databases/mysql80-server/files/patch-plugin_x_configure.cmake (-4 / +4 lines)
1	--- plugin/x/configure.cmake.orig 2018-04-08 06:44:49 UTC	1	--- plugin/x/configure.cmake.orig 2019-06-25 10:23:30 UTC
2	+++ plugin/x/configure.cmake	2	+++ plugin/x/configure.cmake
3	@@ -44,6 +44,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src	3	@@ -46,6 +46,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
4	CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in	4	CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in
5	${MYSQLX_GENERATE_DIR}/mysqlx_version.h )	5	${MYSQLX_GENERATE_DIR}/mysqlx_version.h )
6		6
7	+IF(FALSE)	7	+IF(FALSE)
Lines 8-14 Link Here
8	INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_error.h	8	INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_error.h
9	DESTINATION ${INSTALL_INCLUDEDIR}	9	DESTINATION ${INSTALL_INCLUDEDIR}
10	COMPONENT Development)	10	COMPONENT Development)
11	@@ -55,3 +56,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mys	11	@@ -57,3 +58,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_ername.h
12	INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h	12	INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h
13	DESTINATION ${INSTALL_INCLUDEDIR}	13	DESTINATION ${INSTALL_INCLUDEDIR}
14	COMPONENT Development)	14	COMPONENT Development)




--- scripts/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ scripts/CMakeLists.txt
@@ -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} " )

         ELSE()
           SET(${var} "${${var}}-l${lib} " )
         ENDIF()
@@ -457,14 +459,13 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(mysql_config_COMPONENT Development)
 
+
   IF(WITH_SYSTEMD)

       mysqldumpslow
       mysqld_multi
       mysqld_safe
@@ -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

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-sql-common_client.cc (-3 / +3 lines)
1	--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC	1	--- sql-common/client.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql-common/client.cc	2	+++ sql-common/client.cc
3	@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql,	3	@@ -7602,7 +7602,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
4	#endif	4	#endif
5	break;	5	break;
6	case MYSQL_OPT_SSL_FIPS_MODE: {	6	case MYSQL_OPT_SSL_FIPS_MODE: {
Lines 8-11 Link Here
8	+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)	8	+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
9	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};	9	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
10	ENSURE_EXTENSIONS_PRESENT(&mysql->options);	10	ENSURE_EXTENSIONS_PRESENT(&mysql->options);
11	mysql->options.extension->ssl_fips_mode = (uint )arg;	11	mysql->options.extension->ssl_fips_mode = static_cast<const uint >(arg);

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (-3 / +3 lines)
1	--- sql/conn_handler/socket_connection.cc.orig 2019-01-21 20:10:03 UTC	1	--- sql/conn_handler/socket_connection.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql/conn_handler/socket_connection.cc	2	+++ sql/conn_handler/socket_connection.cc
3	@@ -873,9 +873,11 @@ bool check_connection_refused_by_tcp_wra	3	@@ -927,9 +927,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
4	signal(SIGCHLD, SIG_DFL);	4	signal(SIGCHLD, SIG_DFL);
5	request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,	5	request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,
6	mysql_socket_getfd(connect_sock), NULL);	6	mysql_socket_getfd(connect_sock), NULL);
Lines 14-20 Link Here
14	/*	14	/*
15	This may be stupid but refuse() includes an exit(0)	15	This may be stupid but refuse() includes an exit(0)
16	which we surely don't want...	16	which we surely don't want...
17	@@ -887,12 +889,13 @@ bool check_connection_refused_by_tcp_wra	17	@@ -941,12 +943,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
18	This is unproblematic as TCP-wrapper is unix specific,	18	This is unproblematic as TCP-wrapper is unix specific,
19	anyway.	19	anyway.
20	*/	20	*/

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-sql_mysqld.cc (-3 / +3 lines)
1	--- sql/mysqld.cc.orig 2018-10-07 08:44:22 UTC	1	--- sql/mysqld.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -4493,7 +4493,7 @@ static int warn_self_signed_ca() {	3	@@ -4795,7 +4795,7 @@ static int init_thread_environment() {
4		4
5	static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;	5	static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
6		6
Lines 9-15 Link Here
9	#define FILE_LINE_ARGS	9	#define FILE_LINE_ARGS
10	#else	10	#else
11	#define FILE_LINE_ARGS , const char *, int	11	#define FILE_LINE_ARGS , const char *, int
12	@@ -4530,7 +4530,7 @@ static void init_ssl() {	12	@@ -4812,7 +4812,7 @@ static void my_openssl_free(void *ptr FILE_LINE_ARGS)
13		13
14	static void init_ssl() {	14	static void init_ssl() {
15	#ifdef HAVE_OPENSSL	15	#ifdef HAVE_OPENSSL




--- sql/sys_vars.cc.orig	2019-06-25 10:23:30 UTC
+++ sql/sys_vars.cc
@@ -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),

 
 static Sys_var_ulong Sys_join_buffer_size(
     "join_buffer_size", "The size of the buffer that is used for full joins",
@@ -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),

     NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
     ON_UPDATE(fix_net_read_timeout));
 
@@ -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),

     NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
     ON_UPDATE(fix_net_write_timeout));
 
@@ -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)

 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) {
@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_va
 }
 #endif
 

 static const char *ssl_fips_mode_names[] = {"OFF", 0};
 #else
 static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
@@ -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

     ON_UPDATE(update_fips_mode),
 #else
     ON_UPDATE(NULL),
@@ -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),

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h (-2 / +2 lines)
1	--- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC	1	--- storage/innobase/include/srv0mon.h.orig 2019-06-25 10:23:30 UTC
2	+++ storage/innobase/include/srv0mon.h	2	+++ storage/innobase/include/srv0mon.h
3	@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang	3	@@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
4	/* Required for FreeBSD so that INT64_MAX is defined. */	4	/* Required for FreeBSD so that INT64_MAX is defined. */
5	#define __STDC_LIMIT_MACROS	5	#define __STDC_LIMIT_MACROS
6	#endif /* __STDC_LIMIT_MACROS */	6	#endif /* __STDC_LIMIT_MACROS */

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc (-3 / +3 lines)
1	--- storage/myisam/mi_dynrec.cc.orig 2016-03-28 18:06:12 UTC	1	--- storage/myisam/mi_dynrec.cc.orig 2019-06-25 10:23:30 UTC
2	+++ storage/myisam/mi_dynrec.cc	2	+++ storage/myisam/mi_dynrec.cc
3	@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my	3	@@ -83,17 +83,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
4	DBUG_RETURN(1);	4	DBUG_RETURN(1);
5	}	5	}
6	/*	6	/*
Lines 19-22 Link Here
19	+ MAP_SHARED, info->dfile, 0L);	19	+ MAP_SHARED, info->dfile, 0L);
20	if (info->s->file_map == (uchar *)MAP_FAILED) {	20	if (info->s->file_map == (uchar *)MAP_FAILED) {
21	info->s->file_map = NULL;	21	info->s->file_map = NULL;
22		22	DBUG_RETURN(1);




--- support-files/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
+++ support-files/CMakeLists.txt
@@ -24,8 +24,10 @@ IF(NOT UNIX)
   RETURN()
 ENDIF()
 
+IF(FALSE)
 INSTALL(FILES mysql.m4
   DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+ENDIF()
 
 SET(localstatedir "${MYSQL_DATADIR}")
 




--- vio/viosslfactories.cc.orig	2019-06-25 10:23:30 UTC
+++ vio/viosslfactories.cc
@@ -38,6 +38,7 @@
 
 #ifdef HAVE_OPENSSL
 #include <openssl/dh.h>

 
 #define TLS_VERSION_OPTION_SIZE 256
 #define SSL_CIPHER_LIST_SIZE 4096
@@ -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

         || !DH_set0_pqg(dh, p, NULL, g)
 #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
     ) {
@@ -144,7 +145,7 @@ static DH *get_dh2048(void) {
       DH_free(dh);
       return NULL;
     }

     dh->p = p;
     dh->g = g;
 #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -429,7 +430,7 @@ void ssl_start() {
   }
 }
 

 /**
   Set fips mode in openssl library,
   When we set fips mode ON/STRICT, it will perform following operations:
@@ -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;

   if (fips_mode > 2) {
     goto EXIT;
   }
@@ -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';
   }

Return to bug 239272

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2019-01-21 18:42:44 UTC	1	--- CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex)	3	@@ -1213,6 +1213,7 @@ ADD_SUBDIRECTORY(mysys)
4	ADD_SUBDIRECTORY(libmysql)	4	ADD_SUBDIRECTORY(libmysql)
5	ADD_SUBDIRECTORY(libbinlogevents)	5	ADD_SUBDIRECTORY(libbinlogevents)
6	ADD_SUBDIRECTORY(libbinlogstandalone)	6	ADD_SUBDIRECTORY(libbinlogstandalone)
Lines 7-14 Link Here
7	+ADD_SUBDIRECTORY(support-files)	7	+ADD_SUBDIRECTORY(support-files)
8		8
9	IF(NOT WITHOUT_SERVER)	9	IF(NOT WITHOUT_SERVER)
10	SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")	10	# Build failure on Solaris 11.3 for debug builds with NDBCLUSTER.
11	@@ -1146,12 +1147,13 @@ ENDIF()	11	@@ -1365,12 +1366,13 @@ ENDIF()
12	ADD_SUBDIRECTORY(packaging/WiX)	12	ADD_SUBDIRECTORY(packaging/WiX)
13	ADD_SUBDIRECTORY(packaging/solaris)	13	ADD_SUBDIRECTORY(packaging/solaris)
14		14
Lines 25-35 Link Here
25	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	25	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
26	INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)	26	INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
27	INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})	27	INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
28	@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	28	@@ -1388,6 +1390,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
		29	PATTERN "sp-imp-spec.txt" EXCLUDE
29	PATTERN "README.build" EXCLUDE	30	PATTERN "README.build" EXCLUDE
30	)	31	)
		32	+ENDIF()
31	ENDIF()	33	ENDIF()
32	+ENDIF()
33		34
34	# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,	35	# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
35	# we can safely enable ASan on Clang/Win32 if needed.

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-client_CMakeLists.txt (-7 / +8 lines)
1	--- client/CMakeLists.txt.orig 2019-04-13 13:46:31.000000000 +0200	1	--- client/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ client/CMakeLists.txt 2019-04-30 00:27:10.627236000 +0200	2	+++ client/CMakeLists.txt
3	@@ -35,10 +35,12 @@	3	@@ -35,10 +35,12 @@ IF(UNIX)
4	TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})	4	TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
5	ENDIF(UNIX)	5	ENDIF(UNIX)
6		6
Lines 13-31 Link Here
13		13
14	SET(MYSQLTEST_SRC	14	SET(MYSQLTEST_SRC
15	mysqltest/error_names.cc	15	mysqltest/error_names.cc
16	@@ -48,9 +50,11 @@	16	@@ -49,10 +51,12 @@ SET(MYSQLTEST_SRC
17	mysqltest/utils.cc	17	mysqltest/utils.cc
18	)	18	)
19		19
20	+IF(FALSE)	20	+IF(FALSE)
21	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)	21	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)
		22	SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
22	TARGET_LINK_LIBRARIES(mysqltest mysqlclient)	23	TARGET_LINK_LIBRARIES(mysqltest mysqlclient)
23	ADD_DEPENDENCIES(mysqltest GenError GenClientError)	24	ADD_DEPENDENCIES(mysqltest GenError GenClientError)
24	+ENDIF()	25	+ENDIF()
25		26
26	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	27	ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
27	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
28	@@ -108,8 +112,10 @@	29	@@ -111,8 +115,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
29	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	30	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
30	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	31	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
31		32
Lines 35-38 Link Here
35	+ENDIF()	36	+ENDIF()
36		37
37	MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)	38	MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
38	TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)	39	TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys)

Lines 1-8 Link Here

(-)databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake (-11 / +4 lines)
1	--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC	1	--- cmake/os/FreeBSD.cmake.orig 2019-06-25 10:23:30 UTC
2	+++ cmake/os/FreeBSD.cmake	2	+++ cmake/os/FreeBSD.cmake
3	@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)	3	@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
4	IF(NOT HAVE_SUPPORTED_CLANG_VERSION)	4	MESSAGE(FATAL_ERROR
5	MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")	5	"GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
6	ENDIF()	6	ENDIF()
7	- ELSE()	7	- ELSE()
8	- MESSAGE(FATAL_ERROR "Unsupported compiler!")	8	- MESSAGE(FATAL_ERROR "Unsupported compiler!")
Lines 23-32 Link Here
23	ENDIF()	23	ENDIF()
24	ENDIF()	24	ENDIF()
25		25
26	# Should not be needed any more, but kept for easy resurrection if needed
27	# #Legacy option, maybe not needed anymore , taken as is from autotools build
28	# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
29	-
30	+# For GCC maybe it's also good idea to use
31	+# ADD_DEFINITIONS(-D_GNU_SOURCE)
32	+

Lines 1-20 Link Here

(-)databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c (-20 lines)
1	--- extra/libedit/vi.c.orig 2016-03-28 18:06:12 UTC
2	+++ extra/libedit/vi.c
3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
4	* NB: posix implies that we should enter insert mode, however
5	* this is against historical precedent...
6	*/
7	-#if defined(__weak_reference) && !defined(__FreeBSD__)
8	+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
9	__weakref_visible char my_get_alias_text(const char )
10	__weak_reference(get_alias_text);
11	#endif
12	@@ -928,7 +928,7 @@ protected el_action_t
13	vi_alias(EditLine *el __attribute__((__unused__)),
14	Int c __attribute__((__unused__)))
15	{
16	-#if defined(__weak_reference) && !defined(__FreeBSD__)
17	+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
18	char alias_name[3];
19	char *alias_text;
20

Line 0 Link Here

(-)databases/mysql80-client/files/patch-extra_libedit_vi.c (+20 lines)
	1	--- extra/libedit/vi.c.orig 2019-06-25 10:23:30 UTC
	2	+++ extra/libedit/vi.c
	3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __attribute__((__un
	4	* NB: posix implies that we should enter insert mode, however
	5	* this is against historical precedent...
	6	*/
	7	-#if defined(__weak_reference) && !defined(__FreeBSD__)
	8	+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
	9	__weakref_visible char my_get_alias_text(const char )
	10	__weak_reference(get_alias_text);
	11	#endif
	12	@@ -928,7 +928,7 @@ protected el_action_t
	13	vi_alias(EditLine *el __attribute__((__unused__)),
	14	Int c __attribute__((__unused__)))
	15	{
	16	-#if defined(__weak_reference) && !defined(__FreeBSD__)
	17	+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
	18	char alias_name[3];
	19	char *alias_text;
	20

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-include_CMakeLists.txt (-5 / +4 lines)
1	--- include/CMakeLists.txt.orig 2017-09-21 15:51:58 UTC	1	--- include/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -30,11 +30,173 @@ SET(HEADERS	3	@@ -36,10 +36,172 @@ SET(HEADERS
4	${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h	4	${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
5	${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h	5	${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
6	field_types.h	6	field_types.h
Lines 124-130 Link Here
124	SET(HEADERS_MYSQL_DIR	124	SET(HEADERS_MYSQL_DIR
125	mysql/client_plugin.h	125	mysql/client_plugin.h
126	mysql/plugin_auth_common.h	126	mysql/plugin_auth_common.h
127	mysql/udf_registration_types.h	127	+ mysql/udf_registration_types.h
128	+ mysql/client_authentication.h	128	+ mysql/client_authentication.h
129	+ mysql/client_plugin.h.pp	129	+ mysql/client_plugin.h.pp
130	+ mysql/com_data.h	130	+ mysql/com_data.h
Lines 170-176 Link Here
170	+ mysql/services.h.pp	170	+ mysql/services.h.pp
171	+ mysql/thread_pool_priv.h	171	+ mysql/thread_pool_priv.h
172	+ mysql/thread_type.h	172	+ mysql/thread_type.h
173	+ mysql/udf_registration_types.h	173	mysql/udf_registration_types.h
174	)	174	)
175		175
176	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (-11 / +2 lines)
1	--- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC	1	--- libmysql/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)	3	@@ -194,6 +194,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
4	)	4	)
5	ENDIF()	5	ENDIF()
6		6
Lines 12-23 Link Here
12	#	12	#
13	# Include protocol tracing infrastructure and the test	13	# Include protocol tracing infrastructure and the test
14	# trace plugin if enabled by build options.	14	# trace plugin if enabled by build options.
15	@@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED)
16	COMPONENT SharedLibraries)
17	IF(UNIX)
18	# libtool compatability
19	- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
20	+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD\|DragonFly" OR APPLE)
21	SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
22	ELSE()
23	SET(OS_SHARED_LIB_VERSION

Lines 1-60 Link Here

(-)databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (-60 lines)
1	--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
2	+++ mysys_ssl/my_default.cc
3	@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
4
5	/* Which directories are searched for options (and in which order) */
6
7	-#define MAX_DEFAULT_DIRS 6
8	+#define MAX_DEFAULT_DIRS 7
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;
11
12	@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
13	return 1; /* Ignore wrong files */
14	}
15
16	+ if (strstr(name, "/etc") == name)
17	+ {
18	+ fprintf(stderr,
19	+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
20	+ name,name);
21	+ goto err;
22	+ }
23	+
24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {
25	line++;
26	/* Ignore comment and empty lines */
27	@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
28	end[(strlen(end) - 1)] = ' ';
29	else
30	strxmov(end, conf_file, *ext, " ", NullS);
31	- fputs(name, stdout);
32	+ if (strstr(name, "/etc") != name)
33	+ fputs(name, stdout);
34	}
35	}
36	}
37	@@ -1411,13 +1420,8 @@ static const char **init_default_directo
38
39	#else
40
41	- errors += add_directory(alloc, "/etc/", dirs);
42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
43	-
44	-#if defined(DEFAULT_SYSCONFDIR)
45	- if (DEFAULT_SYSCONFDIR[0])
46	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
47	-#endif /* DEFAULT_SYSCONFDIR */
48	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
49	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
50
51	#endif
52
53	@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
54	MY_STAT stat_info;
55
56	- if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
57	+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
58	/*
59	Ignore .mylogin.cnf file if not exclusively readable/writable
60	by current user.

Line 0 Link Here

(-)databases/mysql80-client/files/patch-mysys_my__default.cc (+62 lines)
	1	--- mysys/my_default.cc.orig 2019-06-25 10:23:30 UTC
	2	+++ mysys/my_default.cc
	3	@@ -203,7 +203,7 @@ bool no_defaults = false;
	4
	5	/* Which directories are searched for options (and in which order) */
	6
	7	-#define MAX_DEFAULT_DIRS 6
	8	+#define MAX_DEFAULT_DIRS 7
	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
	10	static const char **default_directories = NULL;
	11
	12	@@ -909,6 +909,14 @@ static int search_default_file_with_ext(Process_option
	13	return 1; /* Ignore wrong files */
	14	}
	15
	16	+ if (strstr(name, "/etc") == name)
	17	+ {
	18	+ fprintf(stderr,
	19	+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
	20	+ name,name);
	21	+ goto err;
	22	+ }
	23	+
	24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {
	25	line++;
	26	/* Ignore comment and empty lines */
	27	@@ -1228,7 +1236,8 @@ void my_print_default_files(const char *conf_file) {
	28	end[(strlen(end) - 1)] = ' ';
	29	else
	30	strxmov(end, conf_file, *ext, " ", NullS);
	31	- fputs(name, stdout);
	32	+ if (strstr(name, "/etc") != name)
	33	+ fputs(name, stdout);
	34	}
	35	}
	36	}
	37	@@ -1565,14 +1574,9 @@ static const char **init_default_directories(MEM_ROOT
	38
	39	#else
	40
	41	- errors += add_directory(alloc, "/etc/", dirs);
	42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
	43	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
	44	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
	45
	46	-#if defined(DEFAULT_SYSCONFDIR)
	47	- if (DEFAULT_SYSCONFDIR[0])
	48	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
	49	-#endif /* DEFAULT_SYSCONFDIR */
	50	-
	51	#endif
	52
	53	if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
	54	@@ -1635,7 +1639,7 @@ int check_file_permissions(const char *file_name, bool
	55	#if !defined(_WIN32)
	56	MY_STAT stat_info;
	57
	58	- if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
	59	+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
	60	/*
	61	Ignore .mylogin.cnf file if not exclusively readable/writable
	62	by current user.

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (-4 / +4 lines)
1	--- plugin/x/client/xconnection_impl.cc.orig 2018-04-08 06:44:49 UTC	1	--- plugin/x/client/xconnection_impl.cc.orig 2019-06-25 10:23:30 UTC
2	+++ plugin/x/client/xconnection_impl.cc	2	+++ plugin/x/client/xconnection_impl.cc
3	@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio,	3	@@ -221,12 +221,12 @@ XError ssl_verify_server_cert(Vio *vio, const std::str
4	return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"};	4	return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"};
5	}	5	}
6		6
Lines 17-23 Link Here
17	const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));	17	const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
18		18
19	// There should not be any NULL embedded in the CN	19	// There should not be any NULL embedded in the CN
20	@@ -451,7 +451,7 @@ XError Connection_impl::get_ssl_error(co	20	@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_
21	return XError(CR_SSL_CONNECTION_ERROR, buffer);	21	return XError(CR_SSL_CONNECTION_ERROR, buffer);
22	}	22	}
23		23
Lines 26-32 Link Here
26	/**	26	/**
27	Set fips mode in openssl library,	27	Set fips mode in openssl library,
28	When we set fips mode ON/STRICT, it will perform following operations:	28	When we set fips mode ON/STRICT, it will perform following operations:
29	@@ -501,7 +501,7 @@ XError Connection_impl::activate_tls() {	29	@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() {
30	if (!m_context->m_ssl_config.is_configured())	30	if (!m_context->m_ssl_config.is_configured())
31	return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};	31	return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
32		32

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-scripts_CMakeLists.txt (-10 / +10 lines)
1	--- scripts/CMakeLists.txt.orig 2018-10-07 08:44:22 UTC	1	--- scripts/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -80,6 +80,7 @@ ELSE()	3	@@ -76,6 +76,7 @@ ELSE()
4	MESSAGE(FATAL_ERROR "Cannot concatenate files")	4	MESSAGE(FATAL_ERROR "Cannot concatenate files")
5	ENDIF()	5	ENDIF()
6		6
Lines 8-14 Link Here
8	# Build mysql_fix_privilege_tables.h	8	# Build mysql_fix_privilege_tables.h
9	ADD_CUSTOM_COMMAND(	9	ADD_CUSTOM_COMMAND(
10	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h	10	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
11	@@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs	11	@@ -96,6 +97,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
12	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h	12	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
13	${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h	13	${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
14	)	14	)
Lines 16-22 Link Here
16		16
17	# If we do not have performance schema compiled in then sys will not work,	17	# If we do not have performance schema compiled in then sys will not work,
18	# so only create an empty sys database with an auto-generated file,	18	# so only create an empty sys database with an auto-generated file,
19	@@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER)	19	@@ -212,6 +214,7 @@ IF(NOT WITHOUT_SERVER)
20	)	20	)
21	ENDIF()	21	ENDIF()
22		22
Lines 24-30 Link Here
24	IF(UNIX)	24	IF(UNIX)
25	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution	25	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
26	"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )	26	"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
27	@@ -211,6 +214,7 @@ IF(UNIX)	27	@@ -219,6 +222,7 @@ IF(UNIX)
28	COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution	28	COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
29	)	29	)
30	ENDIF()	30	ENDIF()
Lines 32-38 Link Here
32		32
33	# TCMalloc hacks	33	# TCMalloc hacks
34	IF(MALLOC_LIB)	34	IF(MALLOC_LIB)
35	@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	35	@@ -363,7 +367,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
36	LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)	36	LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
37	FOREACH(lib ${${target}_LIB_DEPENDS})	37	FOREACH(lib ${${target}_LIB_DEPENDS})
38	# Filter out "general", it is not a library, just CMake hint	38	# Filter out "general", it is not a library, just CMake hint
Lines 40-47 Link Here
40	+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")	40	+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
41	IF (lib MATCHES "^\\-l")	41	IF (lib MATCHES "^\\-l")
42	SET(${var} "${${var}} ${lib} ")	42	SET(${var} "${${var}} ${lib} ")
43	ELSEIF(lib MATCHES "^/")	43	ELSEIF (lib MATCHES "^\\-L")
44	@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	44	@@ -373,6 +377,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
45	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	45	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
46	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	46	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
47	SET(${var} "${${var}}-l${lib} " )	47	SET(${var} "${${var}}-l${lib} " )
Lines 50-58 Link Here
50	ELSE()	50	ELSE()
51	SET(${var} "${${var}}-l${lib} " )	51	SET(${var} "${${var}}-l${lib} " )
52	ENDIF()	52	ENDIF()
53	@@ -454,19 +460,7 @@ ELSE()	53	@@ -457,19 +463,7 @@ ELSE()
54	# On Unix, most of the files end up in the bin directory	54	# On Unix, most of the files end up in the bin directory
55	SET(mysql_config_COMPONENT COMPONENT Development)	55	SET(mysql_config_COMPONENT Development)
56		56
57	- IF(WITH_SYSTEMD)	57	- IF(WITH_SYSTEMD)
58	- SET(BIN_SCRIPTS	58	- SET(BIN_SCRIPTS

Lines 1-14 Link Here

(-)databases/mysql80-client/files/patch-share_CMakeLists.txt (-4 / +4 lines)
1	--- share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC	1	--- share/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ share/CMakeLists.txt	2	+++ share/CMakeLists.txt
3	@@ -45,6 +45,7 @@ SET(files	3	@@ -52,6 +52,7 @@ SET(files
4	dictionary.txt	4	dictionary.txt
5	)	5	)
6		6
7	+IF (FALSE)	7	+IF (FALSE)
8	FOREACH (dir ${dirs})	8	FOREACH (dir ${dirs})
9	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir}	9	INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir}
10	DESTINATION ${INSTALL_MYSQLSHAREDIR}	10	DESTINATION ${INSTALL_MYSQLSHAREDIR}
11	@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE	11	@@ -64,13 +65,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets
12	COMPONENT Server	12	COMPONENT Server
13	PATTERN "languages.html" EXCLUDE	13	PATTERN "languages.html" EXCLUDE
14	)	14	)

Lines 1-8 Link Here

(-)databases/mysql80-client/files/patch-sql_sys__vars.cc (-7 / +7 lines)
1	--- sql/sys_vars.cc.orig 2018-05-06 19:16:02 UTC	1	--- sql/sys_vars.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql/sys_vars.cc	2	+++ sql/sys_vars.cc
3	@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version(	3	@@ -4377,7 +4377,7 @@ static Sys_var_ulong Sys_max_execution_time(
4	READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION),	4	HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
5	IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2");	5	VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
6		6
7	-#ifndef HAVE_WOLFSSL	7	-#ifndef HAVE_WOLFSSL
8	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)	8	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
Lines 9-15 Link Here
9	static bool update_fips_mode(sys_var , THD , enum_var_type) {	9	static bool update_fips_mode(sys_var , THD , enum_var_type) {
10	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};	10	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
11	if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {	11	if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
12	@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *,	12	@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var , THD , enum_va
13	}	13	}
14	#endif	14	#endif
15		15
Lines 18-25 Link Here
18	static const char *ssl_fips_mode_names[] = {"OFF", 0};	18	static const char *ssl_fips_mode_names[] = {"OFF", 0};
19	#else	19	#else
20	static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};	20	static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
21	@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode(	21	@@ -4406,7 +4406,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
22	GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE),	22	GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
23	ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,	23	ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
24	ON_CHECK(NULL),	24	ON_CHECK(NULL),
25	-#ifndef HAVE_WOLFSSL	25	-#ifndef HAVE_WOLFSSL

Lines 1-23 Link Here

(-)databases/mysql80-client/files/patch-support-files_CMakeLists.txt (-20 / +12 lines)
1	--- support-files/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC	1	--- support-files/CMakeLists.txt.orig 2019-08-18 22:16:38 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -46,6 +46,7 @@ IF(UNIX)	3	@@ -39,6 +39,7 @@ ELSE()
4	ELSE()	4	SET (PIDOF "pgrep -d' ' -f")
5	SET (PIDOF "pgrep -d' ' -f")	5	ENDIF()
6	ENDIF()	6
7	+IF (FALSE)	7	+IF (FALSE)
8	SET(prefix ${CMAKE_INSTALL_PREFIX})	8	FOREACH(script
9	FOREACH(script mysqld_multi.server mysql-log-rotate)	9	mysql.server
10	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	10	mysqld_multi.server
11	@@ -63,9 +64,12 @@	11	@@ -54,3 +55,4 @@ FOREACH(script
12	DESTINATION ${inst_location} COMPONENT ${comp}	12	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
13	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	13	)
14	ENDFOREACH()	14	ENDFOREACH()
15	+ENDIF()	15	+ENDIF()
16	+ENDIF()
17
18	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
19
20	+IF (FALSE)
21	SET(bindir ${prefix}/${INSTALL_BINDIR})
22	SET(sbindir ${prefix}/${INSTALL_SBINDIR})
23	SET(libexecdir ${prefix}/${INSTALL_SBINDIR})

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-utilities_CMakeLists.txt (-10 / +10 lines)
1	--- utilities/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC	1	--- utilities/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ utilities/CMakeLists.txt	2	+++ utilities/CMakeLists.txt
3	@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR	3	@@ -57,6 +57,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${INSTALL_MY
4		4
5	ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h	5	ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
6	${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys	6	${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys
Lines 8-26 Link Here
8	COMMAND comp_err	8	COMMAND comp_err
9	--charset=${PROJECT_SOURCE_DIR}/share/charsets	9	--charset=${PROJECT_SOURCE_DIR}/share/charsets
10	--out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/	10	--out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
11	@@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_	11	@@ -94,6 +95,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB)
12	ADD_DEPENDENCIES(comp_err copy_openssl_dlls)	12	ADD_DEPENDENCIES(comp_err copy_openssl_dlls)
13	ENDIF()	13	ENDIF()
14		14
15	+IF(FALSE)	15	+IF(FALSE)
16	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)	16	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
17	TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)	17	TARGET_LINK_LIBRARIES(my_print_defaults mysys)
18	SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
19	@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
20	ADD_DEPENDENCIES(ibd2sdi GenError)
21		18
		19	@@ -109,6 +111,7 @@ ENDIF()
		20	IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
		21	MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
		22	TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
		23	+ENDIF()
22	ENDIF()	24	ENDIF()
23	+ENDIF()
24		25
25	# In published release builds on Solaris, we need to bundle gcc source.	26	IF(WITH_INNOBASE_STORAGE_ENGINE)
26	# PB2 will take care of putting it in extra/ when needed

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-vio_viosslfactories.cc (-6 / +6 lines)
1	--- vio/viosslfactories.cc.orig 2018-04-08 06:44:49 UTC	1	--- vio/viosslfactories.cc.orig 2019-06-25 10:23:30 UTC
2	+++ vio/viosslfactories.cc	2	+++ vio/viosslfactories.cc
3	@@ -37,6 +37,7 @@	3	@@ -38,6 +38,7 @@
4		4
5	#ifdef HAVE_OPENSSL	5	#ifdef HAVE_OPENSSL
6	#include <openssl/dh.h>	6	#include <openssl/dh.h>
Lines 8-14 Link Here
8		8
9	#define TLS_VERSION_OPTION_SIZE 256	9	#define TLS_VERSION_OPTION_SIZE 256
10	#define SSL_CIPHER_LIST_SIZE 4096	10	#define SSL_CIPHER_LIST_SIZE 4096
11	@@ -135,7 +136,7 @@ static DH *get_dh2048(void) {	11	@@ -136,7 +137,7 @@ static DH *get_dh2048(void) {
12	BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);	12	BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
13	BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);	13	BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
14	if (!p \|\| !g	14	if (!p \|\| !g
Lines 17-23 Link Here
17	\|\| !DH_set0_pqg(dh, p, NULL, g)	17	\|\| !DH_set0_pqg(dh, p, NULL, g)
18	#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */	18	#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
19	) {	19	) {
20	@@ -426,7 +427,7 @@ void ssl_start() {	20	@@ -429,7 +430,7 @@ void ssl_start() {
21	}	21	}
22	}	22	}
23		23
Lines 26-32 Link Here
26	/**	26	/**
27	Set fips mode in openssl library,	27	Set fips mode in openssl library,
28	When we set fips mode ON/STRICT, it will perform following operations:	28	When we set fips mode ON/STRICT, it will perform following operations:
29	@@ -449,6 +450,10 @@ int set_fips_mode(const uint fips_mode,	29	@@ -452,6 +453,10 @@ int set_fips_mode(const uint fips_mode, char err_strin
30	int rc = -1;	30	int rc = -1;
31	unsigned int fips_mode_old = -1;	31	unsigned int fips_mode_old = -1;
32	unsigned long err_library = 0;	32	unsigned long err_library = 0;
Lines 37-43 Link Here
37	if (fips_mode > 2) {	37	if (fips_mode > 2) {
38	goto EXIT;	38	goto EXIT;
39	}	39	}
40	@@ -462,6 +467,7 @@ int set_fips_mode(const uint fips_mode,	40	@@ -465,6 +470,7 @@ int set_fips_mode(const uint fips_mode, char err_strin
41	ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);	41	ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
42	err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';	42	err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
43	}	43	}

Lines 2-9 Link Here

(-)databases/mysql80-server/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 8.0.16	5	PORTVERSION= 8.0.17
6	PORTREVISION?= 4	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-8.0	8	MASTER_SITES= MYSQL/MySQL-8.0
9	PKGNAMESUFFIX?= 80-server	9	PKGNAMESUFFIX?= 80-server
Lines 18-24 Link Here
18		18
19	SLAVEDIRS= databases/mysql80-client	19	SLAVEDIRS= databases/mysql80-client
20	USES= bison:build cmake:noninja compiler:c++14-lang cpe \	20	USES= bison:build cmake:noninja compiler:c++14-lang cpe \
21	libedit localbase perl5 shebangfix ssl	21	libedit localbase perl5 shebangfix ssl pkgconfig
22		22
23	USE_PERL5= run	23	USE_PERL5= run
24		24
Lines 69-75 Link Here
69	SHEBANG_FILES= scripts/.pl scripts/*.sh	69	SHEBANG_FILES= scripts/.pl scripts/*.sh
70		70
71	.ifdef USE_MYSQL	71	.ifdef USE_MYSQL
72	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	72	.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
73	.endif	73	.endif
74		74
75	SUB_LIST= MY_DBDIR=${MY_DBDIR} \	75	SUB_LIST= MY_DBDIR=${MY_DBDIR} \

Lines 1-7 Link Here

(-)databases/mysql80-server/files/patch-CMakeLists.txt (-8 / +8 lines)
1	--- CMakeLists.txt.orig 2019-01-21 19:00:53 UTC	1	--- CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1045,7 +1045,6 @@ IF(UNIX)	3	@@ -1254,7 +1254,6 @@ ADD_SUBDIRECTORY(share)
4	ENDIF()	4	ADD_SUBDIRECTORY(libservices)
5		5
6	IF(NOT WITHOUT_SERVER)	6	IF(NOT WITHOUT_SERVER)
7	- ADD_SUBDIRECTORY(testclients)	7	- ADD_SUBDIRECTORY(testclients)
Lines 8-14 Link Here
8	ADD_SUBDIRECTORY(sql)	8	ADD_SUBDIRECTORY(sql)
9	ENDIF()	9	ENDIF()
10		10
11	@@ -1054,8 +1053,6 @@ ENDIF()	11	@@ -1263,8 +1262,6 @@ ENDIF()
12	ADD_SUBDIRECTORY(scripts)	12	ADD_SUBDIRECTORY(scripts)
13		13
14	IF(NOT WITHOUT_SERVER)	14	IF(NOT WITHOUT_SERVER)
Lines 17-23 Link Here
17	ADD_SUBDIRECTORY(support-files)	17	ADD_SUBDIRECTORY(support-files)
18	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	18	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
19	ADD_SUBDIRECTORY(internal)	19	ADD_SUBDIRECTORY(internal)
20	@@ -1152,6 +1149,7 @@ ENDIF()	20	@@ -1371,6 +1368,7 @@ ENDIF()
21	#	21	#
22	# RPM installs documentation directly from the source tree	22	# RPM installs documentation directly from the source tree
23	#	23	#
Lines 25-35 Link Here
25	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	25	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
26	INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)	26	INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
27	INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})	27	INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
28	@@ -1170,6 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	28	@@ -1388,6 +1386,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
		29	PATTERN "sp-imp-spec.txt" EXCLUDE
29	PATTERN "README.build" EXCLUDE	30	PATTERN "README.build" EXCLUDE
30	)	31	)
		32	+ENDIF()
31	ENDIF()	33	ENDIF()
32	+ENDIF()
33		34
34	# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,	35	# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
35	# we can safely enable ASan on Clang/Win32 if needed.

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-client_CMakeLists.txt (-10 / +7 lines)
1	--- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC	1	--- client/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil	3	@@ -26,14 +26,14 @@ INCLUDE_DIRECTORIES(
4		4
5	## Subdirectory with common client code.	5	## Subdirectory with common client code.
6	ADD_SUBDIRECTORY(base)	6	ADD_SUBDIRECTORY(base)
Lines 17-24 Link Here
17		17
18	IF(NOT WITHOUT_SERVER)	18	IF(NOT WITHOUT_SERVER)
19	MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)	19	MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
20	@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC	20	@@ -57,6 +57,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenClientError)
21	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	21	ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
22	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	22	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
23		23
24	+IF(FALSE)	24	+IF(FALSE)
Lines 25-31 Link Here
25	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)	25	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
26	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)	26	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
27		27
28	@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	28	@@ -69,7 +70,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
29		29
30	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)	30	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
31	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	31	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Lines 35-41 Link Here
35	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	35	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
36	SET(MYSQLBINLOG_LIB_SOURCES	36	SET(MYSQLBINLOG_LIB_SOURCES
37	${CMAKE_SOURCE_DIR}/strings/decimal.cc	37	${CMAKE_SOURCE_DIR}/strings/decimal.cc
38	@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	38	@@ -110,10 +113,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
39		39
40	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	40	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
41	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	41	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 46-53 Link Here
46		46
47	+IF(FALSE)	47	+IF(FALSE)
48	MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)	48	MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
49	TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)	49	TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys)
50	+ENDIF()
51		50
52	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
53	IF(WIN32)

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (-8 / +5 lines)
1	--- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC	1	--- libmysql/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica	3	@@ -245,7 +245,7 @@ MESSAGE(STATUS "Creating LDAP authentication SASL clie
4	ADD_SUBDIRECTORY(authentication_ldap)	4	ADD_SUBDIRECTORY(authentication_ldap)
5		5
6	# Merge several convenience libraries into one big mysqlclient	6	# Merge several convenience libraries into one big mysqlclient
Lines 9-27 Link Here
9	TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})	9	TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
10		10
11	# Visual Studio users need debug static library for debug projects	11	# Visual Studio users need debug static library for debug projects
12	@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED)	12	@@ -285,7 +285,7 @@ IF(NOT DISABLE_SHARED)
13	# and link them together into shared library.	13	# and link them together into shared library.
14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}	14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}	15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS}
16	- COMPONENT SharedLibraries)	16	- COMPONENT SharedLibraries)
17	+ COMPONENT SharedLibraries SKIP_INSTALL)	17	+ COMPONENT SharedLibraries SKIP_INSTALL)
18	TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})	18	TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
19		19
20	+IF(FALSE)
21	IF(WIN32)	20	IF(WIN32)
22	# So that libmysql_api_test below can find the .dll	21	@@ -343,6 +343,7 @@ ENDIF()
23	ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
24	@@ -338,6 +339,7 @@ ENDIF()
25	# to initialize api_calls[] array in api_test.c	22	# to initialize api_calls[] array in api_test.c
26	#	23	#
27	SET(CLIENT_API_FUNCTION_LIST "")	24	SET(CLIENT_API_FUNCTION_LIST "")

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-scripts_CMakeLists.txt (-5 / +5 lines)
1	--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC	1	--- scripts/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -373,6 +373,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
6	SET(${var} "${${var}}-l${lib} " )	6	SET(${var} "${${var}}-l${lib} " )
Lines 9-17 Link Here
9	ELSE()	9	ELSE()
10	SET(${var} "${${var}}-l${lib} " )	10	SET(${var} "${${var}}-l${lib} " )
11	ENDIF()	11	ENDIF()
12	@@ -430,14 +432,13 @@ ELSE()	12	@@ -457,14 +459,13 @@ ELSE()
13	# On Unix, most of the files end up in the bin directory	13	# On Unix, most of the files end up in the bin directory
14	SET(mysql_config_COMPONENT COMPONENT Development)	14	SET(mysql_config_COMPONENT Development)
15		15
16	+	16	+
17	IF(WITH_SYSTEMD)	17	IF(WITH_SYSTEMD)
Lines 25-31 Link Here
25	mysqldumpslow	25	mysqldumpslow
26	mysqld_multi	26	mysqld_multi
27	mysqld_safe	27	mysqld_safe
28	@@ -471,7 +472,7 @@ ELSE()	28	@@ -498,7 +499,7 @@ ELSE()
29	FOREACH(file ${BIN_SCRIPTS})	29	FOREACH(file ${BIN_SCRIPTS})
30	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)	30	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh	31	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

Lines 1-6 Link Here

(-)databases/mysql80-server/files/patch-sql_sys__vars.cc (-11 / +11 lines)
1	--- sql/sys_vars.cc.orig 2018-04-08 06:44:49 UTC	1	--- sql/sys_vars.cc.orig 2019-06-25 10:23:30 UTC
2	+++ sql/sys_vars.cc	2	+++ sql/sys_vars.cc
3	@@ -1792,7 +1792,7 @@ static Sys_var_ulong Sys_interactive_tim	3	@@ -2068,7 +2068,7 @@ static Sys_var_ulong Sys_interactive_timeout(
4	"The number of seconds the server waits for activity on an interactive "	4	"The number of seconds the server waits for activity on an interactive "
5	"connection before closing it",	5	"connection before closing it",
6	SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG),	6	SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG),
Lines 9-15 Link Here
9		9
10	static Sys_var_ulong Sys_join_buffer_size(	10	static Sys_var_ulong Sys_join_buffer_size(
11	"join_buffer_size", "The size of the buffer that is used for full joins",	11	"join_buffer_size", "The size of the buffer that is used for full joins",
12	@@ -2594,7 +2594,7 @@ static Sys_var_ulong Sys_net_read_timeou	12	@@ -2852,7 +2852,7 @@ static Sys_var_ulong Sys_net_read_timeout(
13	"Number of seconds to wait for more data from a connection before "	13	"Number of seconds to wait for more data from a connection before "
14	"aborting the read",	14	"aborting the read",
15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),	15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
Lines 18-24 Link Here
18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
19	ON_UPDATE(fix_net_read_timeout));	19	ON_UPDATE(fix_net_read_timeout));
20		20
21	@@ -2615,7 +2615,7 @@ static Sys_var_ulong Sys_net_write_timeo	21	@@ -2873,7 +2873,7 @@ static Sys_var_ulong Sys_net_write_timeout(
22	"Number of seconds to wait for a block to be written to a connection "	22	"Number of seconds to wait for a block to be written to a connection "
23	"before aborting the write",	23	"before aborting the write",
24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),	24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
Lines 27-35 Link Here
27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
28	ON_UPDATE(fix_net_write_timeout));	28	ON_UPDATE(fix_net_write_timeout));
29		29
30	@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version(	30	@@ -4377,7 +4377,7 @@ static Sys_var_ulong Sys_max_execution_time(
31	READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION),	31	HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
32	IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2");	32	VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
33		33
34	-#ifndef HAVE_WOLFSSL	34	-#ifndef HAVE_WOLFSSL
35	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)	35	+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
Lines 36-42 Link Here
36	static bool update_fips_mode(sys_var , THD , enum_var_type) {	36	static bool update_fips_mode(sys_var , THD , enum_var_type) {
37	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};	37	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
38	if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {	38	if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
39	@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *,	39	@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var , THD , enum_va
40	}	40	}
41	#endif	41	#endif
42		42
Lines 45-52 Link Here
45	static const char *ssl_fips_mode_names[] = {"OFF", 0};	45	static const char *ssl_fips_mode_names[] = {"OFF", 0};
46	#else	46	#else
47	static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};	47	static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
48	@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode(	48	@@ -4406,7 +4406,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
49	GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE),	49	GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
50	ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,	50	ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
51	ON_CHECK(NULL),	51	ON_CHECK(NULL),
52	-#ifndef HAVE_WOLFSSL	52	-#ifndef HAVE_WOLFSSL
Lines 54-60 Link Here
54	ON_UPDATE(update_fips_mode),	54	ON_UPDATE(update_fips_mode),
55	#else	55	#else
56	ON_UPDATE(NULL),	56	ON_UPDATE(NULL),
57	@@ -4429,7 +4429,7 @@ static Sys_var_ulong Sys_net_wait_timeou	57	@@ -4703,7 +4703,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
58	"The number of seconds the server waits for activity on a "	58	"The number of seconds the server waits for activity on a "
59	"connection before closing it",	59	"connection before closing it",
60	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),	60	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),