Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Jan 2019 18:36:14 +0000 (UTC)
From:      Mahdi Mokhtari <mmokhi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491308 - in head/databases: mysql80-client mysql80-client/files mysql80-server mysql80-server/files
Message-ID:  <201901261836.x0QIaEAX014562@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mmokhi
Date: Sat Jan 26 18:36:14 2019
New Revision: 491308
URL: https://svnweb.freebsd.org/changeset/ports/491308

Log:
  databases/mysql80-{client, server}: Update to latest release 8.0.14
  This update (released on Jan 21st) includes:
  Bugs Fixed:
    Important Change: Fix importing a dump from a MySQL 5.7 server 8.0 failure.
      (ER_WRONG_VALUE_FOR_VAR, when an unsupported [by 8.0] SQL mode was used).
      The behavior of the server in such circumstances now depends on the setting of the
      `pseudo_slave_mode` system variable.
      If this is false, the server rejects the mode setting with ER_UNSUPPORTED_SQL_MODE.
      Otherwise, server just gives a warning. (Bug #90337, Bug #27828236).
  
    InnoDB: Properly initialize the static thread-local 'tables' variable in
      the TempTable storage engine (on Solaris X86) was not properly initialized.
      (Bug #28987365)
  
    InnoDB: Fix incorrect lock order caused a deadlock when one thread attempted to
      drop a table while another created an encrypted tablespace. (Bug #28774259)
  
  More info from upstream:
    https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-14.html
  
  While here, Adapt some local patches with new upstream changes.
  
  PR:		234984
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/databases/mysql80-client/Makefile
  head/databases/mysql80-client/files/patch-CMakeLists.txt
  head/databases/mysql80-client/files/patch-man_CMakeLists.txt
  head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
  head/databases/mysql80-server/Makefile
  head/databases/mysql80-server/distinfo
  head/databases/mysql80-server/files/patch-CMakeLists.txt
  head/databases/mysql80-server/files/patch-client_CMakeLists.txt
  head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
  head/databases/mysql80-server/files/patch-man_CMakeLists.txt
  head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
  head/databases/mysql80-server/pkg-plist

Modified: head/databases/mysql80-client/Makefile
==============================================================================
--- head/databases/mysql80-client/Makefile	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-client/Makefile	Sat Jan 26 18:36:14 2019	(r491308)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)

Modified: head/databases/mysql80-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mysql80-client/files/patch-CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-client/files/patch-CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-05-03 10:27:45 UTC
+--- CMakeLists.txt.orig	2019-01-21 18:42:44 UTC
 +++ CMakeLists.txt
-@@ -835,6 +835,7 @@ ADD_SUBDIRECTORY(extra/regex)
+@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex)
  ADD_SUBDIRECTORY(libmysql)
  ADD_SUBDIRECTORY(libbinlogevents)
  ADD_SUBDIRECTORY(libbinlogstandalone)
@@ -8,13 +8,16 @@
  
  IF(NOT WITHOUT_SERVER)
    SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
-@@ -966,12 +964,10 @@ ENDIF() 
+@@ -1146,12 +1147,13 @@ ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
  ADD_SUBDIRECTORY(packaging/solaris)
  
 -IF(UNIX)
 -  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
 -ENDIF()
++#IF(UNIX)
++#  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
++#ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -22,11 +25,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
    INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
-@@ -990,6 +986,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "README.build" EXCLUDE
    )
  ENDIF()
 +ENDIF()
  
