Attachment #235780 for bug #265468




PORTNAME?=		mysql
PORTVERSION=		8.0.30
PORTREVISION?=		0
CATEGORIES=		databases
MASTER_SITES=		MYSQL/MySQL-8.0

CFLAGS_aarch64?=	-march=armv8-a+crc+crypto

CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
		-DCMAKE_INSTALL_PREFIX="${LOCALBASE}" \
		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
		-DINSTALL_PREFIX="${LOCALBASE}" \
		-DINSTALL_DOCDIR="share/doc/mysql" \
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
		-DINSTALL_INCLUDEDIR="include/mysql" \

		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
		-DWITH_BOOST="${WRKSRC}/boost" \
		-DWITH_SYSTEM_LIBS=ON \
		-DWITH_EDITLINE=system \
		-DWITH_LIBEVENT=system \
		-DWITH_LZ4=system \
		-DWITH_ICU=system \
		-DWITH_CURL=system \
		-DWITH_ZLIB=system \
		-DWITH_AUTHENTICATION_FIDO=ON
		-DWITH_PROTOBUF=system \
		-DWITH_SSL=system \
		-DWITH_AUTHENTICATION_FIDO=1 \
		-DBUILD_BUNDLED_ZLIB=0 \
		-DBUILD_BUNDLED_LZ4=0

# The Mroonga, RocksDB, and TokuDB storage engines are disabled.
# Mroonga is only buildable on little endian archs.

Lines 1-3 Link Here

(-)mysql80-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1651315615	1	TIMESTAMP = 1659818963
2	SHA256 (mysql-boost-8.0.29.tar.gz) = fd34a84c65fc7b15609d55b1f5d128c4d5543a6b95fa638569c3277c5c7bb048	2	SHA256 (mysql-boost-8.0.30.tar.gz) = c331ac7a68099a2116097acbb14fd331423d486fe47ce0e346925111b44df69c
3	SIZE (mysql-boost-8.0.29.tar.gz) = 327770349	3	SIZE (mysql-boost-8.0.30.tar.gz) = 332772783




port                            = 3306
socket                          = /tmp/mysql.sock

[mysql]
prompt                          = \u@\h [\d]>\_
no_auto_rehash

[mysqld]
user                            = mysql
port                            = 3306
socket                          = /tmp/mysql.sock
bind_address                    = 127.0.0.1,::1
basedir                         = %%PREFIX%%
datadir                         = %%MY_DBDIR%%
tmpdir                          = %%MY_TMPDIR%%
secure_file_priv                = %%MY_SECDIR%%
log_bin                         = mysql-bin
log_output                      = TABLE,FILE
relay_log_recovery              = ON
slow_query_log                  = OFF
slow_query_log_file             = slow-query.log
server_id                       = 1
slow-query-log                  = 1
server-id                       = 1
sync_binlog                     = 1
sync_relay_log                  = 1
binlog_cache_size               = 256K
binlog_stmt_cache_size          = 256K
enforce_gtid_consistency        = ON
gtid_mode                       = ON
max_connections                 = 501
safe_user_create                = ON
lower_case_table_names          = 1
myisam_recover_options          = FORCE,BACKUP
myisam-recover-options          = BACKUP,FORCE
open_files_limit                = 32768
table_open_cache                = 16384
table_definition_cache          = 8192
net_retry_count                 = 16384
open_files_limit                = 32768
table_open_cache                = 8192
table_definition_cache          = 4096
long_query_time                 = 0.05
innodb_data_home_dir            = %%MY_DBDIR%%
innodb_log_group_home_dir       = %%MY_DBDIR%%
innodb_data_file_path           = ibdata1:128M:autoextend
innodb_temp_data_file_path      = ibtmp1:128M:autoextend
innodb_flush_method             = O_DIRECT
innodb_log_file_size            = 256M
innodb_log_buffer_size          = 16M
innodb_write_io_threads         = 8
innodb_read_io_threads          = 8
innodb_autoinc_lock_mode        = 2
skip-symbolic-links

mysqlx                          = OFF
mysqlx_port                     = 33060
mysqlx_socket                   = /tmp/mysqlx.sock
mysqlx_bind_address             = 127.0.0.1,::1




--- CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
+++ CMakeLists.txt
@@ -1819,7 +1819,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
 ENDIF()
 
 IF(WITH_AUTHENTICATION_LDAP)

     # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
     IF(WITH_LDAP STREQUAL "system" OR
         WITH_SASL STREQUAL "system" OR
@@ -1868,6 +1868,7 @@ IF(WITH_AUTHENTICATION_KERBEROS)
   ENDIF()
 ENDIF()
 
+IF(NOT WITHOUT_TOOLS)
 # Add system/bundled editline.
 MYSQL_CHECK_EDITLINE()
 SET(EDITLINE_WARN_GIVEN)
@@ -1878,7 +1879,9 @@ IF(EDITLINE_WARN_GIVEN)
     "You can use -DWITH_EDITLINE=bundled instead."
     )
 ENDIF()
+ENDIF(NOT WITHOUT_TOOLS)
 
+IF(NOT WITHOUT_SERVER)
 # Add libevent
 MYSQL_CHECK_LIBEVENT()
 SET(LIBEVENT_WARN_GIVEN)
@@ -1889,6 +1892,7 @@ IF(LIBEVENT_WARN_GIVEN)
     "You can use -DWITH_LIBEVENT=bundled instead."
     )
 ENDIF()
+ENDIF(NOT WITHOUT_SERVER)
 
 # Add lz4 library
 MYSQL_CHECK_LZ4()
@@ -2142,7 +2146,9 @@ ADD_CUSTOM_TARGET(clang_tidy_prerequisites)
 ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
 ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
 ADD_CUSTOM_TARGET(component_all)
 
-ADD_SUBDIRECTORY(include)
+IF(NOT WITHOUT_CLIENTLIBS)

 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
@@ -2187,12 +2193,15 @@ IF(WITH_UNIT_TESTS)
   ADD_SUBDIRECTORY(unittest/mytap/t)
 ENDIF()
 
-ADD_SUBDIRECTORY(client)
+IF(NOT WITHOUT_TOOLS)
+  # Add system/bundled editline
+  MYSQL_CHECK_EDITLINE()
+  ADD_SUBDIRECTORY(client)
+ENDIF(NOT WITHOUT_TOOLS)
+

   ADD_SUBDIRECTORY(testclients)
   ADD_SUBDIRECTORY(sql)
 ENDIF()
@@ -2247,11 +2256,11 @@ ENDIF()
 # scripts/mysql_config depends on client and server targets loaded above.
 # It is referenced by some of the directories below, so we insert it here.
 ADD_SUBDIRECTORY(scripts)

   IF(WITH_INTERNAL)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
@@ -2361,6 +2370,7 @@ IF(PACK_SEPARATE_COMPONENTS)
   SET(CPACK_COMPONENTS_GROUPING IGNORE)
 ENDIF()
 

 IF(UNIX)
   INSTALL(FILES
     Docs/mysql.info
@@ -2395,6 +2405,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
     PATTERN "README.build" EXCLUDE
   )




--- client/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
+++ client/CMakeLists.txt
@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
 ## Subdirectory with common client code.

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -55,6 +59,7 @@ IF(NOT WITHOUT_SERVER)
     )
 ENDIF()
 

 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc
@@ -262,7 +270,9 @@ ENDIF()
 
 TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
 TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)

 MYSQL_ADD_EXECUTABLE(mysqladmin
   mysqladmin.cc
   multi_factor_passwordopt-vars.cc
@@ -277,6 +287,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
   mysql_config_editor.cc
   LINK_LIBRARIES mysqlclient
   )

 MYSQL_ADD_EXECUTABLE(mysql_secure_installation
   mysql_secure_installation.cc
   LINK_LIBRARIES mysqlclient
@@ -287,6 +300,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
   path.cc
   LINK_LIBRARIES mysys
   )




--- cmake/install_layout.cmake.orig	2022-07-06 21:36:34 UTC
+++ cmake/install_layout.cmake
@@ -41,6 +41,10 @@
 #    Build with prefix=/usr/local/mysql, create tarball with install prefix="."
 #    and relative links.
 #
+#  FREEBSD
+#    Build with prefix=/usr/local, create tarball with install prefix="."
+#    and relative links.
+#
 # To force a directory layout, use -DINSTALL_LAYOUT=<layout>.
 #
 # The default is STANDALONE.
@@ -80,7 +84,7 @@ IF(NOT INSTALL_LAYOUT)
 ENDIF()
 
 SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
-  CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4"
+  CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, FREEBSD, RPM, DEB, SVR4"
   )
 
 IF(UNIX)
@@ -88,6 +92,8 @@ IF(UNIX)
     SET(default_prefix "/usr")
   ELSEIF(INSTALL_LAYOUT MATCHES "DEB")
     SET(default_prefix "/usr")
+  ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
+    SET(default_prefix "/usr/local")
   ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
     SET(default_prefix "/opt/mysql/mysql")
   ELSE()
@@ -98,7 +104,7 @@ IF(UNIX)
       CACHE PATH "install prefix" FORCE)
   ENDIF()
   SET(VALID_INSTALL_LAYOUTS
-    "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE")
+    "RPM" "DEB" "SVR4" "TARGZ" "FREEBSD" "STANDALONE")
   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
   IF(ind EQUAL -1)
     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
@@ -136,6 +142,8 @@ ELSEIF(INSTALL_LAYOUT MATCHES "RPM" OR
        INSTALL_LAYOUT MATCHES "SVR4" OR
        INSTALL_LAYOUT MATCHES "DEB")
   SET(secure_file_priv_path "/var/lib/mysql-files")
+ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
+  SET(secure_file_priv_path "/var/db/mysql_secure")
 ELSE()
   SET(secure_file_priv_path "${default_prefix}/mysql-files")
 ENDIF()
@@ -167,6 +175,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE  "keyring")
 SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
 
 #
+# FREEBSD layout
+#
+SET(INSTALL_BINDIR_FREEBSD           "bin")
+SET(INSTALL_SBINDIR_FREEBSD          "libexec")
+#
+SET(INSTALL_LIBDIR_FREEBSD           "lib/mysql")
+SET(INSTALL_PRIV_LIBDIR_FREEBSD      "lib/mysql/private")
+SET(INSTALL_PLUGINDIR_FREEBSD        "lib/mysql/plugin")
+#
+SET(INSTALL_INCLUDEDIR_FREEBSD       "include/mysql")
+#
+SET(INSTALL_DOCDIR_FREEBSD           "share/doc/mysql")
+SET(INSTALL_DOCREADMEDIR_FREEBSD     "share/doc/mysql")
+SET(INSTALL_MANDIR_FREEBSD           "share/man")
+SET(INSTALL_INFODIR_FREEBSD          "share/info")
+#
+SET(INSTALL_SHAREDIR_FREEBSD         "share")
+SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share/mysql")
+SET(INSTALL_MYSQLTESTDIR_FREEBSD     "")
+SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "share/mysql")
+#
+SET(INSTALL_MYSQLDATADIR_FREEBSD     "/var/db/mysql")
+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "etc/mysql/keyring")
+SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
+
+#
 # TARGZ layout
 #
 SET(INSTALL_BINDIR_TARGZ           "bin")
@@ -361,7 +395,7 @@ ENDIF()
 SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
   CACHE
   STRING
-  "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ")
+  "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ")
 
 # If we are shared STANDALONE with the the server, we shouldn't write
 # into the server's data/ as that would create a "schemadir" in
@@ -405,6 +439,21 @@ FOREACH(var
     )
   SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
 ENDFOREACH()
