Attachment 235844 Details for Bug 265468 – Patch to update to 8.0.30

[patch] Patch to update to 8.0.30

mysql80-server.diff (text/plain), 66.29 KB, created by Markus Kohlmeyer on 2022-08-11 11:13:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2022-08-11 11:13:02 UTC

Size: 66.29 KB

patch

obsolete

>diff -Naur mysql80-server.orig/Makefile mysql80-server/Makefile
>--- mysql80-server.orig/Makefile	2022-07-20 22:39:21.861492000 +0200
>+++ mysql80-server/Makefile	2022-08-06 22:48:54.634940000 +0200
>@@ -1,5 +1,5 @@
> PORTNAME?=		mysql
>-PORTVERSION=		8.0.29
>+PORTVERSION=		8.0.30
> PORTREVISION?=		0
> CATEGORIES=		databases
> MASTER_SITES=		MYSQL/MySQL-8.0
>@@ -58,8 +58,10 @@
> 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" \
>@@ -78,19 +80,9 @@
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
> 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
> 		-DWITH_BOOST="${WRKSRC}/boost" \
>-		-DWITH_SYSTEM_LIBS=1 \
>-		-DWITH_EDITLINE=system \
>-		-DWITH_LIBEVENT=system \
>-		-DWITH_LZ4=system \
>-		-DWITH_ICU=system \
>-		-DWITH_CURL=system \
>+		-DWITH_SYSTEM_LIBS=ON \
> 		-DWITH_ZLIB=system \
>-		-DWITH_ZSTD=system \
>-		-DWITH_PROTOBUF=system \
>-		-DWITH_SSL=system \
>-		-DWITH_AUTHENTICATION_FIDO=1 \
>-		-DBUILD_BUNDLED_ZLIB=0 \
>-		-DBUILD_BUNDLED_LZ4=0
>+		-DWITH_AUTHENTICATION_FIDO=ON
> 
> # The Mroonga, RocksDB, and TokuDB storage engines are disabled.
> # Mroonga is only buildable on little endian archs.
>diff -Naur mysql80-server.orig/distinfo mysql80-server/distinfo
>--- mysql80-server.orig/distinfo	2022-05-04 07:10:02.165450000 +0200
>+++ mysql80-server/distinfo	2022-08-06 22:49:23.734103000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1651315615
>-SHA256 (mysql-boost-8.0.29.tar.gz) = fd34a84c65fc7b15609d55b1f5d128c4d5543a6b95fa638569c3277c5c7bb048
>-SIZE (mysql-boost-8.0.29.tar.gz) = 327770349
>+TIMESTAMP = 1659818963
>+SHA256 (mysql-boost-8.0.30.tar.gz) = c331ac7a68099a2116097acbb14fd331423d486fe47ce0e346925111b44df69c
>+SIZE (mysql-boost-8.0.30.tar.gz) = 332772783
>diff -Naur mysql80-server.orig/files/my.cnf.sample.in mysql80-server/files/my.cnf.sample.in
>--- mysql80-server.orig/files/my.cnf.sample.in	2021-10-07 19:53:23.159863000 +0200
>+++ mysql80-server/files/my.cnf.sample.in	2022-08-07 01:10:25.721852000 +0200
>@@ -2,59 +2,43 @@
> 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
>+bind_address                    = 127.0.0.1,::1
> basedir                         = %%PREFIX%%
> datadir                         = %%MY_DBDIR%%
> tmpdir                          = %%MY_TMPDIR%%
>-slave-load-tmpdir               = %%MY_TMPDIR%%
>-secure-file-priv                = %%MY_SECDIR%%
>-log-bin                         = mysql-bin
>-log-output                      = TABLE
>-master-info-repository          = TABLE
>-relay-log-info-repository       = TABLE
>-relay-log-recovery              = 1
>-slow-query-log                  = 1
>-server-id                       = 1
>+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
> sync_binlog                     = 1
> sync_relay_log                  = 1
>-binlog_cache_size               = 16M
>-expire_logs_days                = 30
>-default_password_lifetime       = 0
>-enforce-gtid-consistency        = 1
>-gtid-mode                       = ON
>-safe-user-create                = 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
>-explicit-defaults-for-timestamp = 1
>-myisam-recover-options          = BACKUP,FORCE
>-open_files_limit                = 32768
>-table_open_cache                = 16384
>-table_definition_cache          = 8192
>+myisam_recover_options          = FORCE,BACKUP
> net_retry_count                 = 16384
>-key_buffer_size                 = 256M
>-max_allowed_packet              = 64M
>-long_query_time                 = 0.5
>-innodb_buffer_pool_size         = 1G
>+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
> 
>-[mysqldump]
>-max_allowed_packet              = 256M
>-quote_names
>-quick
>+mysqlx                          = OFF
>+mysqlx_port                     = 33060
>+mysqlx_socket                   = /tmp/mysqlx.sock
>+mysqlx_bind_address             = 127.0.0.1,::1
>diff -Naur mysql80-server.orig/files/patch-CMakeLists.txt mysql80-server/files/patch-CMakeLists.txt
>--- mysql80-server.orig/files/patch-CMakeLists.txt	2022-01-29 07:10:03.040335000 +0100
>+++ mysql80-server/files/patch-CMakeLists.txt	2022-08-07 01:11:53.588608000 +0200
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ CMakeLists.txt
>-@@ -1665,7 +1665,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
>+@@ -1819,7 +1819,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
>  ENDIF()
>  
>  IF(WITH_AUTHENTICATION_LDAP)
>@@ -9,23 +9,35 @@
>      # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
>      IF(WITH_LDAP STREQUAL "system" OR
>          WITH_SASL STREQUAL "system" OR
>-@@ -1714,10 +1714,10 @@ IF(WITH_AUTHENTICATION_KERBEROS)
>+@@ -1868,6 +1868,7 @@ IF(WITH_AUTHENTICATION_KERBEROS)
>    ENDIF()
>  ENDIF()
>  
>--# Add system/bundled editline.
>--MYSQL_CHECK_EDITLINE()
>- # Add libevent
>--MYSQL_CHECK_LIBEVENT()
>++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)
>-+  MYSQL_CHECK_LIBEVENT()
>-+ENDIF()
>+ # 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()
>- # Add icu library
>-@@ -1917,7 +1917,9 @@ ADD_CUSTOM_TARGET(plugin_all)
>- # Utility target to build every target added with MYSQL_ADD_COMPONENT.
>- ADD_CUSTOM_TARGET(component_all)
>+@@ -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_SUBDIRECTORY(include)
> +IF(NOT WITHOUT_CLIENTLIBS)
>@@ -34,14 +46,12 @@
>  ADD_SUBDIRECTORY(strings)
>  ADD_SUBDIRECTORY(vio)
>  ADD_SUBDIRECTORY(mysys)
>-@@ -1962,12 +1964,17 @@ IF(WITH_UNIT_TESTS)
>+@@ -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)
> +
>@@ -54,7 +64,7 @@
>    ADD_SUBDIRECTORY(testclients)
>    ADD_SUBDIRECTORY(sql)
>  ENDIF()
>-@@ -2020,11 +2027,11 @@ 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)
>@@ -67,7 +77,7 @@
>    IF(WITH_INTERNAL)
>      ADD_SUBDIRECTORY(internal)
>    ENDIF()
>-@@ -2134,6 +2141,7 @@ IF(PACK_SEPARATE_COMPONENTS)
>+@@ -2361,6 +2370,7 @@ IF(PACK_SEPARATE_COMPONENTS)
>    SET(CPACK_COMPONENTS_GROUPING IGNORE)
>  ENDIF()
>  
>@@ -75,7 +85,7 @@
>  IF(UNIX)
>    INSTALL(FILES
>      Docs/mysql.info
>-@@ -2168,6 +2176,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+@@ -2395,6 +2405,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>      PATTERN "sp-imp-spec.txt" EXCLUDE
>      PATTERN "README.build" EXCLUDE
>    )
>diff -Naur mysql80-server.orig/files/patch-client_CMakeLists.txt mysql80-server/files/patch-client_CMakeLists.txt
>--- mysql80-server.orig/files/patch-client_CMakeLists.txt	2022-02-23 07:10:03.809135000 +0100
>+++ mysql80-server/files/patch-client_CMakeLists.txt	2022-08-07 01:11:53.590457000 +0200
>@@ -1,4 +1,4 @@
>---- client/CMakeLists.txt.orig	2021-09-28 11:46:34 UTC
>+--- 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.
>@@ -22,7 +22,7 @@
>  
>  IF(NOT WITHOUT_SERVER)
>    MYSQL_ADD_EXECUTABLE(mysql_upgrade
>-@@ -55,6 +59,7 @@ IF(NOT_WITHOUT_SERVER)
>+@@ -55,6 +59,7 @@ IF(NOT WITHOUT_SERVER)
>      )
>  ENDIF()
>  
>@@ -40,7 +40,7 @@
>  MYSQL_ADD_EXECUTABLE(mysqlcheck
>    check/mysqlcheck.cc
>    check/mysqlcheck_core.cc
>-@@ -250,7 +258,9 @@ ENDIF()
>+@@ -262,7 +270,9 @@ ENDIF()
>  
>  TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
>  TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
>@@ -50,7 +50,7 @@
>  MYSQL_ADD_EXECUTABLE(mysqladmin
>    mysqladmin.cc
>    multi_factor_passwordopt-vars.cc
>-@@ -265,6 +275,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
>+@@ -277,6 +287,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
>    mysql_config_editor.cc
>    LINK_LIBRARIES mysqlclient
>    )
>@@ -60,7 +60,7 @@
>  MYSQL_ADD_EXECUTABLE(mysql_secure_installation
>    mysql_secure_installation.cc
>    LINK_LIBRARIES mysqlclient
>-@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
>+@@ -287,6 +300,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
>    path.cc
>    LINK_LIBRARIES mysys
>    )
>diff -Naur mysql80-server.orig/files/patch-cmake_install__layout.cmake mysql80-server/files/patch-cmake_install__layout.cmake
>--- mysql80-server.orig/files/patch-cmake_install__layout.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ mysql80-server/files/patch-cmake_install__layout.cmake	2022-08-07 01:11:53.592301000 +0200
>@@ -0,0 +1,113 @@
>+--- 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
>diff -Naur mysql80-server.orig/files/patch-cmake_install_layout.cmake mysql80-server/files/patch-cmake_install_layout.cmake
>--- mysql80-server.orig/files/patch-cmake_install_layout.cmake	2021-10-07 19:53:23.160004000 +0200
>+++ mysql80-server/files/patch-cmake_install_layout.cmake	1970-01-01 01:00:00.000000000 +0100
>@@ -1,95 +0,0 @@
>---- 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
>diff -Naur mysql80-server.orig/files/patch-cmake_os_DragonFly.cmake mysql80-server/files/patch-cmake_os_DragonFly.cmake
>--- mysql80-server.orig/files/patch-cmake_os_DragonFly.cmake	2021-10-07 19:53:23.160029000 +0200
>+++ mysql80-server/files/patch-cmake_os_DragonFly.cmake	2022-08-07 01:11:53.594145000 +0200
>@@ -1,4 +1,4 @@
>---- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
>+--- cmake/os/DragonFly.cmake.orig	2022-08-06 23:05:01 UTC
> +++ cmake/os/DragonFly.cmake
> @@ -0,0 +1,24 @@
> +INCLUDE(CheckCSourceRuns)
>diff -Naur mysql80-server.orig/files/patch-cmake_os_FreeBSD.cmake mysql80-server/files/patch-cmake_os_FreeBSD.cmake
>--- mysql80-server.orig/files/patch-cmake_os_FreeBSD.cmake	2022-01-29 07:10:03.040378000 +0100
>+++ mysql80-server/files/patch-cmake_os_FreeBSD.cmake	2022-08-07 01:11:53.595971000 +0200
>@@ -1,4 +1,4 @@
>---- cmake/os/FreeBSD.cmake.orig	2021-12-17 16:07:27 UTC
>+--- cmake/os/FreeBSD.cmake.orig	2022-07-06 21:36:34 UTC
> +++ cmake/os/FreeBSD.cmake
> @@ -48,8 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
>      IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
>diff -Naur mysql80-server.orig/files/patch-cmake_plugin.cmake mysql80-server/files/patch-cmake_plugin.cmake
>--- mysql80-server.orig/files/patch-cmake_plugin.cmake	2022-01-29 07:10:03.040413000 +0100
>+++ mysql80-server/files/patch-cmake_plugin.cmake	2022-08-07 01:11:53.597798000 +0200
>@@ -1,4 +1,4 @@
>---- cmake/plugin.cmake.orig	2021-12-17 16:07:27 UTC
>+--- cmake/plugin.cmake.orig	2022-07-06 21:36:34 UTC
> +++ cmake/plugin.cmake
> @@ -247,15 +247,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
>  
>diff -Naur mysql80-server.orig/files/patch-cmake_ssl.cmake mysql80-server/files/patch-cmake_ssl.cmake
>--- mysql80-server.orig/files/patch-cmake_ssl.cmake	2022-01-29 07:10:03.040448000 +0100
>+++ mysql80-server/files/patch-cmake_ssl.cmake	2022-08-07 01:11:53.599634000 +0200
>@@ -1,29 +1,23 @@
>---- cmake/ssl.cmake.orig	2021-12-17 16:07:27 UTC
>+--- cmake/ssl.cmake.orig	2022-07-06 21:36:34 UTC
> +++ cmake/ssl.cmake
>-@@ -211,7 +211,7 @@ MACRO (MYSQL_CHECK_SSL)
>-       # 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"
>-@@ -226,13 +226,14 @@ MACRO (MYSQL_CHECK_SSL)
>-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
>-         )
>+@@ -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_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
>+ 
>+-    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
>diff -Naur mysql80-server.orig/files/patch-include_CMakeLists.txt mysql80-server/files/patch-include_CMakeLists.txt
>--- mysql80-server.orig/files/patch-include_CMakeLists.txt	2021-11-26 07:10:03.060710000 +0100
>+++ mysql80-server/files/patch-include_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,185 +0,0 @@
>---- include/CMakeLists.txt.orig	2021-09-28 11:46:34 UTC
>-+++ include/CMakeLists.txt
>-@@ -37,10 +37,182 @@ SET(HEADERS
>-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
>-   ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
>-   field_types.h
>-+  add_with_saturate.h
>-+  base64.h
>-+  big_endian.h
>-+  c_string_less.h
>-+  caching_sha2_passwordopt-longopts.h
>-+  caching_sha2_passwordopt-vars.h
>-+  compression.h
>-+  crypt_genhash_impl.h
>-+  decimal.h
>-+  depth_first_search.h
>-+  dur_prop.h
>-+  ft_global.h
>-+  heap.h
>-+  integer_digits.h
>-+  keycache.h
>-+  keyring_operations_helper.h
>-+  lex_string.h
>-+  lf.h
>-+  little_endian.h
>-+  m_ctype.h
>-+  m_string.h
>-+  manifest.h
>-+  map_helpers.h
>-+  mem_root_deque.h
>-+  memory_debugging.h
>-+  mf_wcomp.h
>-+  mutex_lock.h
>-+  my_aes.h
>-+  my_alloc.h
>-+  my_atomic.h
>-+  my_base.h
>-+  my_basename.h
>-+  my_bit.h
>-+  my_bitmap.h
>-+  my_byteorder.h
>-+  my_check_opt.h
>-+  my_checksum.h
>-+  my_compare.h
>-+  my_compiler.h
>-+  my_dbug.h
>-+  my_default.h
>-+  my_dir.h
>-+  my_double2ulonglong.h
>-+  my_getopt.h
>-+  my_getpwnam.h
>-+  my_hash_combine.h
>-+  my_hostname.h
>-+  my_icp.h
>-+  my_inttypes.h
>-+  my_io.h
>-+  my_loglevel.h
>-+  my_macros.h
>-+  my_md5_size.h
>-+  my_md5.h
>-+  my_murmur3.h
>-+  my_pointer_arithmetic.h
>-+  my_psi_config.h
>-+  my_rapidjson_size_t.h
>-+  my_rcu_lock.h
>-+  my_rdtsc.h
>-+  my_rnd.h
>-+  my_sharedlib.h
>-+  my_shm_defaults.h
>-+  my_sqlcommand.h
>-+  my_stacktrace.h
>-+  my_sys.h
>-+  my_systime.h
>-+  my_table_map.h
>-+  my_thread_local.h
>-+  my_thread_os_id.h
>-+  my_thread.h
>-+  my_time.h
>-+  my_timer.h
>-+  my_tree.h
>-+  my_uctype.h
>-+  my_user.h
>-+  my_xml.h
>-+  myisam.h
>-+  myisammrg.h
>-+  myisampack.h
>-+  mysql_async.h
>-+  mysql_com_server.h
>-+  mysys_err.h
>-+  password.h
>-+  pfs_cond_provider.h
>-+  pfs_data_lock_provider.h
>-+  pfs_error_provider.h
>-+  pfs_file_provider.h
>-+  pfs_idle_provider.h
>-+  pfs_memory_provider.h
>-+  pfs_metadata_provider.h
>-+  pfs_mutex_provider.h
>-+  pfs_rwlock_provider.h
>-+  pfs_socket_provider.h
>-+  pfs_stage_provider.h
>-+  pfs_statement_provider.h
>-+  pfs_system_provider.h
>-+  pfs_table_provider.h
>-+  pfs_thread_provider.h
>-+  pfs_tls_channel_provider.h
>-+  pfs_transaction_provider.h
>-+  prealloced_array.h
>-+  print_version.h
>-+  priority_queue.h
>-+  rwlock_scoped_lock.h
>-+  scope_guard.h
>-+  service_versions.h
>-+  sha1.h
>-+  sha2.h
>-+  sql_chars.h
>-+  sql_common.h
>-+  sql_string.h
>-+  sslopt-case.h
>-+  sslopt-longopts.h
>-+  sslopt-vars.h
>-+  tables_contained_in.h
>-+  template_utils.h
>-+  thr_cond.h
>-+  thr_lock.h
>-+  thr_mutex.h
>-+  thr_rwlock.h
>-+  typelib.h
>-+  unhex.h
>-+  unsafe_string_append.h
>-+  varlen_sort.h
>-+  violite.h
>-+  welcome_copyright_notice.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/group_replication_priv.h
>-+  mysql/innodb_priv.h
>-+  mysql/mysql_lex_string.h
>-+  mysql/plugin.h
>-+  mysql/plugin_audit.h
>-+  mysql/plugin_audit.h.pp
>-+  mysql/plugin_auth.h
>-+  mysql/plugin_auth.h.pp
>-+  mysql/plugin_auth_common.h
>-+  mysql/plugin_ftparser.h
>-+  mysql/plugin_ftparser.h.pp
>-+  mysql/plugin_group_replication.h
>-+  mysql/plugin_keyring.h
>-+  mysql/plugin_keyring.h.pp
>-+  mysql/plugin_query_rewrite.h
>-+  mysql/plugin_trace.h
>-+  mysql/plugin_validate_password.h
>-+  mysql/service_command.h
>-+  mysql/service_locking.h
>-+  mysql/service_my_plugin_log.h
>-+  mysql/service_mysql_alloc.h
>-+  mysql/service_mysql_keyring.h
>-+  mysql/service_mysql_password_policy.h
>-+  mysql/service_mysql_string.h
>-+  mysql/service_parser.h
>-+  mysql/service_plugin_registry.h
>-+  mysql/service_rpl_transaction_ctx.h
>-+  mysql/service_rpl_transaction_write_set.h
>-+  mysql/service_rules_table.h
>-+  mysql/service_security_context.h
>-+  mysql/service_srv_session.h
>-+  mysql/service_srv_session_info.h
>-+  mysql/service_ssl_wrapper.h
>-+  mysql/service_thd_alloc.h
>-+  mysql/service_thd_engine_lock.h
>-+  mysql/service_thd_wait.h
>-+  mysql/service_thread_scheduler.h
>-+  mysql/services.h
>-+  mysql/services.h.pp
>-+  mysql/thread_pool_priv.h
>-+  mysql/thread_type.h
>-   mysql/udf_registration_types.h
>- )
>- 
>diff -Naur mysql80-server.orig/files/patch-include_my__compare.h mysql80-server/files/patch-include_my__compare.h
>--- mysql80-server.orig/files/patch-include_my__compare.h	2021-10-07 19:53:23.160156000 +0200
>+++ mysql80-server/files/patch-include_my__compare.h	2022-08-07 01:11:53.603299000 +0200
>@@ -1,4 +1,4 @@
>---- include/my_compare.h.orig	2019-09-20 08:30:51 UTC
>+--- include/my_compare.h.orig	2022-07-06 21:36:34 UTC
> +++ include/my_compare.h
> @@ -49,7 +49,7 @@
>    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
>diff -Naur mysql80-server.orig/files/patch-include_my__stacktrace.h mysql80-server/files/patch-include_my__stacktrace.h
>--- mysql80-server.orig/files/patch-include_my__stacktrace.h	2022-01-29 07:10:03.040485000 +0100
>+++ mysql80-server/files/patch-include_my__stacktrace.h	2022-08-07 01:11:53.605130000 +0200
>@@ -1,4 +1,4 @@
>---- include/my_stacktrace.h.orig	2021-12-17 16:07:27 UTC
>+--- include/my_stacktrace.h.orig	2022-07-06 21:36:34 UTC
> +++ include/my_stacktrace.h
> @@ -43,7 +43,7 @@
>    HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris
>diff -Naur mysql80-server.orig/files/patch-include_my__thread__os__id.h mysql80-server/files/patch-include_my__thread__os__id.h
>--- mysql80-server.orig/files/patch-include_my__thread__os__id.h	2021-10-07 19:53:23.160195000 +0200
>+++ mysql80-server/files/patch-include_my__thread__os__id.h	2022-08-07 01:11:53.606981000 +0200
>@@ -1,4 +1,4 @@
>---- include/my_thread_os_id.h.orig	2019-09-20 08:30:51 UTC
>+--- include/my_thread_os_id.h.orig	2022-07-06 21:36:34 UTC
> +++ include/my_thread_os_id.h
> @@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
>    return pthread_getthreadid_np();
>diff -Naur mysql80-server.orig/files/patch-include_myisam.h mysql80-server/files/patch-include_myisam.h
>--- mysql80-server.orig/files/patch-include_myisam.h	2022-01-29 07:10:03.040521000 +0100
>+++ mysql80-server/files/patch-include_myisam.h	2022-08-07 01:11:53.608799000 +0200
>@@ -1,4 +1,4 @@
>---- include/myisam.h.orig	2021-12-17 16:07:27 UTC
>+--- include/myisam.h.orig	2022-07-06 21:36:34 UTC
> +++ include/myisam.h
> @@ -60,7 +60,7 @@
>    The following defines can be increased if necessary.
>diff -Naur mysql80-server.orig/files/patch-include_violite.h mysql80-server/files/patch-include_violite.h
>--- mysql80-server.orig/files/patch-include_violite.h	2022-01-29 07:10:03.040556000 +0100
>+++ mysql80-server/files/patch-include_violite.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>---- 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);
>- 
>diff -Naur mysql80-server.orig/files/patch-libmysql_CMakeLists.txt mysql80-server/files/patch-libmysql_CMakeLists.txt
>--- mysql80-server.orig/files/patch-libmysql_CMakeLists.txt	2022-01-29 07:10:03.040603000 +0100
>+++ mysql80-server/files/patch-libmysql_CMakeLists.txt	2022-08-07 01:11:53.610634000 +0200
>@@ -1,6 +1,6 @@
>---- libmysql/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- libmysql/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ libmysql/CMakeLists.txt
>-@@ -198,6 +198,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
>+@@ -201,6 +201,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
>    )
>  ENDIF()
>  
>@@ -12,7 +12,7 @@
>  #
>  # Include protocol tracing infrastructure and the test
>  # trace plugin if enabled by build options.
>-@@ -271,8 +276,15 @@ IF(WIN32)
>+@@ -274,8 +279,15 @@ IF(WIN32)
>    LIST(APPEND LIBS_TO_MERGE auth_win_client)
>  ENDIF()
>  
>@@ -30,7 +30,7 @@
>  
>  # FIDO authentication client plugin
>  ADD_SUBDIRECTORY(authentication_fido)
>-@@ -288,6 +300,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
>+@@ -291,6 +303,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
>    COMPONENT Development
>    LINK_LIBRARIES ${LIBS_TO_LINK}
>    )
>@@ -38,7 +38,7 @@
>  
>  # Visual Studio users need debug  static library for debug projects
>  IF(MSVC)
>-@@ -334,17 +347,27 @@ ENDIF()
>+@@ -337,17 +350,27 @@ ENDIF()
>  
>  # Merge several convenience libraries into one big mysqlclient
>  # and link them together into shared library.
>diff -Naur mysql80-server.orig/files/patch-libservices_CMakeLists.txt mysql80-server/files/patch-libservices_CMakeLists.txt
>--- mysql80-server.orig/files/patch-libservices_CMakeLists.txt	2022-01-29 07:10:03.040645000 +0100
>+++ mysql80-server/files/patch-libservices_CMakeLists.txt	2022-08-07 01:11:53.612451000 +0200
>@@ -1,4 +1,4 @@
>---- libservices/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- libservices/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ libservices/CMakeLists.txt
> @@ -47,7 +47,9 @@ SET(MYSQLSERVICES_SOURCES
>    plugin_registry_service.c)
>diff -Naur mysql80-server.orig/files/patch-man_CMakeLists.txt mysql80-server/files/patch-man_CMakeLists.txt
>--- mysql80-server.orig/files/patch-man_CMakeLists.txt	2022-01-29 07:10:03.040692000 +0100
>+++ mysql80-server/files/patch-man_CMakeLists.txt	2022-08-07 01:11:53.614280000 +0200
>@@ -1,4 +1,4 @@
>---- man/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- man/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ man/CMakeLists.txt
> @@ -23,26 +23,14 @@
>  # Copy man pages
>diff -Naur mysql80-server.orig/files/patch-mysys_my__default.cc mysql80-server/files/patch-mysys_my__default.cc
>--- mysql80-server.orig/files/patch-mysys_my__default.cc	2022-01-29 07:10:03.040774000 +0100
>+++ mysql80-server/files/patch-mysys_my__default.cc	2022-08-07 01:11:53.616104000 +0200
>@@ -1,4 +1,4 @@
>---- mysys/my_default.cc.orig	2021-12-17 16:07:27 UTC
>+--- mysys/my_default.cc.orig	2022-07-06 21:36:34 UTC
> +++ mysys/my_default.cc
> @@ -204,7 +204,7 @@ bool no_defaults = false;
>  
>diff -Naur mysql80-server.orig/files/patch-mysys_my__md5.cc mysql80-server/files/patch-mysys_my__md5.cc
>--- mysql80-server.orig/files/patch-mysys_my__md5.cc	2021-10-07 19:53:23.160368000 +0200
>+++ mysql80-server/files/patch-mysys_my__md5.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- 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) {
>diff -Naur mysql80-server.orig/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc mysql80-server/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc
>--- mysql80-server.orig/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc	2022-03-06 07:10:01.978337000 +0100
>+++ mysql80-server/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,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,
>diff -Naur mysql80-server.orig/files/patch-plugin_password__validation_validate__password.cc mysql80-server/files/patch-plugin_password__validation_validate__password.cc
>--- mysql80-server.orig/files/patch-plugin_password__validation_validate__password.cc	2021-10-07 19:53:23.160612000 +0200
>+++ mysql80-server/files/patch-plugin_password__validation_validate__password.cc	2022-08-07 01:11:53.617933000 +0200
>@@ -1,4 +1,4 @@
>---- plugin/password_validation/validate_password.cc.orig	2019-09-20 08:30:51 UTC
>+--- plugin/password_validation/validate_password.cc.orig	2022-07-06 21:36:34 UTC
> +++ plugin/password_validation/validate_password.cc
> @@ -25,6 +25,8 @@
>  #include <mysql/plugin_validate_password.h>
>diff -Naur mysql80-server.orig/files/patch-plugin_x_CMakeLists.txt mysql80-server/files/patch-plugin_x_CMakeLists.txt
>--- mysql80-server.orig/files/patch-plugin_x_CMakeLists.txt	2022-01-29 07:10:03.040811000 +0100
>+++ mysql80-server/files/patch-plugin_x_CMakeLists.txt	2022-08-07 01:11:53.619745000 +0200
>@@ -1,6 +1,6 @@
>---- plugin/x/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- plugin/x/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ plugin/x/CMakeLists.txt
>-@@ -77,6 +77,8 @@ INCLUDE_DIRECTORIES(
>+@@ -79,6 +79,8 @@ INCLUDE_DIRECTORIES(
>    ${MYSQLX_GENERATE_DIR}
>    ${MYSQLX_PROTOCOL_INCLUDE_DIR}
>    ${MYSQLX_CLIENT_INCLUDE_DIR}
>diff -Naur mysql80-server.orig/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc
>--- mysql80-server.orig/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc	2021-10-07 19:53:23.160661000 +0200
>+++ mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc	2022-08-07 01:11:53.621561000 +0200
>@@ -1,4 +1,4 @@
>---- plugin/x/client/authentication/sha256_scramble_generator.cc.orig	2019-09-20 08:30:51 UTC
>+--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig	2022-07-06 21:36:34 UTC
> +++ plugin/x/client/authentication/sha256_scramble_generator.cc
> @@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
>      return true;
>diff -Naur mysql80-server.orig/files/patch-plugin_x_client_xconnection__impl.cc mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc
>--- mysql80-server.orig/files/patch-plugin_x_client_xconnection__impl.cc	2022-01-29 07:10:03.040867000 +0100
>+++ mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,33 +0,0 @@
>---- 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));
>- 
>diff -Naur mysql80-server.orig/files/patch-plugin_x_configure.cmake mysql80-server/files/patch-plugin_x_configure.cmake
>--- mysql80-server.orig/files/patch-plugin_x_configure.cmake	2021-10-07 19:53:23.160724000 +0200
>+++ mysql80-server/files/patch-plugin_x_configure.cmake	2022-08-07 01:11:53.623381000 +0200
>@@ -1,4 +1,4 @@
>---- plugin/x/configure.cmake.orig	2019-09-20 08:30:51 UTC
>+--- plugin/x/configure.cmake.orig	2022-07-06 21:36:34 UTC
> +++ plugin/x/configure.cmake
> @@ -45,6 +45,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
>  CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h
>--- mysql80-server.orig/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h	1970-01-01 01:00:00.000000000 +0100
>+++ mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h	2022-08-07 01:11:53.625191000 +0200
>@@ -0,0 +1,13 @@
>+--- 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;
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h
>--- mysql80-server.orig/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h	2021-10-07 19:53:23.160754000 +0200
>+++ mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h	2022-08-07 01:11:53.627030000 +0200
>@@ -1,4 +1,4 @@
>---- router/src/harness/include/mysql/harness/net_ts/internet.h.orig	2020-11-09 00:30:01 UTC
>+--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig	2022-07-06 21:36:34 UTC
> +++ router/src/harness/include/mysql/harness/net_ts/internet.h
> @@ -43,6 +43,7 @@
>  #include <arpa/inet.h>    // inet_ntop
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h
>--- mysql80-server.orig/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h	2021-10-07 19:53:23.160778000 +0200
>+++ mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,13 +0,0 @@
>---- 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;
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_src_CMakeLists.txt mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
>--- mysql80-server.orig/files/patch-router_src_harness_src_CMakeLists.txt	2022-01-29 07:10:03.040904000 +0100
>+++ mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt	2022-08-07 01:11:53.628862000 +0200
>@@ -1,6 +1,6 @@
>---- router/src/harness/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- router/src/harness/src/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ router/src/harness/src/CMakeLists.txt
>-@@ -212,7 +212,6 @@ ELSE()
>+@@ -213,7 +213,6 @@ ELSE()
>    INSTALL(TARGETS harness-library
>      LIBRARY
>      DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
>@@ -8,7 +8,7 @@
>      )
>  ENDIF()
>  
>-@@ -243,7 +242,6 @@ INSTALL(TARGETS harness_stdx
>+@@ -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
>@@ -16,7 +16,7 @@
>    )
>  
>  ## harness_tls
>-@@ -284,5 +282,4 @@ INSTALL(TARGETS 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
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_src_tls__client__context.cc mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc
>--- mysql80-server.orig/files/patch-router_src_harness_src_tls__client__context.cc	2022-01-29 07:10:03.040941000 +0100
>+++ mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc	2022-08-07 01:11:53.630693000 +0200
>@@ -1,4 +1,4 @@
>---- router/src/harness/src/tls_client_context.cc.orig	2021-12-17 16:07:27 UTC
>+--- router/src/harness/src/tls_client_context.cc.orig	2022-07-06 21:36:34 UTC
> +++ router/src/harness/src/tls_client_context.cc
> @@ -61,7 +61,7 @@ stdx::expected<void, std::error_code> TlsClientContext
>  stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_src_tls__context.cc mysql80-server/files/patch-router_src_harness_src_tls__context.cc
>--- mysql80-server.orig/files/patch-router_src_harness_src_tls__context.cc	2022-01-29 07:10:03.040984000 +0100
>+++ mysql80-server/files/patch-router_src_harness_src_tls__context.cc	2022-08-07 01:11:53.632518000 +0200
>@@ -1,4 +1,4 @@
>---- router/src/harness/src/tls_context.cc.orig	2021-12-17 16:07:27 UTC
>+--- router/src/harness/src/tls_context.cc.orig	2022-07-06 21:36:34 UTC
> +++ router/src/harness/src/tls_context.cc
> @@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) {
>        return TLS1_1_VERSION;
>diff -Naur mysql80-server.orig/files/patch-router_src_harness_src_tls__server__context.cc mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
>--- mysql80-server.orig/files/patch-router_src_harness_src_tls__server__context.cc	2022-01-29 07:10:03.041018000 +0100
>+++ mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- 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
>-     /*
>diff -Naur mysql80-server.orig/files/patch-router_src_http_src_CMakeLists.txt mysql80-server/files/patch-router_src_http_src_CMakeLists.txt
>--- mysql80-server.orig/files/patch-router_src_http_src_CMakeLists.txt	2022-01-29 07:10:03.041056000 +0100
>+++ mysql80-server/files/patch-router_src_http_src_CMakeLists.txt	2022-08-07 01:11:53.634340000 +0200
>@@ -1,4 +1,4 @@
>---- router/src/http/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- router/src/http/src/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ router/src/http/src/CMakeLists.txt
> @@ -58,7 +58,6 @@ INSTALL(TARGETS http_common
>    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
>diff -Naur mysql80-server.orig/files/patch-router_src_io_src_CMakeLists.txt mysql80-server/files/patch-router_src_io_src_CMakeLists.txt
>--- mysql80-server.orig/files/patch-router_src_io_src_CMakeLists.txt	2021-10-07 19:53:23.160939000 +0200
>+++ mysql80-server/files/patch-router_src_io_src_CMakeLists.txt	2022-08-07 01:11:53.636154000 +0200
>@@ -1,4 +1,4 @@
>---- router/src/io/src/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
>+--- router/src/io/src/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ router/src/io/src/CMakeLists.txt
> @@ -47,7 +47,6 @@ INSTALL(TARGETS io_component
>    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
>diff -Naur mysql80-server.orig/files/patch-router_src_router_src_CMakeLists.txt mysql80-server/files/patch-router_src_router_src_CMakeLists.txt
>--- mysql80-server.orig/files/patch-router_src_router_src_CMakeLists.txt	2022-01-29 07:10:03.041092000 +0100
>+++ mysql80-server/files/patch-router_src_router_src_CMakeLists.txt	2022-08-07 01:11:53.637988000 +0200
>@@ -1,6 +1,6 @@
>---- router/src/router/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- router/src/router/src/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ router/src/router/src/CMakeLists.txt
>-@@ -124,7 +124,6 @@ INSTALL(TARGETS router_lib
>+@@ -127,7 +127,6 @@ INSTALL(TARGETS router_lib
>    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
>    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
>    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
>diff -Naur mysql80-server.orig/files/patch-scripts_CMakeLists.txt mysql80-server/files/patch-scripts_CMakeLists.txt
>--- mysql80-server.orig/files/patch-scripts_CMakeLists.txt	2022-01-29 07:10:03.041136000 +0100
>+++ mysql80-server/files/patch-scripts_CMakeLists.txt	2022-08-07 01:11:53.639801000 +0200
>@@ -1,15 +1,15 @@
>---- scripts/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
>+--- scripts/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ scripts/CMakeLists.txt
>-@@ -323,6 +323,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>-         GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
>-         STRING(REGEX REPLACE "^lib" "" lib "${lib}")
>+@@ -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()
>-@@ -396,7 +398,7 @@ ELSE()
>+@@ -405,7 +407,7 @@ ELSE()
>      ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
>      ESCAPE_QUOTES @ONLY)
>  
>@@ -18,7 +18,7 @@
>      MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
>      INSTALL(FILES
>        ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
>-@@ -409,23 +411,28 @@ ELSE()
>+@@ -418,23 +420,28 @@ ELSE()
>    # mysqld_safe used in mtr even for systemd platforms
>    IF(WITH_SYSTEMD)
>      SET(BIN_SCRIPTS
>diff -Naur mysql80-server.orig/files/patch-scripts_mysqld__safe.sh mysql80-server/files/patch-scripts_mysqld__safe.sh
>--- mysql80-server.orig/files/patch-scripts_mysqld__safe.sh	2022-01-29 07:10:03.041164000 +0100
>+++ mysql80-server/files/patch-scripts_mysqld__safe.sh	2022-08-07 01:11:53.641619000 +0200
>@@ -1,4 +1,4 @@
>---- scripts/mysqld_safe.sh.orig	2022-01-23 11:48:36 UTC
>+--- scripts/mysqld_safe.sh.orig	2022-08-06 23:05:01 UTC
> +++ scripts/mysqld_safe.sh
> @@ -360,7 +360,7 @@ mysqld_ld_preload_text() {
>  # running mysqld.  See ld.so for details.
>diff -Naur mysql80-server.orig/files/patch-sql-common_client.cc mysql80-server/files/patch-sql-common_client.cc
>--- mysql80-server.orig/files/patch-sql-common_client.cc	2022-01-29 07:10:03.041205000 +0100
>+++ mysql80-server/files/patch-sql-common_client.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,18 +0,0 @@
>---- 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);
>diff -Naur mysql80-server.orig/files/patch-sql_auth_sha2__password__common.cc mysql80-server/files/patch-sql_auth_sha2__password__common.cc
>--- mysql80-server.orig/files/patch-sql_auth_sha2__password__common.cc	2021-10-07 19:53:23.161038000 +0200
>+++ mysql80-server/files/patch-sql_auth_sha2__password__common.cc	2022-08-07 01:11:53.643442000 +0200
>@@ -1,4 +1,4 @@
>---- sql/auth/sha2_password_common.cc.orig	2019-09-20 08:30:51 UTC
>+--- sql/auth/sha2_password_common.cc.orig	2022-07-06 21:36:34 UTC
> +++ sql/auth/sha2_password_common.cc
> @@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
>      return true;
>diff -Naur mysql80-server.orig/files/patch-sql_conn__handler_socket__connection.cc mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
>--- mysql80-server.orig/files/patch-sql_conn__handler_socket__connection.cc	2022-01-29 07:10:03.041242000 +0100
>+++ mysql80-server/files/patch-sql_conn__handler_socket__connection.cc	2022-08-07 01:11:53.645277000 +0200
>@@ -1,6 +1,6 @@
>---- sql/conn_handler/socket_connection.cc.orig	2021-12-17 16:07:27 UTC
>+--- sql/conn_handler/socket_connection.cc.orig	2022-07-06 21:36:34 UTC
> +++ sql/conn_handler/socket_connection.cc
>-@@ -953,9 +953,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
>+@@ -956,9 +956,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
>    signal(SIGCHLD, SIG_DFL);
>    request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,
>                 mysql_socket_getfd(connect_sock), NULL);
>@@ -14,7 +14,7 @@
>      /*
>        This may be stupid but refuse() includes an exit(0)
>        which we surely don't want...
>-@@ -967,12 +969,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
>+@@ -970,12 +972,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
>        This is unproblematic as TCP-wrapper is unix specific,
>        anyway.
>      */
>diff -Naur mysql80-server.orig/files/patch-sql_mysqld.cc mysql80-server/files/patch-sql_mysqld.cc
>--- mysql80-server.orig/files/patch-sql_mysqld.cc	2022-01-29 07:10:03.041276000 +0100
>+++ mysql80-server/files/patch-sql_mysqld.cc	2022-08-07 01:11:53.647090000 +0200
>@@ -1,6 +1,6 @@
>---- sql/mysqld.cc.orig	2021-12-17 16:07:27 UTC
>+--- sql/mysqld.cc.orig	2022-07-06 21:36:34 UTC
> +++ sql/mysqld.cc
>-@@ -5285,7 +5285,7 @@ static int init_thread_environment() {
>+@@ -5299,7 +5299,7 @@ static int init_thread_environment() {
>  
>  static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
>  
>@@ -9,18 +9,3 @@
>  #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;
>diff -Naur mysql80-server.orig/files/patch-sql_ssl__init__callback.cc mysql80-server/files/patch-sql_ssl__init__callback.cc
>--- mysql80-server.orig/files/patch-sql_ssl__init__callback.cc	2022-01-29 07:10:03.041302000 +0100
>+++ mysql80-server/files/patch-sql_ssl__init__callback.cc	2022-08-07 01:11:53.648915000 +0200
>@@ -1,6 +1,6 @@
>---- sql/ssl_init_callback.cc.orig	2021-12-17 16:07:27 UTC
>+--- sql/ssl_init_callback.cc.orig	2022-07-06 21:36:34 UTC
> +++ sql/ssl_init_callback.cc
>-@@ -106,14 +106,14 @@ static Sys_var_charptr Sys_ssl_capath(
>+@@ -108,14 +108,14 @@ static Sys_var_charptr Sys_ssl_capath(
>  
>  static Sys_var_charptr Sys_tls_version(
>      "tls_version",
>@@ -17,7 +17,7 @@
>      "TLSv1.2,TLSv1.3",
>  #else
>      "TLSv1.2",
>-@@ -175,14 +175,14 @@ static Sys_var_charptr Sys_admin_ssl_capath(
>+@@ -195,14 +195,14 @@ static Sys_var_charptr Sys_admin_ssl_capath(
>  
>  static Sys_var_charptr Sys_admin_tls_version(
>      "admin_tls_version",
>diff -Naur mysql80-server.orig/files/patch-sql_sys__vars.cc mysql80-server/files/patch-sql_sys__vars.cc
>--- mysql80-server.orig/files/patch-sql_sys__vars.cc	2022-01-29 07:10:03.041363000 +0100
>+++ mysql80-server/files/patch-sql_sys__vars.cc	2022-08-07 01:11:53.650739000 +0200
>@@ -1,6 +1,6 @@
>---- sql/sys_vars.cc.orig	2021-12-17 16:07:27 UTC
>+--- sql/sys_vars.cc.orig	2022-07-06 21:36:34 UTC
> +++ sql/sys_vars.cc
>-@@ -1977,7 +1977,7 @@ static Sys_var_ulong Sys_connect_timeout(
>+@@ -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),
>@@ -9,7 +9,7 @@
>  
>  static Sys_var_ulong Sys_information_schema_stats_expiry(
>      "information_schema_stats_expiry",
>-@@ -3093,7 +3093,7 @@ static Sys_var_ulong Sys_net_read_timeout(
>+@@ -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),
>@@ -18,7 +18,7 @@
>      NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
>      ON_UPDATE(fix_net_read_timeout));
>  
>-@@ -3114,7 +3114,7 @@ static Sys_var_ulong Sys_net_write_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),
>@@ -27,44 +27,3 @@
>      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",
>diff -Naur mysql80-server.orig/files/patch-storage_innobase_include_srv0mon.h mysql80-server/files/patch-storage_innobase_include_srv0mon.h
>--- mysql80-server.orig/files/patch-storage_innobase_include_srv0mon.h	2021-10-07 19:53:23.161178000 +0200
>+++ mysql80-server/files/patch-storage_innobase_include_srv0mon.h	2022-08-07 01:11:53.652571000 +0200
>@@ -1,4 +1,4 @@
>---- storage/innobase/include/srv0mon.h.orig	2019-09-20 08:30:51 UTC
>+--- storage/innobase/include/srv0mon.h.orig	2022-07-06 21:36:34 UTC
> +++ storage/innobase/include/srv0mon.h
> @@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>  /* Required for FreeBSD so that INT64_MAX is defined. */
>diff -Naur mysql80-server.orig/files/patch-storage_innobase_ut_crc32.cc mysql80-server/files/patch-storage_innobase_ut_crc32.cc
>--- mysql80-server.orig/files/patch-storage_innobase_ut_crc32.cc	2022-02-28 07:10:02.015217000 +0100
>+++ mysql80-server/files/patch-storage_innobase_ut_crc32.cc	2022-08-07 01:11:53.654379000 +0200
>@@ -1,4 +1,4 @@
>---- storage/innobase/ut/crc32.cc.orig	2021-12-17 17:07:27 UTC
>+--- storage/innobase/ut/crc32.cc.orig	2022-07-06 21:36:34 UTC
> +++ storage/innobase/ut/crc32.cc
> @@ -111,7 +111,9 @@ external tools. */
>  #endif /* CRC32_ARM64 */
>diff -Naur mysql80-server.orig/files/patch-storage_myisam_mi__dynrec.cc mysql80-server/files/patch-storage_myisam_mi__dynrec.cc
>--- mysql80-server.orig/files/patch-storage_myisam_mi__dynrec.cc	2021-10-07 19:53:23.161207000 +0200
>+++ mysql80-server/files/patch-storage_myisam_mi__dynrec.cc	2022-08-07 01:11:53.656213000 +0200
>@@ -1,4 +1,4 @@
>---- storage/myisam/mi_dynrec.cc.orig	2019-09-20 08:30:51 UTC
>+--- storage/myisam/mi_dynrec.cc.orig	2022-07-06 21:36:34 UTC
> +++ storage/myisam/mi_dynrec.cc
> @@ -85,17 +85,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
>      return true;
>diff -Naur mysql80-server.orig/files/patch-storage_temptable_include_temptable_lock__free__type.h mysql80-server/files/patch-storage_temptable_include_temptable_lock__free__type.h
>--- mysql80-server.orig/files/patch-storage_temptable_include_temptable_lock__free__type.h	1970-01-01 01:00:00.000000000 +0100
>+++ mysql80-server/files/patch-storage_temptable_include_temptable_lock__free__type.h	2022-08-07 01:11:53.658031000 +0200
>@@ -0,0 +1,17 @@
>+--- 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
>diff -Naur mysql80-server.orig/files/patch-storage_temptable_include_temptable_lock_free_type.h mysql80-server/files/patch-storage_temptable_include_temptable_lock_free_type.h
>--- mysql80-server.orig/files/patch-storage_temptable_include_temptable_lock_free_type.h	2021-10-07 19:53:23.161232000 +0200
>+++ mysql80-server/files/patch-storage_temptable_include_temptable_lock_free_type.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,17 +0,0 @@
>---- 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. */
>diff -Naur mysql80-server.orig/files/patch-support-files_CMakeLists.txt mysql80-server/files/patch-support-files_CMakeLists.txt
>--- mysql80-server.orig/files/patch-support-files_CMakeLists.txt	2021-10-07 19:53:23.161257000 +0200
>+++ mysql80-server/files/patch-support-files_CMakeLists.txt	2022-08-07 01:11:53.659857000 +0200
>@@ -1,4 +1,4 @@
>---- support-files/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
>+--- support-files/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ support-files/CMakeLists.txt
> @@ -24,8 +24,9 @@ IF(NOT UNIX)
>    RETURN()
>diff -Naur mysql80-server.orig/files/patch-utilities_CMakeLists.txt mysql80-server/files/patch-utilities_CMakeLists.txt
>--- mysql80-server.orig/files/patch-utilities_CMakeLists.txt	2021-10-07 19:53:23.161290000 +0200
>+++ mysql80-server/files/patch-utilities_CMakeLists.txt	2022-08-07 01:11:53.661674000 +0200
>@@ -1,4 +1,4 @@
>---- utilities/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
>+--- utilities/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
> +++ utilities/CMakeLists.txt
> @@ -23,13 +23,19 @@
>  ADD_WSHADOW_WARNING()
>diff -Naur mysql80-server.orig/files/patch-vio_viossl.cc mysql80-server/files/patch-vio_viossl.cc
>--- mysql80-server.orig/files/patch-vio_viossl.cc	2022-01-29 07:10:03.041436000 +0100
>+++ mysql80-server/files/patch-vio_viossl.cc	2022-08-07 01:11:53.663505000 +0200
>@@ -1,4 +1,4 @@
>---- vio/viossl.cc.orig	2021-12-17 16:07:27 UTC
>+--- vio/viossl.cc.orig	2022-07-06 21:36:34 UTC
> +++ vio/viossl.cc
> @@ -45,7 +45,8 @@
>    BIO_set_callback_ex was added in openSSL 1.1.1
>@@ -10,7 +10,7 @@
>  #define HAVE_BIO_SET_CALLBACK_EX
>  #endif
>  
>-@@ -640,7 +641,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
>+@@ -692,7 +693,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
>  #if !defined(NDEBUG)
>      {
>        STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
>@@ -19,7 +19,7 @@
>        n = sk_SSL_COMP_num(ssl_comp_methods);
>        DBUG_PRINT("info", ("Available compression methods:\n"));
>        if (n == 0)
>-@@ -648,7 +649,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
>+@@ -700,7 +701,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
>        else
>          for (j = 0; j < n; j++) {
>            SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
>diff -Naur mysql80-server.orig/files/patch-vio_viosslfactories.cc mysql80-server/files/patch-vio_viosslfactories.cc
>--- mysql80-server.orig/files/patch-vio_viosslfactories.cc	2022-03-06 07:10:01.978385000 +0100
>+++ mysql80-server/files/patch-vio_viosslfactories.cc	2022-08-07 01:11:53.665332000 +0200
>@@ -1,5 +1,5 @@
>---- vio/viosslfactories.cc.orig	2021-12-17 08:07:27.000000000 -0800
>-+++ vio/viosslfactories.cc	2022-02-20 11:48:11.223957000 -0800
>+--- vio/viosslfactories.cc.orig	2022-07-06 21:36:34 UTC
>++++ vio/viosslfactories.cc
> @@ -40,6 +40,7 @@
>  #include "vio/vio_priv.h"
>  
>@@ -8,40 +8,7 @@
>  
>  #if OPENSSL_VERSION_NUMBER < 0x10002000L
>  #include <openssl/ec.h>
>-@@ -472,6 +473,7 @@
>-   }
>- }
>- 
>-+#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) {
>+@@ -484,7 +485,7 @@ long process_tls_version(const char *tls_version) {
>    const char *separator = ",";
>    char *token, *lasts = nullptr;
>  
>@@ -50,7 +17,7 @@
>    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};
>-@@ -623,7 +630,7 @@
>+@@ -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
>@@ -59,7 +26,7 @@
>                       | SSL_OP_NO_TLSv1_3
>  #endif /* HAVE_TLSv13 */
>                       | SSL_OP_NO_TICKET);
>-@@ -632,7 +639,7 @@
>+@@ -568,7 +569,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
>      return nullptr;
>  
>    if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
>@@ -68,7 +35,7 @@
>                                                      TLS_client_method()
>                                                      : TLS_server_method()
>  #else  /* HAVE_TLSv13 */
>-@@ -647,7 +654,7 @@
>+@@ -583,7 +584,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
>      return nullptr;
>    }
>

Actions: View | Diff

Attachments on bug 265468: 235509 | 235780 | 235844