- IF(UNIX)
-   EXECUTE_PROCESS(
+ # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
+ # we can safely enable ASan on Clang/Win32 if needed.

Modified: head/databases/mysql80-client/files/patch-man_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-client/files/patch-man_CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-client/files/patch-man_CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,13 +1,12 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- man/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
 +++ man/CMakeLists.txt
-@@ -15,10 +15,6 @@
+@@ -22,9 +22,6 @@
  
  # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+ FILE(GLOB MAN1 *.1)
 -FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
+-FILE(GLOB MAN8 *.8)
 -FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
+ IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
+   LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
+ ENDIF()

Modified: head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,29 +1,24 @@
---- utilities/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- utilities/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
 +++ utilities/CMakeLists.txt
-@@ -45,6 +45,7 @@ ENDIF()
+@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR
  
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
                     ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys
 +                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/
                     COMMAND comp_err
                      --charset=${PROJECT_SOURCE_DIR}/share/charsets
                      --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
-@@ -73,4 +74,5 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
+@@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_
+   ADD_DEPENDENCIES(comp_err copy_openssl_dlls)
  ENDIF()
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
-@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
+@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+   ADD_DEPENDENCIES(ibd2sdi GenError)
  
-+IF(FALSE)
- IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
  ENDIF()
 +ENDIF()
  

Modified: head/databases/mysql80-server/Makefile
==============================================================================
--- head/databases/mysql80-server/Makefile	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/Makefile	Sat Jan 26 18:36:14 2019	(r491308)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.13
+PORTVERSION=		8.0.14
 PORTREVISION?=		0
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0

Modified: head/databases/mysql80-server/distinfo
==============================================================================
--- head/databases/mysql80-server/distinfo	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/distinfo	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541000462
-SHA256 (mysql-boost-8.0.13.tar.gz) = 61f97906050c2a0cc008be347f70c2c6612425c85342466f549088c570b35ff4
-SIZE (mysql-boost-8.0.13.tar.gz) = 106396721
+TIMESTAMP = 1548095897
+SHA256 (mysql-boost-8.0.14.tar.gz) = afc608989a120c204524dcf107af23a41b3665e900fd0f17080705bbf2c13de0
+SIZE (mysql-boost-8.0.14.tar.gz) = 117084893

Modified: head/databases/mysql80-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/files/patch-CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-05-07 12:26:59 UTC
+--- CMakeLists.txt.orig	2019-01-21 19:00:53 UTC
 +++ CMakeLists.txt
-@@ -870,7 +870,6 @@ IF(UNIX)
+@@ -1045,7 +1045,6 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -8,7 +8,7 @@
    ADD_SUBDIRECTORY(sql)
  ENDIF()
  
-@@ -879,8 +878,6 @@ ENDIF()
+@@ -1054,8 +1053,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -17,7 +17,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -972,6 +969,7 @@ ENDIF()
+@@ -1152,6 +1149,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -25,11 +25,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
    INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
-@@ -990,6 +988,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -1170,6 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "README.build" EXCLUDE
    )
  ENDIF()
 +ENDIF()
  
- IF(UNIX)
-   EXECUTE_PROCESS(
+ # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
+ # we can safely enable ASan on Clang/Win32 if needed.

Modified: head/databases/mysql80-server/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-client_CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,16 +1,12 @@
---- client/CMakeLists.txt.orig	2016-08-25 12:32:09 UTC
+--- client/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
 +++ client/CMakeLists.txt
-@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+@@ -28,16 +28,16 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
 -## Subdirectory for mysqlpump code.
 -ADD_SUBDIRECTORY(dump)
  
- ## We will need libeay32.dll and ssleay32.dll when running client executables.
- COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
- 
  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
 +IF(FALSE)
@@ -22,8 +18,8 @@
 +ENDIF()
  
  IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -66,6 +66,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
+   MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
+@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
@@ -31,7 +27,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -78,7 +79,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -41,7 +37,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  SET(MYSQLBINLOG_LIB_SOURCES
    ${CMAKE_SOURCE_DIR}/strings/decimal.cc
-@@ -112,13 +115,16 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -110,16 +113,20 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -53,7 +49,11 @@
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
  TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
- SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
++
+ # Bug in /usr/lib/gcc-snapshot/lib/libstdc++.so ??
+ IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "9.0.0")
+   TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup -static-libstdc++)
+ ENDIF()
 +ENDIF()
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".

Modified: head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,25 +1,27 @@
---- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- libmysql/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
 +++ libmysql/CMakeLists.txt
-@@ -215,7 +215,7 @@ IF(WIN32)
+@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica
  ADD_SUBDIRECTORY(authentication_ldap)
- 
+   
  # Merge several convenience libraries into one big mysqlclient
 -MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
 +MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
+ TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
  
- IF(MSVC)
-@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED)
+ # Visual Studio users need debug  static library for debug projects
+@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED)
    # and link them together into shared library.
    MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
      EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
 -    COMPONENT SharedLibraries)
 +    COMPONENT SharedLibraries SKIP_INSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