+
+#
+# FreeBSD layout
+#
+SET(ROUTER_INSTALL_CONFIGDIR_FREEBSD  "/usr/local/etc/mysqlrouter")
+SET(ROUTER_INSTALL_DATADIR_FREEBSD    "/var/db/mysqlrouter")
+SET(ROUTER_INSTALL_LOGDIR_FREEBSD     "/var/log/mysqlrouter")
+SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter")
+
+SET(ROUTER_INSTALL_BINDIR_FREEBSD     "bin")
+SET(ROUTER_INSTALL_LIBDIR_FREEBSD     "lib/mysql")
+SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD  "lib/mysql/mysqlrouter")
+SET(ROUTER_INSTALL_LOGROTATEDIR_FREEBSD "etc/logrotate.d")
+SET(ROUTER_INSTALL_LOGROTATEFILE_FREEBSD "mysqlrouter")
+SET(ROUTER_INSTALL_DOCDIR_FREEBSD     "share/mysqlrouter/docs")
 
 FOREACH(var
     LOGROTATE




--- cmake/install_layout.cmake.orig	2019-12-09 19:53:17 UTC
+++ cmake/install_layout.cmake
@@ -41,6 +41,10 @@
 #    Build with prefix=/usr/local/mysql, create tarball with install prefix="."
 #    and relative links.
 #
+#  FREEBSD
+#    Build with prefix=/usr/local, create tarball with install prefix="."
+#    and relative links.
+#
 # To force a directory layout, use -DINSTALL_LAYOUT=<layout>.
 #
 # The default is STANDALONE.
@@ -80,7 +84,7 @@ IF(NOT INSTALL_LAYOUT)
 ENDIF()
 
 SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
-  CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4"
+  CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, FREEBSD, RPM, DEB, SVR4"
   )
 
 IF(UNIX)
@@ -98,7 +102,7 @@ IF(UNIX)
       CACHE PATH "install prefix" FORCE)
   ENDIF()
   SET(VALID_INSTALL_LAYOUTS
-    "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE")
+    "RPM" "DEB" "SVR4" "TARGZ" "FREEBSD" "STANDALONE")
   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
   IF(ind EQUAL -1)
     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
@@ -167,6 +171,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE  "keyring")
 SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
 
 #
+# FREEBSD layout
+#
+SET(INSTALL_BINDIR_FREEBSD           "bin")
+SET(INSTALL_SBINDIR_FREEBSD          "bin")
+#
+SET(INSTALL_LIBDIR_FREEBSD           "lib")
+SET(INSTALL_PRIV_LIBDIR_FREEBSD      "lib/private")
+SET(INSTALL_PLUGINDIR_FREEBSD        "lib/plugin")
+#
+SET(INSTALL_INCLUDEDIR_FREEBSD       "include")
+#
+SET(INSTALL_DOCDIR_FREEBSD           "docs")
+SET(INSTALL_DOCREADMEDIR_FREEBSD     ".")
+SET(INSTALL_MANDIR_FREEBSD           "man")
+SET(INSTALL_INFODIR_FREEBSD          "docs")
+#
+SET(INSTALL_SHAREDIR_FREEBSD         "share")
+SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share")
+SET(INSTALL_MYSQLTESTDIR_FREEBSD     "mysql-test")
+SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "support-files")
+#
+SET(INSTALL_MYSQLDATADIR_FREEBSD     "data")
+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "keyring")
+SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
+
+#
 # TARGZ layout
 #
 SET(INSTALL_BINDIR_TARGZ           "bin")
@@ -361,7 +391,7 @@ ENDIF()
 SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
   CACHE
   STRING
-  "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ")
+  "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ")
 
 # If we are shared STANDALONE with the the server, we shouldn't write
 # into the server's data/ as that would create a "schemadir" in
@@ -405,6 +435,21 @@ FOREACH(var
     )
   SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
 ENDFOREACH()
+
+#
+# FreeBSD layout
+#
+SET(ROUTER_INSTALL_CONFIGDIR_FREEBSD  "/usr/local/etc/mysqlrouter")
+SET(ROUTER_INSTALL_DATADIR_FREEBSD    "/var/db/mysqlrouter")
+SET(ROUTER_INSTALL_LOGDIR_FREEBSD     "/var/log/mysqlrouter")
+SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter")
+
+SET(ROUTER_INSTALL_BINDIR_FREEBSD     "bin")
+SET(ROUTER_INSTALL_LIBDIR_FREEBSD     "lib/mysql")
+SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD  "lib/mysql/mysqlrouter")
+SET(ROUTER_INSTALL_LOGROTATEDIR_FREEBSD "etc/logrotate.d")
+SET(ROUTER_INSTALL_LOGROTATEFILE_FREEBSD "mysqlrouter")
+SET(ROUTER_INSTALL_DOCDIR_FREEBSD     "share/mysqlrouter/docs")
 
 FOREACH(var
     LOGROTATE

Lines 1-4 Link Here

(-)mysql80-server/files/patch-cmake_os_DragonFly.cmake (-1 / +1 lines)
1	--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC	1	--- cmake/os/DragonFly.cmake.orig 2022-08-06 23:05:01 UTC
2	+++ cmake/os/DragonFly.cmake	2	+++ cmake/os/DragonFly.cmake
3	@@ -0,0 +1,24 @@	3	@@ -0,0 +1,24 @@
4	+INCLUDE(CheckCSourceRuns)	4	+INCLUDE(CheckCSourceRuns)

Lines 1-4 Link Here

(-)mysql80-server/files/patch-cmake_os_FreeBSD.cmake (-1 / +1 lines)
1	--- cmake/os/FreeBSD.cmake.orig 2021-12-17 16:07:27 UTC	1	--- cmake/os/FreeBSD.cmake.orig 2022-07-06 21:36:34 UTC
2	+++ cmake/os/FreeBSD.cmake	2	+++ cmake/os/FreeBSD.cmake
3	@@ -48,8 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)	3	@@ -48,8 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
4	IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)	4	IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)

Lines 1-4 Link Here

(-)mysql80-server/files/patch-cmake_plugin.cmake (-1 / +1 lines)
1	--- cmake/plugin.cmake.orig 2021-12-17 16:07:27 UTC	1	--- cmake/plugin.cmake.orig 2022-07-06 21:36:34 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -247,15 +247,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)	3	@@ -247,15 +247,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
4		4




--- cmake/ssl.cmake.orig	2022-07-06 21:36:34 UTC
+++ cmake/ssl.cmake
@@ -142,7 +142,7 @@ MACRO(FIND_OPENSSL_VERSION)
     # Encoded as MNNFFPPS: major minor fix patch status
     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
       OPENSSL_VERSION_NUMBER
-      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
       )
     STRING(REGEX REPLACE
       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
@@ -380,8 +380,9 @@ MACRO (MYSQL_CHECK_SSL)
         "Not a supported openssl version in WITH_SSL=${WITH_SSL}.")
         )
     ENDIF()
 
