svn commit: r522436 - in head/databases: mysql80-client mysql80-client/files mysql80-server mysql80-server/files
Jochen Neumeister
joneum at FreeBSD.org
Wed Jan 8 16:47:18 UTC 2020
Author: joneum
Date: Wed Jan 8 16:47:12 2020
New Revision: 522436
URL: https://svnweb.freebsd.org/changeset/ports/522436
Log:
databases/mysql80-{client, server}: Update to latest release 8.0.18
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
Added:
head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake (contents, props changed)
head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (contents, props changed)
head/databases/mysql80-server/files/patch-extra_libedit_chartype.h (contents, props changed)
head/databases/mysql80-server/files/patch-extra_libedit_vi.c (contents, props changed)
head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h (contents, props changed)
head/databases/mysql80-server/files/patch-include_violite.h (contents, props changed)
head/databases/mysql80-server/files/patch-mysys_my__default.cc (contents, props changed)
head/databases/mysql80-server/files/patch-mysys_my__md5.cc (contents, props changed)
head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c (contents, props changed)
head/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc (contents, props changed)
head/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc (contents, props changed)
head/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc (contents, props changed)
head/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc (contents, props changed)
head/databases/mysql80-server/files/patch-utilities_CMakeLists.txt (contents, props changed)
head/databases/mysql80-server/files/patch-vio_viossl.cc (contents, props changed)
Deleted:
head/databases/mysql80-client/files/
head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h
head/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c
head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc
head/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc
Modified:
head/databases/mysql80-client/Makefile
head/databases/mysql80-client/pkg-plist
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-cmake_plugin.cmake
head/databases/mysql80-server/files/patch-cmake_ssl.cmake
head/databases/mysql80-server/files/patch-include_CMakeLists.txt
head/databases/mysql80-server/files/patch-include_my__compare.h
head/databases/mysql80-server/files/patch-include_my__thread__os__id.h
head/databases/mysql80-server/files/patch-include_myisam.h
head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt
head/databases/mysql80-server/files/patch-man_CMakeLists.txt
head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
head/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc
head/databases/mysql80-server/files/patch-plugin_x_configure.cmake
head/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
head/databases/mysql80-server/files/patch-sql-common_client.cc
head/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc
head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
head/databases/mysql80-server/files/patch-sql_mysqld.cc
head/databases/mysql80-server/files/patch-sql_sys__vars.cc
head/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h
head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc
head/databases/mysql80-server/files/patch-support-files_CMakeLists.txt
head/databases/mysql80-server/files/patch-vio_viosslfactories.cc
head/databases/mysql80-server/pkg-plist
Modified: head/databases/mysql80-client/Makefile
==============================================================================
--- head/databases/mysql80-client/Makefile Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-client/Makefile Wed Jan 8 16:47:12 2020 (r522436)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client)
@@ -12,7 +12,7 @@ LICENSE+= LGPL21
MASTERDIR= ${.CURDIR}/../mysql80-server
PKGMESSAGE= ${.CURDIR}/pkg-message
-PATCHDIR= ${.CURDIR}/files
+PATCHDIR= ${MASTERDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql8[1-9]-client-* \
@@ -24,11 +24,21 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILES
USE_LDCONFIG+= ${PREFIX}/lib/mysql
-MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
- mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
- mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
+ mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
+ mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
CLIENT_ONLY= yes
+
+OPTIONS_GROUP+= PLUGINS
+PLUGINS_DESC= Default Client Plugins
+OPTIONS_GROUP_PLUGINS= SASLCLIENT
+SASLCLIENT_DESC= SASL client plugin module
+SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
+SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
+SASLCLIENT_USE= OPENLDAP=yes
+OPTIONS_DEFAULT+= SASLCLIENT
+OPTIONS_SUB= yes
# issue 166367: adding symlinks for back-compatibility with ${lib}_r
post-install:
Modified: head/databases/mysql80-client/pkg-plist
==============================================================================
--- head/databases/mysql80-client/pkg-plist Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-client/pkg-plist Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,7 +1,7 @@
+bin/my_print_defaults
bin/mysql
bin/mysql_config
bin/mysql_config_editor
-bin/mysql_ssl_rsa_setup
bin/mysqladmin
bin/mysqlbinlog
bin/mysqlcheck
@@ -10,6 +10,8 @@ bin/mysqlimport
bin/mysqlpump
bin/mysqlshow
bin/mysqlslap
+bin/perror
+bin/zlib_decompress
include/mysql/base64.h
include/mysql/big_endian.h
include/mysql/c_string_less.h
@@ -41,6 +43,7 @@ include/mysql/my_check_opt.h
include/mysql/my_command.h
include/mysql/my_compare.h
include/mysql/my_compiler.h
+include/mysql/my_compress.h
include/mysql/my_dbug.h
include/mysql/my_default.h
include/mysql/my_dir.h
@@ -181,8 +184,10 @@ lib/mysql/libmysqlclient.so.21
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.21
+%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
libdata/pkgconfig/mysqlclient.pc
man/man1/comp_err.1.gz
+man/man1/lz4_decompress.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
man/man1/mysql_config_editor.1.gz
@@ -191,6 +196,10 @@ man/man1/mysqlbinlog.1.gz
man/man1/mysqlcheck.1.gz
man/man1/mysqldump.1.gz
man/man1/mysqlimport.1.gz
+man/man1/mysqlman.1.gz
+man/man1/mysqlpump.1.gz
man/man1/mysqlshow.1.gz
man/man1/mysqlslap.1.gz
+man/man1/perror.1.gz
+man/man1/zlib_decompress.1.gz
share/aclocal/mysql.m4
Modified: head/databases/mysql80-server/Makefile
==============================================================================
--- head/databases/mysql80-server/Makefile Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/Makefile Wed Jan 8 16:47:12 2020 (r522436)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 8.0.17
-PORTREVISION?= 2
+PORTVERSION= 8.0.18
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVER
SLAVEDIRS= databases/mysql80-client
USES= bison:build cmake:noninja compiler:c++14-lang cpe \
- libedit localbase perl5 pkgconfig shebangfix ssl
+ libedit localbase ncurses perl5 pkgconfig shebangfix ssl
USE_PERL5= run
@@ -26,10 +26,11 @@ MY_DBDIR= /var/db/mysql
MY_SECDIR= /var/db/mysql_secure
MY_TMPDIR= /var/db/mysql_tmpdir
-LIB_DEPENDS+= libevent.so:devel/libevent \
+LIB_DEPENDS+= libcurl.so:ftp/curl \
+ libevent.so:devel/libevent \
libicutu.so:devel/icu \
liblz4.so:archivers/liblz4 \
- libre2.so:devel/re2 \
+ libzstd.so:archivers/zstd \
libprotobuf.so:devel/protobuf \
libunwind.so:devel/libunwind
@@ -51,7 +52,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
- -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
+ -DINSTALL_MYSQLTESTDIR="" \
-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-DINSTALL_SBINDIR="libexec" \
-DINSTALL_SCRIPTDIR="bin" \
@@ -65,11 +66,13 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
-DWITH_LIBEVENT=system \
-DWITH_LZ4=system \
-DWITH_ICU=system \
- -DWITH_RE2=system \
+ -DWITH_CURL=system \
+ -DWITH_ZLIB=system \
+ -DWITH_ZSTD=system \
-DWITH_PROTOBUF=system \
+ -DWITH_SSL=${OPENSSLBASE} \
-DBUILD_BUNDLED_ZLIB=0 \
-DBUILD_BUNDLED_LZ4=0 \
- -DINSTALL_MYSQLTESTDIR=0
SHEBANG_FILES= scripts/*.pl* scripts/*.sh
@@ -105,14 +108,14 @@ GROUPS= mysql
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
- mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
- mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
- mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
- mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
- mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
+MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
+ myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
+ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
+ mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1
+MMAN8= mysqld.8
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
+CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON"
OPTIONS_GROUP= STORAGE
OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
@@ -156,17 +159,8 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
.include <bsd.port.pre.mk>
-.if ${SSL_DEFAULT} == base
-CMAKE_ARGS+= -DWITH_SSL=system
-.else
-CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
-.endif
-
post-extract:
@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
-
-post-patch:
- @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
.if !defined(CLIENT_ONLY)
post-install:
Modified: head/databases/mysql80-server/distinfo
==============================================================================
--- head/databases/mysql80-server/distinfo Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/distinfo Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565048626
-SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a
-SIZE (mysql-boost-8.0.17.tar.gz) = 189322239
+TIMESTAMP = 1578004259
+SHA256 (mysql-boost-8.0.18.tar.gz) = 0eccd9d79c04ba0ca661136bb29085e3833d9c48ed022d0b9aba12236994186b
+SIZE (mysql-boost-8.0.18.tar.gz) = 194953221
Modified: head/databases/mysql80-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-CMakeLists.txt Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-CMakeLists.txt Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,35 +1,76 @@
---- CMakeLists.txt.orig 2019-01-21 19:00:53 UTC
+--- CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ CMakeLists.txt
-@@ -1045,7 +1045,6 @@ IF(UNIX)
+@@ -1181,10 +1181,10 @@ ENDIF()
+ MYSQL_CHECK_SSL()
+ MYSQL_CHECK_SSL_DLLS()
+
+-# Add system/bundled editline.
+-MYSQL_CHECK_EDITLINE()
+ # Add libevent
+-MYSQL_CHECK_LIBEVENT()
++IF(NOT WITHOUT_SERVER)
++ MYSQL_CHECK_LIBEVENT()
++ENDIF()
+ # Add lz4 library
+ MYSQL_CHECK_LZ4()
+ # Add icu library
+@@ -1273,7 +1273,9 @@ IF(WITH_UNIT_TESTS)
+ INCLUDE(googletest)
ENDIF()
+-ADD_SUBDIRECTORY(include)
++IF(NOT WITHOUT_CLIENTLIBS)
++ ADD_SUBDIRECTORY(include)
++ENDIF(NOT WITHOUT_CLIENTLIBS)
+ ADD_SUBDIRECTORY(strings)
+ ADD_SUBDIRECTORY(vio)
+ ADD_SUBDIRECTORY(mysys)
+@@ -1314,24 +1316,29 @@ IF(WITH_UNIT_TESTS)
+ ADD_SUBDIRECTORY(unittest/mytap/t)
+ ENDIF()
+
+-ADD_SUBDIRECTORY(client)
++IF(NOT WITHOUT_TOOLS)
++ # Add system/bundled editline
++ MYSQL_CHECK_EDITLINE()
++ ADD_SUBDIRECTORY(client)
++ENDIF(NOT WITHOUT_TOOLS)
++
+ ADD_SUBDIRECTORY(utilities)
+-ADD_SUBDIRECTORY(share)
+ ADD_SUBDIRECTORY(libservices)
+
IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(testclients)
+ ADD_SUBDIRECTORY(testclients)
++ ADD_SUBDIRECTORY(share)
ADD_SUBDIRECTORY(sql)
ENDIF()
-@@ -1054,8 +1053,6 @@ 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)
++ADD_SUBDIRECTORY(support-files)
IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(mysql-test)
-- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
- ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(mysql-test)
+ ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+- ADD_SUBDIRECTORY(support-files)
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
-@@ -1152,6 +1149,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
+ ENDIF()
+@@ -1440,6 +1447,7 @@ IF(PACK_SEPARATE_COMPONENTS)
+ SET(CPACK_COMPONENTS_GROUPING IGNORE)
+ ENDIF()
+
+IF(FALSE)
- 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})
-@@ -1170,6 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ IF(UNIX)
+ INSTALL(FILES
+ Docs/mysql.info
+@@ -1474,6 +1482,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "sp-imp-spec.txt" EXCLUDE
PATTERN "README.build" EXCLUDE
)
- ENDIF()
+ENDIF()
+ ENDIF()
# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
- # we can safely enable ASan on Clang/Win32 if needed.
Modified: head/databases/mysql80-server/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-client_CMakeLists.txt Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,52 +1,75 @@
---- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
+--- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ client/CMakeLists.txt
-@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
-
+@@ -23,8 +23,11 @@
## Subdirectory with common client code.
ADD_SUBDIRECTORY(base)
--## Subdirectory for mysqlpump code.
--ADD_SUBDIRECTORY(dump)
+ ## Subdirectory for mysqlpump code.
++IF(WITHOUT_SERVER)
+ ADD_SUBDIRECTORY(dump)
++ENDIF()
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
++IF(NOT WITHOUT_CLIENTLIBS)
+ MYSQL_ADD_EXECUTABLE(mysql
+ ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
+ completion_hash.cc
+@@ -33,6 +36,7 @@ MYSQL_ADD_EXECUTABLE(mysql
+ readline.cc
+ LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
+ )
+ENDIF()
IF(NOT WITHOUT_SERVER)
- 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)
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade
+@@ -48,6 +52,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL "
+ )
+ ENDIF()
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
-
-@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
-
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
++IF(NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysqltest
+ mysqltest.cc
+ mysqltest/error_names.cc
+@@ -63,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
+ ENABLE_EXPORTS
+ LINK_LIBRARIES mysqlclient
+ )
+ENDIF()
++
++IF(WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysqlcheck
+ check/mysqlcheck.cc
+ check/mysqlcheck_core.cc
+@@ -80,6 +88,7 @@ MYSQL_ADD_EXECUTABLE(mysqlshow
+ mysqlshow.cc
+ LINK_LIBRARIES mysqlclient
+ )
++
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog
+ mysqlbinlog.cc
+ ${CMAKE_SOURCE_DIR}/sql/json_binary.cc
+@@ -104,7 +113,9 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- SET(MYSQLBINLOG_LIB_SOURCES
- ${CMAKE_SOURCE_DIR}/strings/decimal.cc
-@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
-
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
+ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
+ENDIF()
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys)
++IF(WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysqladmin
+ mysqladmin.cc
+ LINK_LIBRARIES mysqlclient
+@@ -117,6 +128,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
+ mysql_config_editor.cc
+ LINK_LIBRARIES mysqlclient
+ )
++ENDIF()
++
++IF(NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysql_secure_installation
+ mysql_secure_installation.cc
+ LINK_LIBRARIES mysqlclient
+@@ -127,6 +141,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
+ path.cc
+ LINK_LIBRARIES mysys
+ )
+ENDIF()
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
Added: head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake Wed Jan 8 16:47:12 2020 (r522436)
@@ -0,0 +1,27 @@
+--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC
++++ cmake/os/DragonFly.cmake
+@@ -0,0 +1,24 @@
++INCLUDE(CheckCSourceRuns)
++
++# We require at least GCC 4.4 or Clang 3.3.
++IF(NOT FORCE_UNSUPPORTED_COMPILER)
++ IF(CMAKE_COMPILER_IS_GNUCC)
++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++ OUTPUT_VARIABLE GCC_VERSION)
++ IF(GCC_VERSION VERSION_LESS 4.4)
++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++ ENDIF()
++ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
++ CHECK_C_SOURCE_RUNS("
++ int main()
++ {
++ return (__clang_major__ < 3) ||
++ (__clang_major__ == 3 && __clang_minor__ < 3);
++ }" HAVE_SUPPORTED_CLANG_VERSION)
++ IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
++ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
++ ENDIF()
++ ELSE()
++ MESSAGE(FATAL_ERROR "Unsupported compiler!")
++ ENDIF()
++ENDIF()
Added: head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake Wed Jan 8 16:47:12 2020 (r522436)
@@ -0,0 +1,25 @@
+--- cmake/os/FreeBSD.cmake.orig 2019-09-20 08:30:51 UTC
++++ cmake/os/FreeBSD.cmake
+@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+ MESSAGE(FATAL_ERROR
+ "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
+ ENDIF()
+- ELSE()
+- MESSAGE(FATAL_ERROR "Unsupported compiler!")
++ CHECK_C_SOURCE_RUNS("
++ int main()
++ {
++ return (__clang_major__ >= 4);
++ }" I386_ATOMIC_BUILTINS)
++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "")
++ ENDIF()
++ ELSEIF(CMAKE_COMPILER_IS_GNUCC)
++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++ OUTPUT_VARIABLE GCC_VERSION)
++ IF(GCC_VERSION VERSION_LESS 4.4)
++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++ ENDIF()
+ ENDIF()
+ ENDIF()
+
Modified: head/databases/mysql80-server/files/patch-cmake_plugin.cmake
==============================================================================
--- head/databases/mysql80-server/files/patch-cmake_plugin.cmake Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-cmake_plugin.cmake Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,12 +1,12 @@
---- cmake/plugin.cmake.orig 2017-06-27 11:44:29 UTC
+--- cmake/plugin.cmake.orig 2019-09-20 08:30:51 UTC
+++ cmake/plugin.cmake
-@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -226,9 +226,6 @@ MACRO(MYSQL_ADD_PLUGIN)
MYSQL_INSTALL_TARGETS(${target}
DESTINATION ${INSTALL_PLUGINDIR}
COMPONENT ${INSTALL_COMPONENT})
- INSTALL_DEBUG_TARGET(${target}
- DESTINATION ${INSTALL_PLUGINDIR}/debug
- COMPONENT ${INSTALL_COMPONENT})
- # For internal testing in PB2, append collections files
- IF(DEFINED ENV{PB2WORKDIR})
- PLUGIN_APPEND_COLLECTIONS(${plugin})
+ ENDIF()
+ ELSE()
+ IF(WITHOUT_${plugin})
Modified: head/databases/mysql80-server/files/patch-cmake_ssl.cmake
==============================================================================
--- head/databases/mysql80-server/files/patch-cmake_ssl.cmake Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-cmake_ssl.cmake Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,14 +1,28 @@
---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC
+--- cmake/ssl.cmake.orig 2019-09-20 08:30:51 UTC
+++ cmake/ssl.cmake
-@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL)
- OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+@@ -199,7 +199,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"
+@@ -214,13 +214,14 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+ )
ENDIF()
+- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
++ 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 STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2")
++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
)
SET(OPENSSL_FOUND TRUE)
FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
Added: head/databases/mysql80-server/files/patch-extra_libedit_chartype.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-extra_libedit_chartype.h Wed Jan 8 16:47:12 2020 (r522436)
@@ -0,0 +1,11 @@
+--- extra/libedit/chartype.h.orig 2019-09-20 08:30:51 UTC
++++ extra/libedit/chartype.h
+@@ -49,7 +49,7 @@
+ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
+ #if !defined(__NetBSD__) && !defined(__sun) \
+ && !(defined(__APPLE__) && defined(__MACH__)) \
+- && !defined(__FreeBSD__) && !defined(_AIX)
++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
+ #ifndef __STDC_ISO_10646__
+ /* In many places it is assumed that the first 127 code points are ASCII
+ * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
Added: head/databases/mysql80-server/files/patch-extra_libedit_vi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-extra_libedit_vi.c Wed Jan 8 16:47:12 2020 (r522436)
@@ -0,0 +1,20 @@
+--- extra/libedit/vi.c.orig 2019-09-20 08:30:51 UTC
++++ extra/libedit/vi.c
+@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __attribute__((__un
+ * NB: posix implies that we should enter insert mode, however
+ * this is against historical precedent...
+ */
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ __weakref_visible char *my_get_alias_text(const char *)
+ __weak_reference(get_alias_text);
+ #endif
+@@ -928,7 +928,7 @@ protected el_action_t
+ vi_alias(EditLine *el __attribute__((__unused__)),
+ Int c __attribute__((__unused__)))
+ {
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ char alias_name[3];
+ char *alias_text;
+
Added: head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h Wed Jan 8 16:47:12 2020 (r522436)
@@ -0,0 +1,19 @@
+--- extra/libevent/openssl-compat.h.orig 2019-09-20 08:30:51 UTC
++++ extra/libevent/openssl-compat.h
+@@ -24,12 +24,15 @@ static inline BIO_METHOD *BIO_meth_new(int type, const
+ #define BIO_set_init(b, val) (b)->init = (val)
+ #define BIO_set_data(b, val) (b)->ptr = (val)
+ #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
+-#define BIO_get_init(b) (b)->init
+ #define BIO_get_data(b) (b)->ptr
+ #define BIO_get_shutdown(b) (b)->shutdown
+
+ #define TLS_method SSLv23_method
+
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#define BIO_get_init(b) (b)->init
++#endif
+
+ #endif /* OPENSSL_COMPAT_H */
Modified: head/databases/mysql80-server/files/patch-include_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-include_CMakeLists.txt Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-include_CMakeLists.txt Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,10 +1,174 @@
---- include/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC
+--- include/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ include/CMakeLists.txt
-@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR
+@@ -37,10 +37,171 @@ SET(HEADERS
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
+ ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
+ field_types.h
++ base64.h
++ big_endian.h
++ c_string_less.h
++ crypt_genhash_impl.h
++ decimal.h
++ depth_first_search.h
++ dur_prop.h
++ errmsg.h
++ ft_global.h
++ heap.h
++ keycache.h
++ lex_string.h
++ lf.h
++ little_endian.h
++ m_ctype.h
++ m_string.h
++ map_helpers.h
++ mf_wcomp.h
++ mutex_lock.h
++ my_aes.h
++ my_alloc.h
++ my_atomic.h
++ my_base.h
++ my_bit.h
++ my_bitmap.h
++ my_byteorder.h
++ my_check_opt.h
++ my_command.h
++ my_compare.h
++ my_compiler.h
++ my_dbug.h
++ my_default.h
++ my_dir.h
++ my_double2ulonglong.h
++ my_getopt.h
++ my_hash_combine.h
++ my_icp.h
++ my_inttypes.h
++ my_io.h
++ my_list.h
++ my_loglevel.h
++ my_macros.h
++ my_md5.h
++ my_md5_size.h
++ my_murmur3.h
++ my_pointer_arithmetic.h
++ my_psi_config.h
++ my_rapidjson_size_t.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.h
++ my_thread_local.h
++ my_thread_os_id.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.h
++ mysql.h.pp
++ mysql_com.h
++ mysql_com_server.h
++ mysql_time.h
++ mysql_version.h.in
++ mysys_err.h
++ nullable.h
++ password.h
++ pfs_cond_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_table_provider.h
++ pfs_thread_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
++ template_utils.h
++ thr_cond.h
++ thr_lock.h
++ thr_mutex.h
++ thr_rwlock.h
++ typelib.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/get_password.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
)
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development)
-+ENDIF()
Modified: head/databases/mysql80-server/files/patch-include_my__compare.h
==============================================================================
--- head/databases/mysql80-server/files/patch-include_my__compare.h Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-include_my__compare.h Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,4 +1,4 @@
---- include/my_compare.h.orig 2018-04-08 06:44:49 UTC
+--- include/my_compare.h.orig 2019-09-20 08:30:51 UTC
+++ include/my_compare.h
@@ -49,7 +49,7 @@
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
Modified: head/databases/mysql80-server/files/patch-include_my__thread__os__id.h
==============================================================================
--- head/databases/mysql80-server/files/patch-include_my__thread__os__id.h Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-include_my__thread__os__id.h Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,6 +1,6 @@
---- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC
+--- include/my_thread_os_id.h.orig 2019-09-20 08:30:51 UTC
+++ include/my_thread_os_id.h
-@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
+@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
return pthread_getthreadid_np();
#else
#ifdef HAVE_INTEGER_PTHREAD_SELF
Modified: head/databases/mysql80-server/files/patch-include_myisam.h
==============================================================================
--- head/databases/mysql80-server/files/patch-include_myisam.h Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-include_myisam.h Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,4 +1,4 @@
---- include/myisam.h.orig 2018-04-08 06:44:49 UTC
+--- include/myisam.h.orig 2019-09-20 08:30:51 UTC
+++ include/myisam.h
@@ -59,7 +59,7 @@
The following defines can be increased if necessary.
Added: head/databases/mysql80-server/files/patch-include_violite.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-include_violite.h Wed Jan 8 16:47:12 2020 (r522436)
@@ -0,0 +1,14 @@
+--- include/violite.h.orig 2019-09-20 08:30:51 UTC
++++ include/violite.h
+@@ -269,9 +269,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
+
+ struct st_VioSSLFd *new_VioSSLAcceptorFd(
+ const char *key_file, const char *cert_file, const char *ca_file,
Modified: head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,31 +1,70 @@
---- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
+--- libmysql/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ libmysql/CMakeLists.txt
-@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica
- ADD_SUBDIRECTORY(authentication_ldap)
-
- # Merge several convenience libraries into one big mysqlclient
+@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
+ )
+ ENDIF()
+
++INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC")
++ENDIF()
++
+ #
+ # Include protocol tracing infrastructure and the test
+ # trace plugin if enabled by build options.
+@@ -240,12 +245,17 @@ IF(WIN32)
+ LIST(APPEND LIBS_TO_MERGE auth_win_client)
+ ENDIF()
+
+-# LDAP authentication SASL client plugin
+-MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
+-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)
++IF(WITHOUT_CLIENTLIBS)
++ # Merge several convenience libraries into one big mysqlclient
++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
++ELSE(WITHOUT_CLIENTLIBS)
++ # LDAP authentication SASL client plugin
++ MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
++ ADD_SUBDIRECTORY(authentication_ldap)
++
++ # Merge several convenience libraries into one big mysqlclient
++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
++ENDIF(WITHOUT_CLIENTLIBS)
TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
# 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} ${CLIENT_API_NONBLOCKING_FUNCTIONS}
-- COMPONENT SharedLibraries)
-+ COMPONENT SharedLibraries SKIP_INSTALL)
- TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
+@@ -281,12 +291,22 @@ ENDIF()
-+IF(FALSE)
- IF(WIN32)
- # 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 "")
-+ ENDIF()
- FOREACH(api ${CLIENT_API_FUNCTIONS})
- SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
- ENDFOREACH()
+ # Merge several convenience libraries into one big mysqlclient
+ # and link them together into shared library.
++IF(WITHOUT_CLIENTLIBS)
+ MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
+ EXPORTS
+ ${CLIENT_API_FUNCTIONS}
+ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+ ${CLIENT_API_NONBLOCKING_FUNCTIONS}
++ COMPONENT SharedLibraries
++ SKIP_INSTALL )
++ELSE(WITHOUT_CLIENTLIBS)
++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
++ EXPORTS
++ ${CLIENT_API_FUNCTIONS}
++ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
++ ${CLIENT_API_NONBLOCKING_FUNCTIONS}
+ COMPONENT SharedLibraries)
++ENDIF(WITHOUT_CLIENTLIBS)
+ TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
+
+ IF(WIN32)
+@@ -300,7 +320,7 @@ ENDIF()
+
+ IF(UNIX)
+ # libtool compatability
+- IF(FREEBSD OR APPLE)
++ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
+ ELSE()
+ SET(OS_SHARED_LIB_VERSION
Modified: head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-libservices_CMakeLists.txt Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,4 +1,4 @@
---- libservices/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
+--- libservices/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ libservices/CMakeLists.txt
@@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES
plugin_registry_service.c)
@@ -10,4 +10,3 @@
DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
+ENDIF()
ENDIF()
-
Modified: head/databases/mysql80-server/files/patch-man_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-man_CMakeLists.txt Wed Jan 8 16:40:10 2020 (r522435)
+++ head/databases/mysql80-server/files/patch-man_CMakeLists.txt Wed Jan 8 16:47:12 2020 (r522436)
@@ -1,14 +1,74 @@
---- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
+--- man/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ man/CMakeLists.txt
-@@ -21,9 +21,8 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
+@@ -23,29 +23,14 @@
# Copy man pages
--FILE(GLOB MAN1 *.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
-+FILE(GLOB MAN1 *.1)
-+FILE(GLOB MAN1_ROUTER mysqlroutermy_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
- FILE(GLOB MAN8 *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
+ SET(MAN1
+ comp_err.1
+- ibd2sdi.1
+- innochecksum.1
+ lz4_decompress.1
+- my_print_defaults.1
+- myisam_ftdump.1
+- myisamchk.1
+- myisamlog.1
+- myisampack.1
+ mysql.1
+- mysql.server.1
+ mysql_config.1
+ mysql_config_editor.1
+- mysql_secure_installation.1
+- mysql_ssl_rsa_setup.1
+- mysql_tzinfo_to_sql.1
+- mysql_upgrade.1
+ mysqladmin.1
+ mysqlbinlog.1
+ mysqlcheck.1
+- mysqld_multi.1
+- mysqld_safe.1
+ mysqldump.1
+- mysqldumpslow.1
+ mysqlimport.1
+ mysqlman.1
+ mysqlpump.1
+@@ -54,6 +39,23 @@ SET(MAN1
+ perror.1
+ zlib_decompress.1
+ )
++SET(MAN1_TOOLS
++ ibd2sdi.1
++ innochecksum.1
++ my_print_defaults.1
++ myisam_ftdump.1
++ myisamchk.1
++ myisamlog.1
++ myisampack.1
++ mysql.server.1
++ mysql_secure_installation.1
++ mysql_ssl_rsa_setup.1
++ mysql_tzinfo_to_sql.1
++ mysql_upgrade.1
++ mysqldumpslow.1
++ mysqld_multi.1
++ mysqld_safe.1
++ )
+ SET(MAN1_NDB
+ ndb-common-options.1
+ ndb_blob_tool.1
+@@ -99,8 +101,15 @@ SET(MAN8_NDB
+ ndbmtd.8
+ )
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list