+   TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
  
 +IF(FALSE)
    IF(WIN32)
-@@ -313,6 +314,7 @@ ENDIF()
+     # So that libmysql_api_test below can find the .dll
+     ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
+@@ -338,6 +339,7 @@ ENDIF()
  # to initialize api_calls[] array in api_test.c
  #
  SET(CLIENT_API_FUNCTION_LIST "")

Modified: head/databases/mysql80-server/files/patch-man_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-man_CMakeLists.txt	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/files/patch-man_CMakeLists.txt	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,11 +1,10 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- man/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
 +++ man/CMakeLists.txt
-@@ -15,8 +15,6 @@
+@@ -22,7 +22,6 @@
  
  # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+ FILE(GLOB MAN1 *.1)
 -FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
+ FILE(GLOB MAN8 *.8)
  FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
+ IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)

Modified: head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
==============================================================================
--- head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc	Sat Jan 26 18:36:14 2019	(r491308)
@@ -1,31 +1,32 @@
---- sql/conn_handler/socket_connection.cc.orig	2018-04-08 06:44:49 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2019-01-21 20:10:03 UTC
 +++ sql/conn_handler/socket_connection.cc
-@@ -810,20 +810,24 @@ Channel_info *Mysqld_socket_listener::li
-     signal(SIGCHLD, SIG_DFL);
-     request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
-                  mysql_socket_getfd(connect_sock), NULL);
--    fromhost(&req);
-+    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
-+    my_fromhost(&req);
+@@ -873,9 +873,11 @@ bool check_connection_refused_by_tcp_wra
+   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...
-         clean_exit() - same stupid thing ...
-       */
-+      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
-       syslog(LOG_AUTH | m_deny_severity, "refused connect from %s",
--             eval_client(&req));
-+             my_eval_client(&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...
+@@ -887,12 +889,13 @@ bool check_connection_refused_by_tcp_wra
+       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);
-+
+     // 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);
+     // Some distros have not patched tcpd.h
+     if (req.sink) ((void (*)(int))req.sink)(req.fd);

Modified: head/databases/mysql80-server/pkg-plist
==============================================================================
--- head/databases/mysql80-server/pkg-plist	Sat Jan 26 18:12:23 2019	(r491307)
+++ head/databases/mysql80-server/pkg-plist	Sat Jan 26 18:36:14 2019	(r491308)
@@ -18,8 +18,6 @@ bin/mysqlrouter_plugin_info
 bin/mysqltest
 bin/mysqlxtest
 bin/perror
-bin/resolve_stack_dump
-bin/resolveip
 bin/zlib_decompress
 lib/mysql/libmysqlharness.a
 lib/mysql/libmysqlharness.so
@@ -34,6 +32,7 @@ lib/mysql/mysqlrouter/syslog.so
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/component_audit_api_message_emit.so
 lib/mysql/plugin/component_example_component1.so
 lib/mysql/plugin/component_example_component2.so
 lib/mysql/plugin/component_example_component3.so
@@ -44,7 +43,9 @@ lib/mysql/plugin/component_log_sink_test.so
 lib/mysql/plugin/component_mysqlx_global_reset.so
 lib/mysql/plugin/component_pfs_example.so
 lib/mysql/plugin/component_pfs_example_component_population.so
+lib/mysql/plugin/component_test_audit_api_message.so
 lib/mysql/plugin/component_test_backup_lock_service.so
+lib/mysql/plugin/component_test_host_application_signal.so
 lib/mysql/plugin/component_test_pfs_notification.so
 lib/mysql/plugin/component_test_pfs_resource_group.so
 lib/mysql/plugin/component_test_status_var_service.so
@@ -114,6 +115,7 @@ lib/mysql/plugin/rewriter.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/test_security_context.so
+lib/mysql/plugin/test_services_host_application_signal.so
 lib/mysql/plugin/test_services_plugin_registry.so
 lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/keyring_udf.so
@@ -136,8 +138,6 @@ man/man1/mysqld_safe.1.gz
 man/man1/mysqldumpslow.1.gz
 man/man1/mysqlman.1.gz
 man/man1/perror.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901261836.x0QIaEAX014562>