-    IF("${OPENSSL_MAJOR_MINOR_FIX_VERSION}" VERSION_GREATER "1.1.0")
-       ADD_DEFINITIONS(-DHAVE_TLSv13)
+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+    IF(HAVE_TLS1_3_VERSION)
+       #ADD_DEFINITIONS(-DHAVE_TLSv13)
     ENDIF()
 
     IF(OPENSSL_INCLUDE_DIR AND
        OPENSSL_LIBRARY   AND
        CRYPTO_LIBRARY      AND
-       OPENSSL_MAJOR_VERSION STREQUAL "1"
+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
       )
       SET(OPENSSL_FOUND TRUE)
       FIND_PROGRAM(OPENSSL_EXECUTABLE openssl

Lines 1-6 Link Here

(-)mysql80-server/files/patch-include_CMakeLists.txt (-2 / +2 lines)
1	--- include/CMakeLists.txt.orig 2021-09-28 11:46:34 UTC	1	--- include/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -37,10 +37,182 @@ SET(HEADERS	3	@@ -39,10 +39,182 @@ 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 1-4 Link Here

(-)mysql80-server/files/patch-include_my__compare.h (-1 / +1 lines)
1	--- include/my_compare.h.orig 2019-09-20 08:30:51 UTC	1	--- include/my_compare.h.orig 2022-07-06 21:36:34 UTC
2	+++ include/my_compare.h	2	+++ include/my_compare.h
3	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@
4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.

Lines 1-4 Link Here

(-)mysql80-server/files/patch-include_my__stacktrace.h (-1 / +1 lines)
1	--- include/my_stacktrace.h.orig 2021-12-17 16:07:27 UTC	1	--- include/my_stacktrace.h.orig 2022-07-06 21:36:34 UTC
2	+++ include/my_stacktrace.h	2	+++ include/my_stacktrace.h
3	@@ -43,7 +43,7 @@	3	@@ -43,7 +43,7 @@
4	HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris	4	HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris

Lines 1-4 Link Here

(-)mysql80-server/files/patch-include_my__thread__os__id.h (-1 / +1 lines)
1	--- include/my_thread_os_id.h.orig 2019-09-20 08:30:51 UTC	1	--- include/my_thread_os_id.h.orig 2022-07-06 21:36:34 UTC
2	+++ include/my_thread_os_id.h	2	+++ include/my_thread_os_id.h
3	@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {	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();

Lines 1-4 Link Here

(-)mysql80-server/files/patch-include_myisam.h (-1 / +1 lines)
1	--- include/myisam.h.orig 2021-12-17 16:07:27 UTC	1	--- include/myisam.h.orig 2022-07-06 21:36:34 UTC
2	+++ include/myisam.h	2	+++ include/myisam.h
3	@@ -60,7 +60,7 @@	3	@@ -60,7 +60,7 @@
4	The following defines can be increased if necessary.	4	The following defines can be increased if necessary.




--- include/violite.h.orig	2021-12-17 16:07:27 UTC
+++ include/violite.h
@@ -268,9 +268,11 @@ struct st_VioSSLFd *new_VioSSLConnectorFd(
 
 long process_tls_version(const char *tls_version);
 
+#ifndef LIBRESSL_VERSION_NUMBER
 int set_fips_mode(const uint fips_mode, char *err_string);
 
 uint get_fips_mode();
+#endif
 
 int test_ssl_fips_mode(char *err_string);
 




--- libmysql/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
+++ libmysql/CMakeLists.txt
@@ -201,6 +201,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
   )
 ENDIF()
 

 #
 # Include protocol tracing infrastructure and the test
 # trace plugin if enabled by build options.
@@ -274,8 +279,15 @@ IF(WIN32)
   LIST(APPEND LIBS_TO_MERGE auth_win_client)
 ENDIF()
 

 
 # FIDO authentication client plugin
 ADD_SUBDIRECTORY(authentication_fido)
@@ -291,6 +303,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
   COMPONENT Development
   LINK_LIBRARIES ${LIBS_TO_LINK}
   )

 
 # Visual Studio users need debug  static library for debug projects
 IF(MSVC)
@@ -337,17 +350,27 @@ ENDIF()
 
 # Merge several convenience libraries into one big mysqlclient
 # and link them together into shared library.

Lines 1-4 Link Here

(-)mysql80-server/files/patch-libservices_CMakeLists.txt (-1 / +1 lines)
1	--- libservices/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- libservices/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ libservices/CMakeLists.txt	2	+++ libservices/CMakeLists.txt
3	@@ -47,7 +47,9 @@ SET(MYSQLSERVICES_SOURCES	3	@@ -47,7 +47,9 @@ SET(MYSQLSERVICES_SOURCES
4	plugin_registry_service.c)	4	plugin_registry_service.c)

Lines 1-4 Link Here

(-)mysql80-server/files/patch-man_CMakeLists.txt (-1 / +1 lines)
1	--- man/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- man/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -23,26 +23,14 @@	3	@@ -23,26 +23,14 @@
4	# Copy man pages	4	# Copy man pages

Lines 1-4 Link Here

(-)mysql80-server/files/patch-mysys_my__default.cc (-1 / +1 lines)
1	--- mysys/my_default.cc.orig 2021-12-17 16:07:27 UTC	1	--- mysys/my_default.cc.orig 2022-07-06 21:36:34 UTC
2	+++ mysys/my_default.cc	2	+++ mysys/my_default.cc
3	@@ -204,7 +204,7 @@ bool no_defaults = false;	3	@@ -204,7 +204,7 @@ bool no_defaults = false;
4		4




--- mysys/my_md5.cc.orig	2019-09-20 08:30:51 UTC
+++ mysys/my_md5.cc
@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigne
 int compute_md5_hash(char *digest, const char *buf, int len) {
   int retval = 0;
   int fips_mode = 0;
+#ifndef LIBRESSL_VERSION_NUMBER
   fips_mode = FIPS_mode();
+#endif /* LIBRESSL_VERSION_NUMBER */
   /* If fips mode is ON/STRICT restricted method calls will result into abort,
    * skipping call. */
   if (fips_mode == 0) {




--- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc.orig	2022-02-20 15:21:13.279471000 -0800
+++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc	2022-02-20 15:22:02.451078000 -0800
@@ -318,6 +318,7 @@
 
 #define OPENSSL_ERROR_LENGTH 512
 static int configure_ssl_fips_mode(const int fips_mode) {
+#ifndef LIBRESSL_VERSION_NUMBER
   int rc = -1;
   int fips_mode_old = -1;
   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
@@ -338,6 +339,9 @@
   }
 EXIT:
   return rc;
+# else
+  return -1;
+# endif
 }
 
 static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,

Lines 1-4 Link Here

(-)mysql80-server/files/patch-plugin_password__validation_validate__password.cc (-1 / +1 lines)
1	--- plugin/password_validation/validate_password.cc.orig 2019-09-20 08:30:51 UTC	1	--- plugin/password_validation/validate_password.cc.orig 2022-07-06 21:36:34 UTC
2	+++ plugin/password_validation/validate_password.cc	2	+++ plugin/password_validation/validate_password.cc
3	@@ -25,6 +25,8 @@	3	@@ -25,6 +25,8 @@
4	#include <mysql/plugin_validate_password.h>	4	#include <mysql/plugin_validate_password.h>

Lines 1-6 Link Here

(-)mysql80-server/files/patch-plugin_x_CMakeLists.txt (-2 / +2 lines)
1	--- plugin/x/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- plugin/x/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ plugin/x/CMakeLists.txt	2	+++ plugin/x/CMakeLists.txt
3	@@ -77,6 +77,8 @@ INCLUDE_DIRECTORIES(	3	@@ -79,6 +79,8 @@ 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 1-4 Link Here

(-)mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc (-1 / +1 lines)
1	--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig 2019-09-20 08:30:51 UTC	1	--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig 2022-07-06 21:36:34 UTC
2	+++ plugin/x/client/authentication/sha256_scramble_generator.cc	2	+++ plugin/x/client/authentication/sha256_scramble_generator.cc
3	@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig	3	@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
4	return true;	4	return true;




--- plugin/x/client/xconnection_impl.cc.orig	2021-12-17 16:07:27 UTC
+++ plugin/x/client/xconnection_impl.cc
@@ -618,6 +618,7 @@ XError Connection_impl::get_ssl_error(const int error_
   return XError(CR_SSL_CONNECTION_ERROR, buffer);
 }
 
+#ifndef LIBRESSL_VERSION_NUMBER
 /**
   Set fips mode in openssl library,
   When we set fips mode ON/STRICT, it will perform following operations:
@@ -657,6 +658,7 @@ int set_fips_mode(const uint32_t fips_mode,
 EXIT:
   return rc;
 }
+#endif
 
 XError Connection_impl::activate_tls() {
   if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
@@ -667,12 +669,14 @@ XError Connection_impl::activate_tls() {
   if (!m_context->m_ssl_config.is_configured())
     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
 
+#ifndef LIBRESSL_VERSION_NUMBER
   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
   if (set_fips_mode(
           static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
           err_string) != 1) {
     return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
   }
+#endif
   auto ssl_ctx_flags = process_tls_version(
       details::null_when_empty(m_context->m_ssl_config.m_tls_version));
 

Lines 1-4 Link Here

(-)mysql80-server/files/patch-plugin_x_configure.cmake (-1 / +1 lines)
1	--- plugin/x/configure.cmake.orig 2019-09-20 08:30:51 UTC	1	--- plugin/x/configure.cmake.orig 2022-07-06 21:36:34 UTC
2	+++ plugin/x/configure.cmake	2	+++ plugin/x/configure.cmake
3	@@ -45,6 +45,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx	3	@@ -45,6 +45,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
4	CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in	4	CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in




--- router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h.orig	2022-07-06 21:36:34 UTC
+++ router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h
@@ -190,8 +190,8 @@ class kqueue_io_service : public IoServiceBase {
         auto secs = std::chrono::duration_cast<std::chrono::seconds>(timeout);
         timeout -= secs;
 
-        ts = {secs.count(),
-              std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
+        ts = {(time_t)secs.count(),
+              (time_t)std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
                   .count()};
 
         p_ts = &ts;

Lines 1-4 Link Here

(-)mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h (-1 / +1 lines)
1	--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig 2020-11-09 00:30:01 UTC	1	--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/harness/include/mysql/harness/net_ts/internet.h	2	+++ router/src/harness/include/mysql/harness/net_ts/internet.h
3	@@ -43,6 +43,7 @@	3	@@ -43,6 +43,7 @@
4	#include <arpa/inet.h> // inet_ntop	4	#include <arpa/inet.h> // inet_ntop




--- router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h.orig	2020-09-23 12:37:48 UTC
+++ router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h
@@ -190,8 +190,8 @@
         auto secs = std::chrono::duration_cast<std::chrono::seconds>(timeout);
         timeout -= secs;
 
-        ts = {secs.count(),
-              std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
+        ts = {(time_t)secs.count(),
+              (time_t)std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
                   .count()};
 
         p_ts = &ts;




--- router/src/harness/src/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
+++ router/src/harness/src/CMakeLists.txt
@@ -213,7 +213,6 @@ ELSE()
   INSTALL(TARGETS harness-library
     LIBRARY
     DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

     )
 ENDIF()
 
@@ -244,7 +243,6 @@ INSTALL(TARGETS harness_stdx
   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

   )
 
 ## harness_tls
@@ -285,5 +283,4 @@ INSTALL(TARGETS harness_tls
   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

Lines 1-4 Link Here

(-)mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc (-1 / +1 lines)
1	--- router/src/harness/src/tls_client_context.cc.orig 2021-12-17 16:07:27 UTC	1	--- router/src/harness/src/tls_client_context.cc.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/harness/src/tls_client_context.cc	2	+++ router/src/harness/src/tls_client_context.cc
3	@@ -61,7 +61,7 @@ stdx::expected<void, std::error_code> TlsClientContext	3	@@ -61,7 +61,7 @@ stdx::expected<void, std::error_code> TlsClientContext
4	stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(	4	stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(

Lines 1-4 Link Here

(-)mysql80-server/files/patch-router_src_harness_src_tls__context.cc (-1 / +1 lines)
1	--- router/src/harness/src/tls_context.cc.orig 2021-12-17 16:07:27 UTC	1	--- router/src/harness/src/tls_context.cc.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/harness/src/tls_context.cc	2	+++ router/src/harness/src/tls_context.cc
3	@@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) {	3	@@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) {
4	return TLS1_1_VERSION;	4	return TLS1_1_VERSION;




--- router/src/harness/src/tls_server_context.cc.orig	2021-12-17 16:07:27 UTC
+++ router/src/harness/src/tls_server_context.cc
@@ -169,7 +169,8 @@ stdx::expected<void, std::error_code> TlsServerContext
     }
 
   } else {
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
+    !defined(LIBRESSL_VERSION_NUMBER)
     dh2048.reset(DH_get_2048_256());
 #else
     /*

Lines 1-4 Link Here

(-)mysql80-server/files/patch-router_src_http_src_CMakeLists.txt (-1 / +1 lines)
1	--- router/src/http/src/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- router/src/http/src/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/http/src/CMakeLists.txt	2	+++ router/src/http/src/CMakeLists.txt
3	@@ -58,7 +58,6 @@ INSTALL(TARGETS http_common	3	@@ -58,7 +58,6 @@ INSTALL(TARGETS http_common
4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router	4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router

Lines 1-4 Link Here

(-)mysql80-server/files/patch-router_src_io_src_CMakeLists.txt (-1 / +1 lines)
1	--- router/src/io/src/CMakeLists.txt.orig 2020-09-23 12:37:48 UTC	1	--- router/src/io/src/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/io/src/CMakeLists.txt	2	+++ router/src/io/src/CMakeLists.txt
3	@@ -47,7 +47,6 @@ INSTALL(TARGETS io_component	3	@@ -47,7 +47,6 @@ INSTALL(TARGETS io_component
4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router	4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router

Lines 1-6 Link Here

(-)mysql80-server/files/patch-router_src_router_src_CMakeLists.txt (-2 / +2 lines)
1	--- router/src/router/src/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- router/src/router/src/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/router/src/CMakeLists.txt	2	+++ router/src/router/src/CMakeLists.txt
3	@@ -124,7 +124,6 @@ INSTALL(TARGETS router_lib	3	@@ -127,7 +127,6 @@ INSTALL(TARGETS router_lib
4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router	4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
5	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	5	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
6	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	6	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router




--- scripts/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
+++ scripts/CMakeLists.txt
@@ -332,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
           SET(${var} "${${var}}-L${dir} " )
         ENDIF()
         SET(${var} "${${var}}-l${lib} " )
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
       ELSE()
         SET(${var} "${${var}}-l${lib} " )
       ENDIF()
@@ -405,7 +407,7 @@ ELSE()
     ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
     ESCAPE_QUOTES @ONLY)
 

     MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
     INSTALL(FILES
       ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
@@ -418,23 +420,28 @@ ELSE()
   # mysqld_safe used in mtr even for systemd platforms
   IF(WITH_SYSTEMD)
     SET(BIN_SCRIPTS

Lines 1-4 Link Here

(-)mysql80-server/files/patch-scripts_mysqld__safe.sh (-1 / +1 lines)
1	--- scripts/mysqld_safe.sh.orig 2022-01-23 11:48:36 UTC	1	--- scripts/mysqld_safe.sh.orig 2022-08-06 23:05:01 UTC
2	+++ scripts/mysqld_safe.sh	2	+++ scripts/mysqld_safe.sh
3	@@ -360,7 +360,7 @@ mysqld_ld_preload_text() {	3	@@ -360,7 +360,7 @@ mysqld_ld_preload_text() {
4	# running mysqld. See ld.so for details.	4	# running mysqld. See ld.so for details.




--- sql-common/client.cc.orig	2021-12-17 16:07:27 UTC
+++ sql-common/client.cc
@@ -8301,6 +8301,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
         return 1;
       break;
     case MYSQL_OPT_SSL_FIPS_MODE: {
+#if !defined(LIBRESSL_VERSION_NUMBER)
       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
       mysql->options.extension->ssl_fips_mode =
@@ -8313,6 +8314,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
             "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
         return 1;
       }
+#endif
     } break;
     case MYSQL_OPT_SSL_MODE:
       ENSURE_EXTENSIONS_PRESENT(&mysql->options);

Lines 1-4 Link Here

(-)mysql80-server/files/patch-sql_auth_sha2__password__common.cc (-1 / +1 lines)
1	--- sql/auth/sha2_password_common.cc.orig 2019-09-20 08:30:51 UTC	1	--- sql/auth/sha2_password_common.cc.orig 2022-07-06 21:36:34 UTC
2	+++ sql/auth/sha2_password_common.cc	2	+++ sql/auth/sha2_password_common.cc
3	@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig	3	@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
4	return true;	4	return true;

Lines 1-6 Link Here

(-)mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (-3 / +3 lines)
1	--- sql/conn_handler/socket_connection.cc.orig 2021-12-17 16:07:27 UTC	1	--- sql/conn_handler/socket_connection.cc.orig 2022-07-06 21:36:34 UTC
2	+++ sql/conn_handler/socket_connection.cc	2	+++ sql/conn_handler/socket_connection.cc
3	@@ -953,9 +953,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC	3	@@ -956,9 +956,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	@@ -967,12 +969,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC	17	@@ -970,12 +972,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	*/




--- sql/mysqld.cc.orig	2022-07-06 21:36:34 UTC
+++ sql/mysqld.cc
@@ -5299,7 +5299,7 @@ static int init_thread_environment() {
 
 static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
 

 #define FILE_LINE_ARGS
 #else
 #define FILE_LINE_ARGS , const char *, int
@@ -5316,12 +5316,14 @@ static void init_ssl() {
 }
 
 static int init_ssl_communication() {
+#ifndef LIBRESSL_VERSION_NUMBER
   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
   if (ret_fips_mode != 1) {
     LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
     return 1;
   }
+#endif /* LIBRESSL_VERSION_NUMBER */
   if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
                                   &server_main_callback, opt_initialize))
     return 1;

Lines 1-6 Link Here

(-)mysql80-server/files/patch-sql_ssl__init__callback.cc (-3 / +3 lines)
1	--- sql/ssl_init_callback.cc.orig 2021-12-17 16:07:27 UTC	1	--- sql/ssl_init_callback.cc.orig 2022-07-06 21:36:34 UTC
2	+++ sql/ssl_init_callback.cc	2	+++ sql/ssl_init_callback.cc
3	@@ -106,14 +106,14 @@ static Sys_var_charptr Sys_ssl_capath(	3	@@ -108,14 +108,14 @@ static Sys_var_charptr Sys_ssl_capath(
4		4
5	static Sys_var_charptr Sys_tls_version(	5	static Sys_var_charptr Sys_tls_version(
6	"tls_version",	6	"tls_version",
Lines 17-23 Link Here
17	"TLSv1.2,TLSv1.3",	17	"TLSv1.2,TLSv1.3",
18	#else	18	#else
19	"TLSv1.2",	19	"TLSv1.2",
20	@@ -175,14 +175,14 @@ static Sys_var_charptr Sys_admin_ssl_capath(	20	@@ -195,14 +195,14 @@ static Sys_var_charptr Sys_admin_ssl_capath(
21		21
22	static Sys_var_charptr Sys_admin_tls_version(	22	static Sys_var_charptr Sys_admin_tls_version(
23	"admin_tls_version",	23	"admin_tls_version",




--- sql/sys_vars.cc.orig	2022-07-06 21:36:34 UTC
+++ sql/sys_vars.cc
@@ -2039,7 +2039,7 @@ static Sys_var_ulong Sys_connect_timeout(
     "The number of seconds the mysqld server is waiting for a connect "
     "packet before responding with 'Bad handshake'",
     GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),

 
 static Sys_var_ulong Sys_information_schema_stats_expiry(
     "information_schema_stats_expiry",
@@ -3189,7 +3189,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(nullptr),
     ON_UPDATE(fix_net_read_timeout));
 
@@ -3210,7 +3210,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(nullptr),
     ON_UPDATE(fix_net_write_timeout));
 
@@ -4876,6 +4876,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 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) {
@@ -4887,14 +4888,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_va
   }
 }
 
+#endif
+
+#if defined(LIBRESSL_VERSION_NUMBER)
+static const char *ssl_fips_mode_names[] = {"OFF", 0};
+#else
 static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
+#endif
 static Sys_var_enum Sys_ssl_fips_mode(
     "ssl_fips_mode",
     "SSL FIPS mode (applies only for OpenSSL); "
-    "permitted values are: OFF, ON, STRICT",
+#ifndef LIBRESSL_VERSION_NUMBER
+     "permitted values are: OFF, ON, STRICT",
+#else
+    "permitted values are: OFF",
+#endif
     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(nullptr), ON_UPDATE(update_fips_mode), nullptr);
+    ON_CHECK(NULL),
+#ifndef LIBRESSL_VERSION_NUMBER
+    ON_UPDATE(update_fips_mode),
+#else
+    ON_UPDATE(NULL),
+#endif
+    NULL);
 
 static Sys_var_bool Sys_auto_generate_certs(
     "auto_generate_certs",

Lines 1-4 Link Here

(-)mysql80-server/files/patch-storage_innobase_include_srv0mon.h (-1 / +1 lines)
1	--- storage/innobase/include/srv0mon.h.orig 2019-09-20 08:30:51 UTC	1	--- storage/innobase/include/srv0mon.h.orig 2022-07-06 21:36:34 UTC
2	+++ storage/innobase/include/srv0mon.h	2	+++ storage/innobase/include/srv0mon.h
3	@@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	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. */

Lines 1-4 Link Here

(-)mysql80-server/files/patch-storage_innobase_ut_crc32.cc (-1 / +1 lines)
1	--- storage/innobase/ut/crc32.cc.orig 2021-12-17 17:07:27 UTC	1	--- storage/innobase/ut/crc32.cc.orig 2022-07-06 21:36:34 UTC
2	+++ storage/innobase/ut/crc32.cc	2	+++ storage/innobase/ut/crc32.cc
3	@@ -111,7 +111,9 @@ external tools. */	3	@@ -111,7 +111,9 @@ external tools. */
4	#endif /* CRC32_ARM64 */	4	#endif /* CRC32_ARM64 */

Lines 1-4 Link Here

(-)mysql80-server/files/patch-storage_myisam_mi__dynrec.cc (-1 / +1 lines)
1	--- storage/myisam/mi_dynrec.cc.orig 2019-09-20 08:30:51 UTC	1	--- storage/myisam/mi_dynrec.cc.orig 2022-07-06 21:36:34 UTC
2	+++ storage/myisam/mi_dynrec.cc	2	+++ storage/myisam/mi_dynrec.cc
3	@@ -85,17 +85,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {	3	@@ -85,17 +85,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
4	return true;	4	return true;




--- storage/temptable/include/temptable/lock_free_type.h.orig	2022-07-06 21:36:34 UTC
+++ storage/temptable/include/temptable/lock_free_type.h
@@ -32,6 +32,14 @@ Lock-free type (selection) implementation. */
 #include "my_config.h"
 #include "storage/temptable/include/temptable/constants.h"
 
+#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
+/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86
+ * https://llvm.org/bugs/show_bug.cgi?id=19355
+ */
+#undef ATOMIC_LLONG_LOCK_FREE
+#define ATOMIC_LLONG_LOCK_FREE 2
+#endif
+
 namespace temptable {
 
 /** Clang has a bug which causes ATOMIC_LLONG_LOCK_FREE to be defined as 1




--- storage/temptable/include/temptable/lock_free_type.h.orig	2020-06-16 16:31:03 UTC
+++ storage/temptable/include/temptable/lock_free_type.h
@@ -31,6 +31,14 @@ Lock-free type (selection) implementation. */
 
 #include "storage/temptable/include/temptable/constants.h"
 
+#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
+/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86
+ * https://llvm.org/bugs/show_bug.cgi?id=19355
+ */
+#undef ATOMIC_LLONG_LOCK_FREE
+#define ATOMIC_LLONG_LOCK_FREE 2
+#endif
+
 namespace temptable {
 
 /** Enum class describing alignment-requirements. */

Lines 1-4 Link Here

(-)mysql80-server/files/patch-support-files_CMakeLists.txt (-1 / +1 lines)
1	--- support-files/CMakeLists.txt.orig 2020-09-23 12:37:48 UTC	1	--- support-files/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -24,8 +24,9 @@ IF(NOT UNIX)	3	@@ -24,8 +24,9 @@ IF(NOT UNIX)
4	RETURN()	4	RETURN()

Lines 1-4 Link Here

(-)mysql80-server/files/patch-utilities_CMakeLists.txt (-1 / +1 lines)
1	--- utilities/CMakeLists.txt.orig 2020-09-23 12:37:48 UTC	1	--- utilities/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ utilities/CMakeLists.txt	2	+++ utilities/CMakeLists.txt
3	@@ -23,13 +23,19 @@	3	@@ -23,13 +23,19 @@
4	ADD_WSHADOW_WARNING()	4	ADD_WSHADOW_WARNING()

Lines 1-4 Link Here

(-)mysql80-server/files/patch-vio_viossl.cc (-3 / +3 lines)
1	--- vio/viossl.cc.orig 2021-12-17 16:07:27 UTC	1	--- vio/viossl.cc.orig 2022-07-06 21:36:34 UTC
2	+++ vio/viossl.cc	2	+++ vio/viossl.cc
3	@@ -45,7 +45,8 @@	3	@@ -45,7 +45,8 @@
4	BIO_set_callback_ex was added in openSSL 1.1.1	4	BIO_set_callback_ex was added in openSSL 1.1.1
Lines 10-16 Link Here
10	#define HAVE_BIO_SET_CALLBACK_EX	10	#define HAVE_BIO_SET_CALLBACK_EX
11	#endif	11	#endif
12		12
13	@@ -640,7 +641,7 @@ static int ssl_do(struct st_VioSSLFd ptr, Vio vio, l	13	@@ -692,7 +693,7 @@ static int ssl_do(struct st_VioSSLFd ptr, Vio vio, l
14	#if !defined(NDEBUG)	14	#if !defined(NDEBUG)
15	{	15	{
16	STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;	16	STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
Lines 19-25 Link Here
19	n = sk_SSL_COMP_num(ssl_comp_methods);	19	n = sk_SSL_COMP_num(ssl_comp_methods);
20	DBUG_PRINT("info", ("Available compression methods:\n"));	20	DBUG_PRINT("info", ("Available compression methods:\n"));
21	if (n == 0)	21	if (n == 0)
22	@@ -648,7 +649,7 @@ static int ssl_do(struct st_VioSSLFd ptr, Vio vio, l	22	@@ -700,7 +701,7 @@ static int ssl_do(struct st_VioSSLFd ptr, Vio vio, l
23	else	23	else
24	for (j = 0; j < n; j++) {	24	for (j = 0; j < n; j++) {
25	SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);	25	SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);




--- vio/viosslfactories.cc.orig	2022-07-06 21:36:34 UTC
+++ vio/viosslfactories.cc
@@ -40,6 +40,7 @@
 #include "vio/vio_priv.h"
 

 
 #if OPENSSL_VERSION_NUMBER < 0x10002000L
 #include <openssl/ec.h>
@@ -484,7 +485,7 @@ long process_tls_version(const char *tls_version) {
   }
 }
 
+#ifndef LIBRESSL_VERSION_NUMBER
 /**
   Set fips mode in openssl library,
   When we set fips mode ON/STRICT, it will perform following operations:
@@ -525,6 +527,7 @@
   @returns openssl current fips mode
 */
 uint get_fips_mode() { return FIPS_mode(); }
+#endif
 
 /**
   Toggle FIPS mode, to see whether it is available with the current SSL library.
@@ -532,6 +535,7 @@
   @retval non-zero: FIPS is supported.
 */
 int test_ssl_fips_mode(char *err_string) {
+#ifndef LIBRESSL_VERSION_NUMBER
   int ret = FIPS_mode_set(FIPS_mode() == 0 ? 1 : 0);
   unsigned long err = (ret == 0) ? ERR_get_error() : 0;
 
@@ -539,13 +543,16 @@
     ERR_error_string_n(err, err_string, OPENSSL_ERROR_LENGTH - 1);
   }
   return ret;
+#else
+  return 0;
+#endif
 }
 
 long process_tls_version(const char *tls_version) {
   const char *separator = ",";
   char *token, *lasts = nullptr;
 

   const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"};
   const char ctx_flag_default[] = "TLSv1.2,TLSv1.3";
   const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
@@ -559,7 +560,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
   ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
                     (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
                      SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2

                      | SSL_OP_NO_TLSv1_3
 #endif /* HAVE_TLSv13 */
                      | SSL_OP_NO_TICKET);
@@ -568,7 +569,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
     return nullptr;
 
   if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?

                                                     TLS_client_method()
                                                     : TLS_server_method()
 #else  /* HAVE_TLSv13 */
@@ -583,7 +584,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
     return nullptr;
   }
 

Return to bug 265468

Lines 1-5 Link Here

(-)mysql80-server/Makefile (-13 / +5 lines)
1	PORTNAME?= mysql	1	PORTNAME?= mysql
2	PORTVERSION= 8.0.29	2	PORTVERSION= 8.0.30
3	PORTREVISION?= 0	3	PORTREVISION?= 0
4	CATEGORIES= databases	4	CATEGORIES= databases
5	MASTER_SITES= MYSQL/MySQL-8.0	5	MASTER_SITES= MYSQL/MySQL-8.0
Lines 58-65 Link Here
58	CFLAGS_aarch64?= -march=armv8-a+crc+crypto	58	CFLAGS_aarch64?= -march=armv8-a+crc+crypto
59		59
60	CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \	60	CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
		61	-DCMAKE_INSTALL_PREFIX="${LOCALBASE}" \
61	-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \	62	-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
62	-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \	63	-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
		64	-DINSTALL_PREFIX="${LOCALBASE}" \
63	-DINSTALL_DOCDIR="share/doc/mysql" \	65	-DINSTALL_DOCDIR="share/doc/mysql" \
64	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \	66	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
65	-DINSTALL_INCLUDEDIR="include/mysql" \	67	-DINSTALL_INCLUDEDIR="include/mysql" \
Lines 78-96 Link Here
78	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	80	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
79	-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \	81	-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
80	-DWITH_BOOST="${WRKSRC}/boost" \	82	-DWITH_BOOST="${WRKSRC}/boost" \
81	-DWITH_SYSTEM_LIBS=1 \	83	-DWITH_SYSTEM_LIBS=ON \
82	-DWITH_EDITLINE=system \
83	-DWITH_LIBEVENT=system \
84	-DWITH_LZ4=system \
85	-DWITH_ICU=system \
86	-DWITH_CURL=system \
87	-DWITH_ZLIB=system \	84	-DWITH_ZLIB=system \
88	-DWITH_ZSTD=system \	85	-DWITH_AUTHENTICATION_FIDO=ON
89	-DWITH_PROTOBUF=system \
90	-DWITH_SSL=system \
91	-DWITH_AUTHENTICATION_FIDO=1 \
92	-DBUILD_BUNDLED_ZLIB=0 \
93	-DBUILD_BUNDLED_LZ4=0
94		86
95	# The Mroonga, RocksDB, and TokuDB storage engines are disabled.	87	# The Mroonga, RocksDB, and TokuDB storage engines are disabled.
96	# Mroonga is only buildable on little endian archs.	88	# Mroonga is only buildable on little endian archs.

Lines 2-60 Link Here

(-)mysql80-server/files/my.cnf.sample.in (-39 / +23 lines)
2	port = 3306	2	port = 3306
3	socket = /tmp/mysql.sock	3	socket = /tmp/mysql.sock
4		4
5	[mysql]
6	prompt = \u@\h [\d]>\_
7	no_auto_rehash
8
9	[mysqld]	5	[mysqld]
10	user = mysql	6	user = mysql
11	port = 3306	7	port = 3306
12	socket = /tmp/mysql.sock	8	socket = /tmp/mysql.sock
13	bind-address = 127.0.0.1	9	bind_address = 127.0.0.1,::1
14	basedir = %%PREFIX%%	10	basedir = %%PREFIX%%
15	datadir = %%MY_DBDIR%%	11	datadir = %%MY_DBDIR%%
16	tmpdir = %%MY_TMPDIR%%	12	tmpdir = %%MY_TMPDIR%%
17	slave-load-tmpdir = %%MY_TMPDIR%%	13	secure_file_priv = %%MY_SECDIR%%
18	secure-file-priv = %%MY_SECDIR%%	14	log_bin = mysql-bin
19	log-bin = mysql-bin	15	log_output = TABLE,FILE
20	log-output = TABLE	16	relay_log_recovery = ON
21	master-info-repository = TABLE	17	slow_query_log = OFF
22	relay-log-info-repository = TABLE	18	slow_query_log_file = slow-query.log
23	relay-log-recovery = 1	19	server_id = 1
24	slow-query-log = 1
25	server-id = 1
26	sync_binlog = 1	20	sync_binlog = 1
27	sync_relay_log = 1	21	sync_relay_log = 1
28	binlog_cache_size = 16M	22	binlog_cache_size = 256K
29	expire_logs_days = 30	23	binlog_stmt_cache_size = 256K
30	default_password_lifetime = 0	24	enforce_gtid_consistency = ON
31	enforce-gtid-consistency = 1	25	gtid_mode = ON
32	gtid-mode = ON	26	max_connections = 501
33	safe-user-create = 1	27	safe_user_create = ON
34	lower_case_table_names = 1	28	lower_case_table_names = 1
35	explicit-defaults-for-timestamp = 1	29	myisam_recover_options = FORCE,BACKUP
36	myisam-recover-options = BACKUP,FORCE
37	open_files_limit = 32768
38	table_open_cache = 16384
39	table_definition_cache = 8192
40	net_retry_count = 16384	30	net_retry_count = 16384
41	key_buffer_size = 256M	31	open_files_limit = 32768
42	max_allowed_packet = 64M	32	table_open_cache = 8192
43	long_query_time = 0.5	33	table_definition_cache = 4096
44	innodb_buffer_pool_size = 1G	34	long_query_time = 0.05
45	innodb_data_home_dir = %%MY_DBDIR%%	35	innodb_data_home_dir = %%MY_DBDIR%%
46	innodb_log_group_home_dir = %%MY_DBDIR%%	36	innodb_log_group_home_dir = %%MY_DBDIR%%
47	innodb_data_file_path = ibdata1:128M:autoextend	37	innodb_data_file_path = ibdata1:128M:autoextend
48	innodb_temp_data_file_path = ibtmp1:128M:autoextend	38	innodb_temp_data_file_path = ibtmp1:128M:autoextend
49	innodb_flush_method = O_DIRECT	39	innodb_flush_method = O_DIRECT
50	innodb_log_file_size = 256M
51	innodb_log_buffer_size = 16M
52	innodb_write_io_threads = 8
53	innodb_read_io_threads = 8
54	innodb_autoinc_lock_mode = 2
55	skip-symbolic-links
56		40
57	[mysqldump]	41	mysqlx = OFF
58	max_allowed_packet = 256M	42	mysqlx_port = 33060
59	quote_names	43	mysqlx_socket = /tmp/mysqlx.sock
60	quick	44	mysqlx_bind_address = 127.0.0.1,::1

Lines 1-6 Link Here

(-)mysql80-server/files/patch-CMakeLists.txt (-19 / +29 lines)
1	--- CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1665,7 +1665,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)	3	@@ -1819,7 +1819,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
4	ENDIF()	4	ENDIF()
5		5
6	IF(WITH_AUTHENTICATION_LDAP)	6	IF(WITH_AUTHENTICATION_LDAP)
Lines 9-31 Link Here
9	# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.	9	# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
10	IF(WITH_LDAP STREQUAL "system" OR	10	IF(WITH_LDAP STREQUAL "system" OR
11	WITH_SASL STREQUAL "system" OR	11	WITH_SASL STREQUAL "system" OR
12	@@ -1714,10 +1714,10 @@ IF(WITH_AUTHENTICATION_KERBEROS)	12	@@ -1868,6 +1868,7 @@ IF(WITH_AUTHENTICATION_KERBEROS)
13	ENDIF()	13	ENDIF()
14	ENDIF()	14	ENDIF()
15		15
16	-# Add system/bundled editline.	16	+IF(NOT WITHOUT_TOOLS)
17	-MYSQL_CHECK_EDITLINE()	17	# Add system/bundled editline.
18	# Add libevent	18	MYSQL_CHECK_EDITLINE()
19	-MYSQL_CHECK_LIBEVENT()	19	SET(EDITLINE_WARN_GIVEN)
		20	@@ -1878,7 +1879,9 @@ IF(EDITLINE_WARN_GIVEN)
		21	"You can use -DWITH_EDITLINE=bundled instead."
		22	)
		23	ENDIF()
		24	+ENDIF(NOT WITHOUT_TOOLS)
		25
20	+IF(NOT WITHOUT_SERVER)	26	+IF(NOT WITHOUT_SERVER)
21	+ MYSQL_CHECK_LIBEVENT()	27	# Add libevent
22	+ENDIF()	28	MYSQL_CHECK_LIBEVENT()
		29	SET(LIBEVENT_WARN_GIVEN)
		30	@@ -1889,6 +1892,7 @@ IF(LIBEVENT_WARN_GIVEN)
		31	"You can use -DWITH_LIBEVENT=bundled instead."
		32	)
		33	ENDIF()
		34	+ENDIF(NOT WITHOUT_SERVER)
		35
23	# Add lz4 library	36	# Add lz4 library
24	MYSQL_CHECK_LZ4()	37	MYSQL_CHECK_LZ4()
25	# Add icu library	38	@@ -2142,7 +2146,9 @@ ADD_CUSTOM_TARGET(clang_tidy_prerequisites)
26	@@ -1917,7 +1917,9 @@ ADD_CUSTOM_TARGET(plugin_all)	39	ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
27	# Utility target to build every target added with MYSQL_ADD_COMPONENT.	40	ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
28	ADD_CUSTOM_TARGET(component_all)
29		41
30	-ADD_SUBDIRECTORY(include)	42	-ADD_SUBDIRECTORY(include)
31	+IF(NOT WITHOUT_CLIENTLIBS)	43	+IF(NOT WITHOUT_CLIENTLIBS)
Lines 34-47 Link Here
34	ADD_SUBDIRECTORY(strings)	46	ADD_SUBDIRECTORY(strings)
35	ADD_SUBDIRECTORY(vio)	47	ADD_SUBDIRECTORY(vio)
36	ADD_SUBDIRECTORY(mysys)	48	ADD_SUBDIRECTORY(mysys)
37	@@ -1962,12 +1964,17 @@ IF(WITH_UNIT_TESTS)	49	@@ -2187,12 +2193,15 @@ IF(WITH_UNIT_TESTS)
38	ADD_SUBDIRECTORY(unittest/mytap/t)	50	ADD_SUBDIRECTORY(unittest/mytap/t)
39	ENDIF()	51	ENDIF()
40		52
41	-ADD_SUBDIRECTORY(client)	53	-ADD_SUBDIRECTORY(client)
42	+IF(NOT WITHOUT_TOOLS)	54	+IF(NOT WITHOUT_TOOLS)
43	+ # Add system/bundled editline
44	+ MYSQL_CHECK_EDITLINE()
45	+ ADD_SUBDIRECTORY(client)	55	+ ADD_SUBDIRECTORY(client)
46	+ENDIF(NOT WITHOUT_TOOLS)	56	+ENDIF(NOT WITHOUT_TOOLS)
47	+	57	+
Lines 54-60 Link Here
54	ADD_SUBDIRECTORY(testclients)	64	ADD_SUBDIRECTORY(testclients)
55	ADD_SUBDIRECTORY(sql)	65	ADD_SUBDIRECTORY(sql)
56	ENDIF()	66	ENDIF()
57	@@ -2020,11 +2027,11 @@ ENDIF()	67	@@ -2247,11 +2256,11 @@ ENDIF()
58	# scripts/mysql_config depends on client and server targets loaded above.	68	# scripts/mysql_config depends on client and server targets loaded above.
59	# It is referenced by some of the directories below, so we insert it here.	69	# It is referenced by some of the directories below, so we insert it here.
60	ADD_SUBDIRECTORY(scripts)	70	ADD_SUBDIRECTORY(scripts)
Lines 67-73 Link Here
67	IF(WITH_INTERNAL)	77	IF(WITH_INTERNAL)
68	ADD_SUBDIRECTORY(internal)	78	ADD_SUBDIRECTORY(internal)
69	ENDIF()	79	ENDIF()
70	@@ -2134,6 +2141,7 @@ IF(PACK_SEPARATE_COMPONENTS)	80	@@ -2361,6 +2370,7 @@ IF(PACK_SEPARATE_COMPONENTS)
71	SET(CPACK_COMPONENTS_GROUPING IGNORE)	81	SET(CPACK_COMPONENTS_GROUPING IGNORE)
72	ENDIF()	82	ENDIF()
73		83
Lines 75-81 Link Here
75	IF(UNIX)	85	IF(UNIX)
76	INSTALL(FILES	86	INSTALL(FILES
77	Docs/mysql.info	87	Docs/mysql.info
78	@@ -2168,6 +2176,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	88	@@ -2395,6 +2405,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
79	PATTERN "sp-imp-spec.txt" EXCLUDE	89	PATTERN "sp-imp-spec.txt" EXCLUDE
80	PATTERN "README.build" EXCLUDE	90	PATTERN "README.build" EXCLUDE
81	)	91	)

Lines 1-4 Link Here

(-)mysql80-server/files/patch-client_CMakeLists.txt (-5 / +5 lines)
1	--- client/CMakeLists.txt.orig 2021-09-28 11:46:34 UTC	1	--- client/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()	3	@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
4	## Subdirectory with common client code.	4	## Subdirectory with common client code.
Lines 22-28 Link Here
22		22
23	IF(NOT WITHOUT_SERVER)	23	IF(NOT WITHOUT_SERVER)
24	MYSQL_ADD_EXECUTABLE(mysql_upgrade	24	MYSQL_ADD_EXECUTABLE(mysql_upgrade
25	@@ -55,6 +59,7 @@ IF(NOT_WITHOUT_SERVER)	25	@@ -55,6 +59,7 @@ IF(NOT WITHOUT_SERVER)
26	)	26	)
27	ENDIF()	27	ENDIF()
28		28
Lines 40-46 Link Here
40	MYSQL_ADD_EXECUTABLE(mysqlcheck	40	MYSQL_ADD_EXECUTABLE(mysqlcheck
41	check/mysqlcheck.cc	41	check/mysqlcheck.cc
42	check/mysqlcheck_core.cc	42	check/mysqlcheck_core.cc
43	@@ -250,7 +258,9 @@ ENDIF()	43	@@ -262,7 +270,9 @@ ENDIF()
44		44
45	TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)	45	TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
46	TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)	46	TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
Lines 50-56 Link Here
50	MYSQL_ADD_EXECUTABLE(mysqladmin	50	MYSQL_ADD_EXECUTABLE(mysqladmin
51	mysqladmin.cc	51	mysqladmin.cc
52	multi_factor_passwordopt-vars.cc	52	multi_factor_passwordopt-vars.cc
53	@@ -265,6 +275,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor	53	@@ -277,6 +287,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
54	mysql_config_editor.cc	54	mysql_config_editor.cc
55	LINK_LIBRARIES mysqlclient	55	LINK_LIBRARIES mysqlclient
56	)	56	)
Lines 60-66 Link Here
60	MYSQL_ADD_EXECUTABLE(mysql_secure_installation	60	MYSQL_ADD_EXECUTABLE(mysql_secure_installation
61	mysql_secure_installation.cc	61	mysql_secure_installation.cc
62	LINK_LIBRARIES mysqlclient	62	LINK_LIBRARIES mysqlclient
63	@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup	63	@@ -287,6 +300,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
64	path.cc	64	path.cc
65	LINK_LIBRARIES mysys	65	LINK_LIBRARIES mysys
66	)	66	)

Line 0 Link Here

(-)mysql80-server/files/patch-cmake_install__layout.cmake (+113 lines)
		1	--- cmake/install_layout.cmake.orig 2022-07-06 21:36:34 UTC
		2	+++ cmake/install_layout.cmake
		3	@@ -41,6 +41,10 @@
		4	# Build with prefix=/usr/local/mysql, create tarball with install prefix="."
		5	# and relative links.
		6	#
		7	+# FREEBSD
		8	+# Build with prefix=/usr/local, create tarball with install prefix="."
		9	+# and relative links.
		10	+#
		11	# To force a directory layout, use -DINSTALL_LAYOUT=<layout>.
		12	#
		13	# The default is STANDALONE.
		14	@@ -80,7 +84,7 @@ IF(NOT INSTALL_LAYOUT)
		15	ENDIF()
		16
		17	SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
		18	- CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4"
		19	+ CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, FREEBSD, RPM, DEB, SVR4"
		20	)
		21
		22	IF(UNIX)
		23	@@ -88,6 +92,8 @@ IF(UNIX)
		24	SET(default_prefix "/usr")
		25	ELSEIF(INSTALL_LAYOUT MATCHES "DEB")
		26	SET(default_prefix "/usr")
		27	+ ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
		28	+ SET(default_prefix "/usr/local")
		29	ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
		30	SET(default_prefix "/opt/mysql/mysql")
		31	ELSE()
		32	@@ -98,7 +104,7 @@ IF(UNIX)
		33	CACHE PATH "install prefix" FORCE)
		34	ENDIF()
		35	SET(VALID_INSTALL_LAYOUTS
		36	- "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE")
		37	+ "RPM" "DEB" "SVR4" "TARGZ" "FREEBSD" "STANDALONE")
		38	LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
		39	IF(ind EQUAL -1)
		40	MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
		41	@@ -136,6 +142,8 @@ ELSEIF(INSTALL_LAYOUT MATCHES "RPM" OR
		42	INSTALL_LAYOUT MATCHES "SVR4" OR
		43	INSTALL_LAYOUT MATCHES "DEB")
		44	SET(secure_file_priv_path "/var/lib/mysql-files")
		45	+ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
		46	+ SET(secure_file_priv_path "/var/db/mysql_secure")
		47	ELSE()
		48	SET(secure_file_priv_path "${default_prefix}/mysql-files")
		49	ENDIF()
		50	@@ -167,6 +175,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring")
		51	SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
		52
		53	#
		54	+# FREEBSD layout
		55	+#
		56	+SET(INSTALL_BINDIR_FREEBSD "bin")
		57	+SET(INSTALL_SBINDIR_FREEBSD "libexec")
		58	+#
		59	+SET(INSTALL_LIBDIR_FREEBSD "lib/mysql")
		60	+SET(INSTALL_PRIV_LIBDIR_FREEBSD "lib/mysql/private")
		61	+SET(INSTALL_PLUGINDIR_FREEBSD "lib/mysql/plugin")
		62	+#
		63	+SET(INSTALL_INCLUDEDIR_FREEBSD "include/mysql")
		64	+#
65	+SET(INSTALL_DOCDIR_FREEBSD "share/doc/mysql")
66	+SET(INSTALL_DOCREADMEDIR_FREEBSD "share/doc/mysql")
67	+SET(INSTALL_MANDIR_FREEBSD "share/man")
68	+SET(INSTALL_INFODIR_FREEBSD "share/info")
69	+#
70	+SET(INSTALL_SHAREDIR_FREEBSD "share")
71	+SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share/mysql")
72	+SET(INSTALL_MYSQLTESTDIR_FREEBSD "")
73	+SET(INSTALL_SUPPORTFILESDIR_FREEBSD "share/mysql")
74	+#
75	+SET(INSTALL_MYSQLDATADIR_FREEBSD "/var/db/mysql")
76	+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD "etc/mysql/keyring")
77	+SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
78	+
79	+#
80	# TARGZ layout
81	#
82	SET(INSTALL_BINDIR_TARGZ "bin")
83	@@ -361,7 +395,7 @@ ENDIF()
84	SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
85	CACHE
86	STRING
87	- "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ")
88	+ "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ")
89
90	# If we are shared STANDALONE with the the server, we shouldn't write
91	# into the server's data/ as that would create a "schemadir" in
92	@@ -405,6 +439,21 @@ FOREACH(var
93	)
94	SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
95	ENDFOREACH()
96	+
97	+#
98	+# FreeBSD layout
99	+#
100	+SET(ROUTER_INSTALL_CONFIGDIR_FREEBSD "/usr/local/etc/mysqlrouter")
101	+SET(ROUTER_INSTALL_DATADIR_FREEBSD "/var/db/mysqlrouter")
102	+SET(ROUTER_INSTALL_LOGDIR_FREEBSD "/var/log/mysqlrouter")
103	+SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter")
104	+
105	+SET(ROUTER_INSTALL_BINDIR_FREEBSD "bin")
106	+SET(ROUTER_INSTALL_LIBDIR_FREEBSD "lib/mysql")
107	+SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD "lib/mysql/mysqlrouter")
108	+SET(ROUTER_INSTALL_LOGROTATEDIR_FREEBSD "etc/logrotate.d")
109	+SET(ROUTER_INSTALL_LOGROTATEFILE_FREEBSD "mysqlrouter")
110	+SET(ROUTER_INSTALL_DOCDIR_FREEBSD "share/mysqlrouter/docs")
111
112	FOREACH(var
113	LOGROTATE

Lines 1-95 Link Here

(-)mysql80-server/files/patch-cmake_install_layout.cmake (-95 lines)
1	--- cmake/install_layout.cmake.orig 2019-12-09 19:53:17 UTC
2	+++ cmake/install_layout.cmake
3	@@ -41,6 +41,10 @@
4	# Build with prefix=/usr/local/mysql, create tarball with install prefix="."
5	# and relative links.
6	#
7	+# FREEBSD
8	+# Build with prefix=/usr/local, create tarball with install prefix="."
9	+# and relative links.
10	+#
11	# To force a directory layout, use -DINSTALL_LAYOUT=<layout>.
12	#
13	# The default is STANDALONE.
14	@@ -80,7 +84,7 @@ IF(NOT INSTALL_LAYOUT)
15	ENDIF()
16
17	SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
18	- CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4"
19	+ CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, FREEBSD, RPM, DEB, SVR4"
20	)
21
22	IF(UNIX)
23	@@ -98,7 +102,7 @@ IF(UNIX)
24	CACHE PATH "install prefix" FORCE)
25	ENDIF()
26	SET(VALID_INSTALL_LAYOUTS
27	- "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE")
28	+ "RPM" "DEB" "SVR4" "TARGZ" "FREEBSD" "STANDALONE")
29	LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
30	IF(ind EQUAL -1)
31	MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
32	@@ -167,6 +171,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring")
33	SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
34
35	#
36	+# FREEBSD layout
37	+#
38	+SET(INSTALL_BINDIR_FREEBSD "bin")
39	+SET(INSTALL_SBINDIR_FREEBSD "bin")
40	+#
41	+SET(INSTALL_LIBDIR_FREEBSD "lib")
42	+SET(INSTALL_PRIV_LIBDIR_FREEBSD "lib/private")
43	+SET(INSTALL_PLUGINDIR_FREEBSD "lib/plugin")
44	+#
45	+SET(INSTALL_INCLUDEDIR_FREEBSD "include")
46	+#
47	+SET(INSTALL_DOCDIR_FREEBSD "docs")
48	+SET(INSTALL_DOCREADMEDIR_FREEBSD ".")
49	+SET(INSTALL_MANDIR_FREEBSD "man")
50	+SET(INSTALL_INFODIR_FREEBSD "docs")
51	+#
52	+SET(INSTALL_SHAREDIR_FREEBSD "share")
53	+SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share")
54	+SET(INSTALL_MYSQLTESTDIR_FREEBSD "mysql-test")
55	+SET(INSTALL_SUPPORTFILESDIR_FREEBSD "support-files")
56	+#
57	+SET(INSTALL_MYSQLDATADIR_FREEBSD "data")
58	+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD "keyring")
59	+SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
60	+
61	+#
62	# TARGZ layout
63	#
64	SET(INSTALL_BINDIR_TARGZ "bin")
65	@@ -361,7 +391,7 @@ ENDIF()
66	SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
67	CACHE
68	STRING
69	- "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ")
70	+ "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ")
71
72	# If we are shared STANDALONE with the the server, we shouldn't write
73	# into the server's data/ as that would create a "schemadir" in
74	@@ -405,6 +435,21 @@ FOREACH(var
75	)
76	SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
77	ENDFOREACH()
78	+
79	+#
80	+# FreeBSD layout
81	+#
82	+SET(ROUTER_INSTALL_CONFIGDIR_FREEBSD "/usr/local/etc/mysqlrouter")
83	+SET(ROUTER_INSTALL_DATADIR_FREEBSD "/var/db/mysqlrouter")
84	+SET(ROUTER_INSTALL_LOGDIR_FREEBSD "/var/log/mysqlrouter")
85	+SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter")
86	+
87	+SET(ROUTER_INSTALL_BINDIR_FREEBSD "bin")
88	+SET(ROUTER_INSTALL_LIBDIR_FREEBSD "lib/mysql")
89	+SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD "lib/mysql/mysqlrouter")
90	+SET(ROUTER_INSTALL_LOGROTATEDIR_FREEBSD "etc/logrotate.d")
91	+SET(ROUTER_INSTALL_LOGROTATEFILE_FREEBSD "mysqlrouter")
92	+SET(ROUTER_INSTALL_DOCDIR_FREEBSD "share/mysqlrouter/docs")
93
94	FOREACH(var
95	LOGROTATE

Lines 1-29 Link Here

(-)mysql80-server/files/patch-cmake_ssl.cmake (-21 / +15 lines)
1	--- cmake/ssl.cmake.orig 2021-12-17 16:07:27 UTC	1	--- cmake/ssl.cmake.orig 2022-07-06 21:36:34 UTC
2	+++ cmake/ssl.cmake	2	+++ cmake/ssl.cmake
3	@@ -211,7 +211,7 @@ MACRO (MYSQL_CHECK_SSL)	3	@@ -142,7 +142,7 @@ MACRO(FIND_OPENSSL_VERSION)
4	# Encoded as MNNFFPPS: major minor fix patch status	4	# Encoded as MNNFFPPS: major minor fix patch status
5	FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"	5	FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
6	OPENSSL_VERSION_NUMBER	6	OPENSSL_VERSION_NUMBER
7	- REGEX "^#[ ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]."	7	- REGEX "^#[ ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]."
8	+ REGEX "^#[\t ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]."	8	+ REGEX "^#[\t ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]."
9	)	9	)
10	STRING(REGEX REPLACE	10	STRING(REGEX REPLACE
11	"^.OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).$" "\\1"	11	"^.OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).$" "\\1"
12	@@ -226,13 +226,14 @@ MACRO (MYSQL_CHECK_SSL)	12	@@ -380,8 +380,9 @@ MACRO (MYSQL_CHECK_SSL)
13	OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"	13	"Not a supported openssl version in WITH_SSL=${WITH_SSL}.")
14	)
15	ENDIF()	14	ENDIF()
16	- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")	15
		16	- IF("${OPENSSL_MAJOR_MINOR_FIX_VERSION}" VERSION_GREATER "1.1.0")
17	- ADD_DEFINITIONS(-DHAVE_TLSv13)	17	- ADD_DEFINITIONS(-DHAVE_TLSv13)
18	+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)	18	+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
19	+ IF(HAVE_TLS1_3_VERSION)	19	+ IF(HAVE_TLS1_3_VERSION)
20	+ #ADD_DEFINITIONS(-DHAVE_TLSv13)	20	+ #ADD_DEFINITIONS(-DHAVE_TLSv13)
21	ENDIF()	21	ENDIF()
		22
22	IF(OPENSSL_INCLUDE_DIR AND	23	IF(OPENSSL_INCLUDE_DIR AND
23	OPENSSL_LIBRARY AND
24	CRYPTO_LIBRARY AND
25	- OPENSSL_MAJOR_VERSION STREQUAL "1"
26	+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
27	)
28	SET(OPENSSL_FOUND TRUE)
29	FIND_PROGRAM(OPENSSL_EXECUTABLE openssl

Lines 1-14 Link Here

(-)mysql80-server/files/patch-include_violite.h (-14 lines)
1	--- include/violite.h.orig 2021-12-17 16:07:27 UTC
2	+++ include/violite.h
3	@@ -268,9 +268,11 @@ struct st_VioSSLFd *new_VioSSLConnectorFd(
4
5	long process_tls_version(const char *tls_version);
6
7	+#ifndef LIBRESSL_VERSION_NUMBER
8	int set_fips_mode(const uint fips_mode, char *err_string);
9
10	uint get_fips_mode();
11	+#endif
12
13	int test_ssl_fips_mode(char *err_string);
14

Lines 1-6 Link Here

(-)mysql80-server/files/patch-libmysql_CMakeLists.txt (-5 / +5 lines)
1	--- libmysql/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- libmysql/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -198,6 +198,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)	3	@@ -201,6 +201,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
4	)	4	)
5	ENDIF()	5	ENDIF()
6		6
Lines 12-18 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	@@ -271,8 +276,15 @@ IF(WIN32)	15	@@ -274,8 +279,15 @@ IF(WIN32)
16	LIST(APPEND LIBS_TO_MERGE auth_win_client)	16	LIST(APPEND LIBS_TO_MERGE auth_win_client)
17	ENDIF()	17	ENDIF()
18		18
Lines 30-36 Link Here
30		30
31	# FIDO authentication client plugin	31	# FIDO authentication client plugin
32	ADD_SUBDIRECTORY(authentication_fido)	32	ADD_SUBDIRECTORY(authentication_fido)
33	@@ -288,6 +300,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG	33	@@ -291,6 +303,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
34	COMPONENT Development	34	COMPONENT Development
35	LINK_LIBRARIES ${LIBS_TO_LINK}	35	LINK_LIBRARIES ${LIBS_TO_LINK}
36	)	36	)
Lines 38-44 Link Here
38		38
39	# Visual Studio users need debug static library for debug projects	39	# Visual Studio users need debug static library for debug projects
40	IF(MSVC)	40	IF(MSVC)
41	@@ -334,17 +347,27 @@ ENDIF()	41	@@ -337,17 +350,27 @@ ENDIF()
42		42
43	# Merge several convenience libraries into one big mysqlclient	43	# Merge several convenience libraries into one big mysqlclient
44	# and link them together into shared library.	44	# and link them together into shared library.

