mirror of
https://git.freebsd.org/ports.git
synced 2025-05-18 01:53:13 -04:00
342c784ae3
switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH
32 lines
1.3 KiB
C++
32 lines
1.3 KiB
C++
--- sql/conn_handler/socket_connection.cc.orig 2019-09-20 08:30:51 UTC
|
|
+++ sql/conn_handler/socket_connection.cc
|
|
@@ -950,9 +950,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);
|
|
- fromhost(&req);
|
|
+ void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
|
|
+ my_fromhost(&req);
|
|
|
|
- if (!hosts_access(&req)) {
|
|
+ int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
|
|
+ if (!my_hosts_access(&req)) {
|
|
/*
|
|
This may be stupid but refuse() includes an exit(0)
|
|
which we surely don't want...
|
|
@@ -964,12 +966,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
|
|
This is unproblematic as TCP-wrapper is unix specific,
|
|
anyway.
|
|
*/
|
|
+ char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
|
|
syslog(LOG_AUTH | LOG_WARNING, "refused connect from %s",
|
|
- eval_client(&req));
|
|
+ my_eval_client(&req));
|
|
|
|
#ifdef HAVE_LIBWRAP_PROTOTYPES
|
|
// Some distros have patched tcpd.h to have proper prototypes
|
|
- if (req.sink) (req.sink)(req.fd);
|
|
+ if (req.sink) ((void (*)(int)) (req.sink))(req.fd);
|
|
#else
|
|
// Some distros have not patched tcpd.h
|
|
if (req.sink) ((void (*)(int))req.sink)(req.fd);
|