Lines 1-12 Link Here

(-)mysql80-server/files/patch-mysys_my__md5.cc (-12 lines)
1	--- mysys/my_md5.cc.orig 2019-09-20 08:30:51 UTC
2	+++ mysys/my_md5.cc
3	@@ -56,7 +56,9 @@ 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	+#ifndef LIBRESSL_VERSION_NUMBER
8	fips_mode = FIPS_mode();
9	+#endif /* LIBRESSL_VERSION_NUMBER */
10	/* If fips mode is ON/STRICT restricted method calls will result into abort,
11	* skipping call. */
12	if (fips_mode == 0) {

Lines 1-20 Link Here

(-)mysql80-server/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc (-20 lines)
1	--- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc.orig 2022-02-20 15:21:13.279471000 -0800
2	+++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc 2022-02-20 15:22:02.451078000 -0800
3	@@ -318,6 +318,7 @@
4
5	#define OPENSSL_ERROR_LENGTH 512
6	static int configure_ssl_fips_mode(const int fips_mode) {
7	+#ifndef LIBRESSL_VERSION_NUMBER
8	int rc = -1;
9	int fips_mode_old = -1;
10	char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
11	@@ -338,6 +339,9 @@
12	}
13	EXIT:
14	return rc;
15	+# else
16	+ return -1;
17	+# endif
18	}
19
20	static int configure_ssl_ca(SSL_CTX ssl_ctx, const char ca_file,

Lines 1-33 Link Here

(-)mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc (-33 lines)
1	--- plugin/x/client/xconnection_impl.cc.orig 2021-12-17 16:07:27 UTC
2	+++ plugin/x/client/xconnection_impl.cc
3	@@ -618,6 +618,7 @@ XError Connection_impl::get_ssl_error(const int error_
4	return XError(CR_SSL_CONNECTION_ERROR, buffer);
5	}
6
7	+#ifndef LIBRESSL_VERSION_NUMBER
8	/**
9	Set fips mode in openssl library,
10	When we set fips mode ON/STRICT, it will perform following operations:
11	@@ -657,6 +658,7 @@ int set_fips_mode(const uint32_t fips_mode,
12	EXIT:
13	return rc;
14	}
15	+#endif
16
17	XError Connection_impl::activate_tls() {
18	if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
19	@@ -667,12 +669,14 @@ XError Connection_impl::activate_tls() {
20	if (!m_context->m_ssl_config.is_configured())
21	return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
22
23	+#ifndef LIBRESSL_VERSION_NUMBER
24	char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
25	if (set_fips_mode(
26	static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
27	err_string) != 1) {
28	return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
29	}
30	+#endif
31	auto ssl_ctx_flags = process_tls_version(
32	details::null_when_empty(m_context->m_ssl_config.m_tls_version));
33

Lines 1-6 Link Here

(-)mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt (-4 / +4 lines)
1	--- router/src/harness/src/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- router/src/harness/src/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ router/src/harness/src/CMakeLists.txt	2	+++ router/src/harness/src/CMakeLists.txt
3	@@ -212,7 +212,6 @@ ELSE()	3	@@ -213,7 +213,6 @@ ELSE()
4	INSTALL(TARGETS harness-library	4	INSTALL(TARGETS harness-library
5	LIBRARY	5	LIBRARY
6	DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	6	DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
Lines 8-14 Link Here
8	)	8	)
9	ENDIF()	9	ENDIF()
10		10
11	@@ -243,7 +242,6 @@ INSTALL(TARGETS harness_stdx	11	@@ -244,7 +243,6 @@ INSTALL(TARGETS harness_stdx
12	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router	12	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
13	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	13	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
14	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	14	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
Lines 16-22 Link Here
16	)	16	)
17		17
18	## harness_tls	18	## harness_tls
19	@@ -284,5 +282,4 @@ INSTALL(TARGETS harness_tls	19	@@ -285,5 +283,4 @@ INSTALL(TARGETS harness_tls
20	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router	20	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
21	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	21	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
22	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router	22	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

Lines 1-12 Link Here

(-)mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc (-12 lines)
1	--- router/src/harness/src/tls_server_context.cc.orig 2021-12-17 16:07:27 UTC
2	+++ router/src/harness/src/tls_server_context.cc
3	@@ -169,7 +169,8 @@ stdx::expected<void, std::error_code> TlsServerContext
4	}
5
6	} else {
7	-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
8	+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
9	+ !defined(LIBRESSL_VERSION_NUMBER)
10	dh2048.reset(DH_get_2048_256());
11	#else
12	/*

Lines 1-15 Link Here

(-)mysql80-server/files/patch-scripts_CMakeLists.txt (-6 / +6 lines)
1	--- scripts/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC	1	--- scripts/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -323,6 +323,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -332,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	4	SET(${var} "${${var}}-L${dir} " )
5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	5	ENDIF()
6	SET(${var} "${${var}}-l${lib} " )	6	SET(${var} "${${var}}-l${lib} " )
7	+ ELSEIF(lib STREQUAL "-pthread")	7	+ ELSEIF(lib STREQUAL "-pthread")
8	+ SET(${var} "${${var}}-pthread " )	8	+ SET(${var} "${${var}}-pthread " )
9	ELSE()	9	ELSE()
10	SET(${var} "${${var}}-l${lib} " )	10	SET(${var} "${${var}}-l${lib} " )
11	ENDIF()	11	ENDIF()
12	@@ -396,7 +398,7 @@ ELSE()	12	@@ -405,7 +407,7 @@ ELSE()
13	${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}	13	${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
14	ESCAPE_QUOTES @ONLY)	14	ESCAPE_QUOTES @ONLY)
15		15
Lines 18-24 Link Here
18	MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")	18	MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
19	INSTALL(FILES	19	INSTALL(FILES
20	${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}	20	${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
21	@@ -409,23 +411,28 @@ ELSE()	21	@@ -418,23 +420,28 @@ ELSE()
22	# mysqld_safe used in mtr even for systemd platforms	22	# mysqld_safe used in mtr even for systemd platforms
23	IF(WITH_SYSTEMD)	23	IF(WITH_SYSTEMD)
24	SET(BIN_SCRIPTS	24	SET(BIN_SCRIPTS

Lines 1-18 Link Here

(-)mysql80-server/files/patch-sql-common_client.cc (-18 lines)
1	--- sql-common/client.cc.orig 2021-12-17 16:07:27 UTC
2	+++ sql-common/client.cc
3	@@ -8301,6 +8301,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
4	return 1;
5	break;
6	case MYSQL_OPT_SSL_FIPS_MODE: {
7	+#if !defined(LIBRESSL_VERSION_NUMBER)
8	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
9	ENSURE_EXTENSIONS_PRESENT(&mysql->options);
10	mysql->options.extension->ssl_fips_mode =
11	@@ -8313,6 +8314,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
12	"Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
13	return 1;
14	}
15	+#endif
16	} break;
17	case MYSQL_OPT_SSL_MODE:
18	ENSURE_EXTENSIONS_PRESENT(&mysql->options);

Lines 1-6 Link Here

(-)mysql80-server/files/patch-sql_mysqld.cc (-17 / +2 lines)
1	--- sql/mysqld.cc.orig 2021-12-17 16:07:27 UTC	1	--- sql/mysqld.cc.orig 2022-07-06 21:36:34 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -5285,7 +5285,7 @@ static int init_thread_environment() {	3	@@ -5299,7 +5299,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-26 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	@@ -5316,12 +5316,14 @@ static void init_ssl() {
13	}
14
15	static int init_ssl_communication() {
16	+#ifndef LIBRESSL_VERSION_NUMBER
17	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
18	int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
19	if (ret_fips_mode != 1) {
20	LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
21	return 1;
22	}
23	+#endif /* LIBRESSL_VERSION_NUMBER */
24	if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
25	&server_main_callback, opt_initialize))
26	return 1;

Lines 1-6 Link Here

(-)mysql80-server/files/patch-sql_sys__vars.cc (-45 / +4 lines)
1	--- sql/sys_vars.cc.orig 2021-12-17 16:07:27 UTC	1	--- sql/sys_vars.cc.orig 2022-07-06 21:36:34 UTC
2	+++ sql/sys_vars.cc	2	+++ sql/sys_vars.cc
3	@@ -1977,7 +1977,7 @@ static Sys_var_ulong Sys_connect_timeout(	3	@@ -2039,7 +2039,7 @@ static Sys_var_ulong Sys_connect_timeout(
4	"The number of seconds the mysqld server is waiting for a connect "	4	"The number of seconds the mysqld server is waiting for a connect "
5	"packet before responding with 'Bad handshake'",	5	"packet before responding with 'Bad handshake'",
6	GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),	6	GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
Lines 9-15 Link Here
9		9
10	static Sys_var_ulong Sys_information_schema_stats_expiry(	10	static Sys_var_ulong Sys_information_schema_stats_expiry(
11	"information_schema_stats_expiry",	11	"information_schema_stats_expiry",
12	@@ -3093,7 +3093,7 @@ static Sys_var_ulong Sys_net_read_timeout(	12	@@ -3189,7 +3189,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(nullptr),	18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
19	ON_UPDATE(fix_net_read_timeout));	19	ON_UPDATE(fix_net_read_timeout));
20		20
21	@@ -3114,7 +3114,7 @@ static Sys_var_ulong Sys_net_write_timeout(	21	@@ -3210,7 +3210,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-70 Link Here
27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),	27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
28	ON_UPDATE(fix_net_write_timeout));	28	ON_UPDATE(fix_net_write_timeout));
29		29
30	@@ -4876,6 +4876,7 @@ static Sys_var_ulong Sys_max_execution_time(
31	HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
32	VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
33
34	+#ifndef LIBRESSL_VERSION_NUMBER
35	static bool update_fips_mode(sys_var , THD , enum_var_type) {
36	char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
37	if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
38	@@ -4887,14 +4888,30 @@ static bool update_fips_mode(sys_var , THD , enum_va
39	}
40	}
41
42	+#endif
43	+
44	+#if defined(LIBRESSL_VERSION_NUMBER)
45	+static const char *ssl_fips_mode_names[] = {"OFF", 0};
46	+#else
47	static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
48	+#endif
49	static Sys_var_enum Sys_ssl_fips_mode(
50	"ssl_fips_mode",
51	"SSL FIPS mode (applies only for OpenSSL); "
52	- "permitted values are: OFF, ON, STRICT",
53	+#ifndef LIBRESSL_VERSION_NUMBER
54	+ "permitted values are: OFF, ON, STRICT",
55	+#else
56	+ "permitted values are: OFF",
57	+#endif
58	GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
59	ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
60	- ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr);
61	+ ON_CHECK(NULL),
62	+#ifndef LIBRESSL_VERSION_NUMBER
63	+ ON_UPDATE(update_fips_mode),
64	+#else
65	+ ON_UPDATE(NULL),
66	+#endif
67	+ NULL);
68
69	static Sys_var_bool Sys_auto_generate_certs(
70	"auto_generate_certs",

Line 0 Link Here

(-)mysql80-server/files/patch-storage_temptable_include_temptable_lock__free__type.h (+17 lines)
	1	--- storage/temptable/include/temptable/lock_free_type.h.orig 2022-07-06 21:36:34 UTC
	2	+++ storage/temptable/include/temptable/lock_free_type.h
	3	@@ -32,6 +32,14 @@ Lock-free type (selection) implementation. */
	4	#include "my_config.h"
	5	#include "storage/temptable/include/temptable/constants.h"
	6
	7	+#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
	8	+/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86
	9	+ * https://llvm.org/bugs/show_bug.cgi?id=19355
	10	+ */
	11	+#undef ATOMIC_LLONG_LOCK_FREE
	12	+#define ATOMIC_LLONG_LOCK_FREE 2
	13	+#endif
	14	+
	15	namespace temptable {
	16
	17	/** Clang has a bug which causes ATOMIC_LLONG_LOCK_FREE to be defined as 1

Lines 1-5 Link Here

(-)mysql80-server/files/patch-vio_viosslfactories.cc (-39 / +6 lines)
1	--- vio/viosslfactories.cc.orig 2021-12-17 08:07:27.000000000 -0800	1	--- vio/viosslfactories.cc.orig 2022-07-06 21:36:34 UTC
2	+++ vio/viosslfactories.cc 2022-02-20 11:48:11.223957000 -0800	2	+++ vio/viosslfactories.cc
3	@@ -40,6 +40,7 @@	3	@@ -40,6 +40,7 @@
4	#include "vio/vio_priv.h"	4	#include "vio/vio_priv.h"
5		5
Lines 8-47 Link Here
8		8
9	#if OPENSSL_VERSION_NUMBER < 0x10002000L	9	#if OPENSSL_VERSION_NUMBER < 0x10002000L
10	#include <openssl/ec.h>	10	#include <openssl/ec.h>
11	@@ -472,6 +473,7 @@	11	@@ -484,7 +485,7 @@ long process_tls_version(const char *tls_version) {
12	}
13	}
14
15	+#ifndef LIBRESSL_VERSION_NUMBER
16	/**
17	Set fips mode in openssl library,
18	When we set fips mode ON/STRICT, it will perform following operations:
19	@@ -525,6 +527,7 @@
20	@returns openssl current fips mode
21	*/
22	uint get_fips_mode() { return FIPS_mode(); }
23	+#endif
24
25	/**
26	Toggle FIPS mode, to see whether it is available with the current SSL library.
27	@@ -532,6 +535,7 @@
28	@retval non-zero: FIPS is supported.
29	*/
30	int test_ssl_fips_mode(char *err_string) {
31	+#ifndef LIBRESSL_VERSION_NUMBER
32	int ret = FIPS_mode_set(FIPS_mode() == 0 ? 1 : 0);
33	unsigned long err = (ret == 0) ? ERR_get_error() : 0;
34
35	@@ -539,13 +543,16 @@
36	ERR_error_string_n(err, err_string, OPENSSL_ERROR_LENGTH - 1);
37	}
38	return ret;
39	+#else
40	+ return 0;
41	+#endif
42	}
43
44	long process_tls_version(const char *tls_version) {
45	const char *separator = ",";	12	const char *separator = ",";
46	char token, lasts = nullptr;	13	char token, lasts = nullptr;
47		14
Lines 50-56 Link Here
50	const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"};	17	const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"};
51	const char ctx_flag_default[] = "TLSv1.2,TLSv1.3";	18	const char ctx_flag_default[] = "TLSv1.2,TLSv1.3";
52	const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};	19	const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
53	@@ -623,7 +630,7 @@	20	@@ -559,7 +560,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
54	ssl_ctx_options = (ssl_ctx_options \| ssl_ctx_flags) &	21	ssl_ctx_options = (ssl_ctx_options \| ssl_ctx_flags) &
55	(SSL_OP_NO_SSLv2 \| SSL_OP_NO_SSLv3 \| SSL_OP_NO_TLSv1 \|	22	(SSL_OP_NO_SSLv2 \| SSL_OP_NO_SSLv3 \| SSL_OP_NO_TLSv1 \|
56	SSL_OP_NO_TLSv1_1 \| SSL_OP_NO_TLSv1_2	23	SSL_OP_NO_TLSv1_1 \| SSL_OP_NO_TLSv1_2
Lines 59-65 Link Here
59	\| SSL_OP_NO_TLSv1_3	26	\| SSL_OP_NO_TLSv1_3
60	#endif /* HAVE_TLSv13 */	27	#endif /* HAVE_TLSv13 */
61	\| SSL_OP_NO_TICKET);	28	\| SSL_OP_NO_TICKET);
62	@@ -632,7 +639,7 @@	29	@@ -568,7 +569,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
63	return nullptr;	30	return nullptr;
64		31
65	if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?	32	if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
Lines 68-74 Link Here
68	TLS_client_method()	35	TLS_client_method()
69	: TLS_server_method()	36	: TLS_server_method()
70	#else /* HAVE_TLSv13 */	37	#else /* HAVE_TLSv13 */
71	@@ -647,7 +654,7 @@	38	@@ -583,7 +584,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
72	return nullptr;	39	return nullptr;
73	}	40	}
74		41