databases/mysql57-*: Remove expired port
This commit is contained in:
parent
d904ca2a2c
commit
e716c4e0ea
2
MOVED
2
MOVED
@ -8283,3 +8283,5 @@ www/py-dj41-drf-yasg|www/py-dj42-drf-yasg|2023-12-31|Has expired: Extended suppo
|
|||||||
print/ghostscript9-agpl-x11|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
|
print/ghostscript9-agpl-x11|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
|
||||||
print/ghostscript9-agpl-base|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
|
print/ghostscript9-agpl-base|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
|
||||||
www/py-dj41-django-cors-headers|www/py-dj42-django-cors-headers|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
|
www/py-dj41-django-cors-headers|www/py-dj42-django-cors-headers|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
|
||||||
|
databases/mysql57-server|mysql80-server|2023-12-31|Has expired: Upstream support ended in October 2019
|
||||||
|
databases/mysql57-client|mysql80-client|2023-12-31|Has expired: Upstream support ended in October 2019
|
||||||
|
|||||||
@ -1,15 +1,14 @@
|
|||||||
# Provide support for MySQL
|
# Provide support for MySQL
|
||||||
# Feature: mysql
|
# Feature: mysql
|
||||||
# Usage: USES=mysql or USES=mysql:args
|
# Usage: USES=mysql or USES=mysql:args
|
||||||
# Valid ARGS: <version>, client, server, embedded
|
# Valid ARGS: <version>, client, server
|
||||||
#
|
#
|
||||||
# version If no version is given (by the maintainer via the port), try to
|
# version If no version is given (by the maintainer via the port), try to
|
||||||
# find the currently installed version. Fall back to default if
|
# find the currently installed version. Fall back to default if
|
||||||
# necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for
|
# necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for
|
||||||
# possible values).
|
# possible values).
|
||||||
# client Depends on the libmysqlclient library (default)
|
# client Depends on the libmysqlclient library (default)
|
||||||
# server/embedded
|
# server Depend on the server at run/build time. If none of these is
|
||||||
# Depend on the server at run/build time. If none of these is
|
|
||||||
# set, depends on the client.
|
# set, depends on the client.
|
||||||
#
|
#
|
||||||
# IGNORE_WITH_MYSQL
|
# IGNORE_WITH_MYSQL
|
||||||
@ -28,16 +27,11 @@ _INCLUDE_USES_MYSQL_MK= yes
|
|||||||
. if !empty(mysql_ARGS)
|
. if !empty(mysql_ARGS)
|
||||||
.undef _WANT_MYSQL_VER
|
.undef _WANT_MYSQL_VER
|
||||||
.undef _WANT_MYSQL_SERVER
|
.undef _WANT_MYSQL_SERVER
|
||||||
.undef _WANT_MYSQL_EMBEDDED
|
|
||||||
_MYSQL_ARGS= ${mysql_ARGS:S/,/ /g}
|
_MYSQL_ARGS= ${mysql_ARGS:S/,/ /g}
|
||||||
. if ${_MYSQL_ARGS:Mserver}
|
. if ${_MYSQL_ARGS:Mserver}
|
||||||
_WANT_MYSQL_SERVER= yes
|
_WANT_MYSQL_SERVER= yes
|
||||||
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver}
|
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver}
|
||||||
. endif
|
. endif
|
||||||
. if ${_MYSQL_ARGS:Membedded}
|
|
||||||
_WANT_MYSQL_EMBEDDED= yes
|
|
||||||
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded}
|
|
||||||
. endif
|
|
||||||
. if ${_MYSQL_ARGS:Mclient}
|
. if ${_MYSQL_ARGS:Mclient}
|
||||||
_WANT_MYSQL_CLIENT= yes
|
_WANT_MYSQL_CLIENT= yes
|
||||||
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient}
|
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient}
|
||||||
@ -62,7 +56,6 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
|
|||||||
# MySQL client version currently supported.
|
# MySQL client version currently supported.
|
||||||
# When adding a version, please keep the comment in
|
# When adding a version, please keep the comment in
|
||||||
# Mk/bsd.default-versions.mk in sync.
|
# Mk/bsd.default-versions.mk in sync.
|
||||||
MYSQL57_LIBVER= 20
|
|
||||||
MYSQL80_LIBVER= 21
|
MYSQL80_LIBVER= 21
|
||||||
MYSQL81_LIBVER= 22
|
MYSQL81_LIBVER= 22
|
||||||
. for v in 5 6 11
|
. for v in 5 6 11
|
||||||
@ -139,14 +132,10 @@ IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${
|
|||||||
. endif
|
. endif
|
||||||
. endfor
|
. endfor
|
||||||
. endif # IGNORE_WITH_MYSQL
|
. endif # IGNORE_WITH_MYSQL
|
||||||
. if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)
|
. if defined(_WANT_MYSQL_SERVER)
|
||||||
RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
|
RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
|
||||||
. if defined(_WANT_MYSQL_EMBEDDED)
|
|
||||||
BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
|
|
||||||
. endif
|
|
||||||
. endif
|
. endif
|
||||||
. if defined(_WANT_MYSQL_CLIENT) || \
|
. if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER)
|
||||||
!(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED))
|
|
||||||
LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
|
LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
|
||||||
. endif
|
. endif
|
||||||
. else
|
. else
|
||||||
|
|||||||
@ -105,7 +105,7 @@ LUAJIT_DEFAULT?= luajit-devel
|
|||||||
. endif
|
. endif
|
||||||
# Possible values: 5.10, 5.20, 6.8
|
# Possible values: 5.10, 5.20, 6.8
|
||||||
MONO_DEFAULT?= 5.20
|
MONO_DEFAULT?= 5.20
|
||||||
# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m
|
# Possible values: 8.0, 8.1, 10.5m, 10.6m, 10.11m
|
||||||
MYSQL_DEFAULT?= 8.0
|
MYSQL_DEFAULT?= 8.0
|
||||||
# Possible values: ninja, samurai
|
# Possible values: ninja, samurai
|
||||||
NINJA_DEFAULT?= ninja
|
NINJA_DEFAULT?= ninja
|
||||||
|
|||||||
@ -193,8 +193,6 @@
|
|||||||
SUBDIR += mysql-connector-java51
|
SUBDIR += mysql-connector-java51
|
||||||
SUBDIR += mysql-connector-odbc-80
|
SUBDIR += mysql-connector-odbc-80
|
||||||
SUBDIR += mysql2pgsql
|
SUBDIR += mysql2pgsql
|
||||||
SUBDIR += mysql57-client
|
|
||||||
SUBDIR += mysql57-server
|
|
||||||
SUBDIR += mysql80-client
|
SUBDIR += mysql80-client
|
||||||
SUBDIR += mysql80-server
|
SUBDIR += mysql80-server
|
||||||
SUBDIR += mysql81-client
|
SUBDIR += mysql81-client
|
||||||
|
|||||||
@ -17,7 +17,6 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \
|
|||||||
libzstd.so:archivers/zstd
|
libzstd.so:archivers/zstd
|
||||||
|
|
||||||
USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
|
USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
|
||||||
IGNORE_WITH_MYSQL= 57
|
|
||||||
USE_LDCONFIG= yes
|
USE_LDCONFIG= yes
|
||||||
|
|
||||||
CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1
|
CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1
|
||||||
|
|||||||
@ -1,47 +0,0 @@
|
|||||||
PORTNAME= mysql
|
|
||||||
PORTREVISION= 2
|
|
||||||
PKGNAMESUFFIX= 57-client
|
|
||||||
|
|
||||||
COMMENT= Multithreaded SQL database (client)
|
|
||||||
|
|
||||||
LICENSE+= LGPL21
|
|
||||||
|
|
||||||
MASTERDIR= ${.CURDIR}/../mysql57-server
|
|
||||||
|
|
||||||
PKGMESSAGE= ${.CURDIR}/pkg-message
|
|
||||||
PATCHDIR= ${.CURDIR}/files
|
|
||||||
PLIST= ${.CURDIR}/pkg-plist
|
|
||||||
|
|
||||||
CONFLICTS_INSTALL= mysql5[0-68-9]-client \
|
|
||||||
mysql[0-46-9][0-9]-client \
|
|
||||||
mariadb[0-9][0-9]-client \
|
|
||||||
percona[0-9][0-9]-client
|
|
||||||
|
|
||||||
CMAKE_ARGS+= -DWITHOUT_SERVER=1 \
|
|
||||||
-DWITH_NDBCLUSTER=1
|
|
||||||
|
|
||||||
USE_CXXSTD= c++14
|
|
||||||
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
|
|
||||||
|
|
||||||
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_USES= ldap
|
|
||||||
OPTIONS_DEFAULT+= SASLCLIENT
|
|
||||||
|
|
||||||
# issue 166367: adding symlinks for back-compatibility with ${lib}_r
|
|
||||||
post-install:
|
|
||||||
@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
|
|
||||||
@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
|
|
||||||
@${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20
|
|
||||||
|
|
||||||
.include "${MASTERDIR}/Makefile"
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
--- CMakeLists.txt.orig 2017-06-22 14:13:19 UTC
|
|
||||||
+++ CMakeLists.txt
|
|
||||||
@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER)
|
|
||||||
SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
|
|
||||||
# Add storage engines and plugins.
|
|
||||||
CONFIGURE_PLUGINS()
|
|
||||||
-ELSE()
|
|
||||||
- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
|
|
||||||
- ADD_SUBDIRECTORY(storage/ndb)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(include)
|
|
||||||
@@ -647,8 +644,8 @@ ENDIF()
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(extra)
|
|
||||||
ADD_SUBDIRECTORY(client)
|
|
||||||
-ADD_SUBDIRECTORY(sql/share)
|
|
||||||
ADD_SUBDIRECTORY(libservices)
|
|
||||||
+ADD_SUBDIRECTORY(support-files)
|
|
||||||
|
|
||||||
IF(UNIX)
|
|
||||||
ADD_SUBDIRECTORY(man)
|
|
||||||
@@ -719,14 +716,13 @@ ELSE()
|
|
||||||
SET(CPACK_GENERATOR "TGZ")
|
|
||||||
ENDIF()
|
|
||||||
ADD_SUBDIRECTORY(packaging/WiX)
|
|
||||||
-ADD_SUBDIRECTORY(packaging/solaris)
|
|
||||||
|
|
||||||
IF(UNIX)
|
|
||||||
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
|
|
||||||
ENDIF()
|
|
||||||
#
|
|
||||||
# RPM installs documentation directly from the source tree
|
|
||||||
#
|
|
||||||
+IF(FALSE)
|
|
||||||
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
||||||
INSTALL(FILES COPYING LICENSE.mysql
|
|
||||||
DESTINATION ${INSTALL_DOCREADMEDIR}
|
|
||||||
@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
||||||
PATTERN "sp-imp-spec.txt" EXCLUDE
|
|
||||||
)
|
|
||||||
ENDIF()
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
INCLUDE(CPack)
|
|
||||||
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ client/CMakeLists.txt
|
|
||||||
@@ -47,6 +47,7 @@ IF(UNIX)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
|
|
||||||
ENDIF(UNIX)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
IF(NOT WITHOUT_SERVER)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_upgrade
|
|
||||||
upgrade/program.cc
|
|
||||||
@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
|
|
||||||
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
|
|
||||||
ENDIF()
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
||||||
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
||||||
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
|
|
||||||
ADD_DEPENDENCIES(mysqltest GenError)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
|
|
||||||
@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
||||||
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
||||||
ADD_COMPILE_FLAGS(
|
|
||||||
@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
IF(UNIX AND NOT WITHOUT_SERVER)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_install_db
|
|
||||||
@@ -122,7 +130,6 @@ IF(WIN32)
|
|
||||||
ENDIF(WIN32)
|
|
||||||
|
|
||||||
SET_TARGET_PROPERTIES (
|
|
||||||
- mysql_plugin
|
|
||||||
mysqlcheck
|
|
||||||
mysqldump
|
|
||||||
mysqlimport
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC
|
|
||||||
+++ cmake/build_configurations/compiler_options.cmake
|
|
||||||
@@ -43,7 +43,7 @@ IF(UNIX)
|
|
||||||
|
|
||||||
# Default GCC flags
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
|
||||||
- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
+ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
# Disable inline optimizations for valgrind testing to avoid false positives
|
|
||||||
IF(WITH_VALGRIND)
|
|
||||||
STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
|
|
||||||
@@ -68,7 +68,7 @@ IF(UNIX)
|
|
||||||
ENDIF()
|
|
||||||
ENDIF()
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
+ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
# GCC 6 has C++14 as default, set it explicitly to the old default.
|
|
||||||
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
|
|
||||||
OUTPUT_VARIABLE GXX_VERSION)
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
--- 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()
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC
|
|
||||||
+++ cmake/os/FreeBSD.cmake
|
|
||||||
@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
|
|
||||||
IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
|
|
||||||
MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
|
|
||||||
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()
|
|
||||||
|
|
||||||
# Should not be needed any more, but kept for easy resurrection if needed
|
|
||||||
# #Legacy option, maybe not needed anymore , taken as is from autotools build
|
|
||||||
# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
|
|
||||||
-
|
|
||||||
+# For GCC maybe it's also good idea to use
|
|
||||||
+# ADD_DEFINITIONS(-D_GNU_SOURCE)
|
|
||||||
+
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
|
|
||||||
+++ cmake/plugin.cmake
|
|
||||||
@@ -263,13 +270,17 @@ 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})
|
|
||||||
+ IF(CMAKE_BUILD_TYPE MATCHES "Debug")
|
|
||||||
+ INSTALL_DEBUG_TARGET(${target}
|
|
||||||
+ DESTINATION ${INSTALL_PLUGINDIR}/debug
|
|
||||||
+ COMPONENT ${INSTALL_COMPONENT})
|
|
||||||
+ # Add installed files to list for RPMs
|
|
||||||
+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
|
|
||||||
+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
|
|
||||||
+ ENDIF()
|
|
||||||
# Add installed files to list for RPMs
|
|
||||||
FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
|
|
||||||
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
|
|
||||||
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
|
|
||||||
+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
|
|
||||||
# For internal testing in PB2, append collections files
|
|
||||||
IF(DEFINED ENV{PB2WORKDIR})
|
|
||||||
PLUGIN_APPEND_COLLECTIONS(${plugin})
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
--- cmake/ssl.cmake.orig 2023-10-25 22:22:28.748647000 +0200
|
|
||||||
+++ cmake/ssl.cmake 2023-10-30 19:12:39.388494000 +0100
|
|
||||||
@@ -232,13 +232,6 @@ MACRO (MYSQL_CHECK_SSL)
|
|
||||||
MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
- # On mac this list is <.dylib;.so;.a>
|
|
||||||
- # We prefer static libraries, so we reverse it here.
|
|
||||||
- IF (WITH_SSL_PATH)
|
|
||||||
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
|
|
||||||
- MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
|
|
||||||
- ENDIF()
|
|
||||||
-
|
|
||||||
FIND_LIBRARY(OPENSSL_LIBRARY
|
|
||||||
NAMES ssl libssl ssleay32 ssleay32MD
|
|
||||||
HINTS ${OPENSSL_ROOT_DIR}/lib)
|
|
||||||
@@ -253,9 +246,10 @@ MACRO (MYSQL_CHECK_SSL)
|
|
||||||
FIND_OPENSSL_VERSION()
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
- IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
|
|
||||||
- ADD_DEFINITIONS(-DHAVE_TLSv13)
|
|
||||||
- SET(HAVE_TLSv13 1)
|
|
||||||
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
|
|
||||||
+ IF(HAVE_TLS1_3_VERSION)
|
|
||||||
+ #ADD_DEFINITIONS(-DHAVE_TLSv13)
|
|
||||||
+ #SET(HAVE_TLSv13 1)
|
|
||||||
IF(SOLARIS)
|
|
||||||
SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
|
|
||||||
ENDIF()
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
--- configure.cmake.orig 2018-01-16 23:26:09 UTC
|
|
||||||
+++ configure.cmake
|
|
||||||
@@ -43,6 +43,12 @@ IF(UNIX)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
|
|
||||||
+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|
||||||
+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS
|
|
||||||
+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
|
|
||||||
+ENDIF()
|
|
||||||
+
|
|
||||||
+
|
|
||||||
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
## We will be using gcc to generate .so files
|
|
||||||
## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
--- extra/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ extra/CMakeLists.txt
|
|
||||||
@@ -45,6 +45,7 @@ ENDIF()
|
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
|
|
||||||
${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
|
|
||||||
+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
|
|
||||||
COMMAND comp_err
|
|
||||||
--charset=${PROJECT_SOURCE_DIR}/sql/share/charsets
|
|
||||||
--out-dir=${PROJECT_BINARY_DIR}/sql/share/
|
|
||||||
@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
|
|
||||||
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
|
|
||||||
SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
|
|
||||||
@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
|
|
||||||
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
|
|
||||||
ADD_DEPENDENCIES(innochecksum GenError)
|
|
||||||
ENDIF()
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
+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()
|
|
||||||
|
|
||||||
# In published release builds on Solaris, we need to bundle gcc source.
|
|
||||||
# PB2 will take care of putting it in extra/ when needed
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/CMakeLists.txt
|
|
||||||
@@ -38,6 +38,7 @@ SET(HEADERS_ABI
|
|
||||||
|
|
||||||
SET(HEADERS
|
|
||||||
${HEADERS_ABI}
|
|
||||||
+ hash.h
|
|
||||||
my_dbug.h
|
|
||||||
m_string.h
|
|
||||||
my_sys.h
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- include/my_compare.h.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/my_compare.h
|
|
||||||
@@ -40,7 +40,7 @@ extern "C" {
|
|
||||||
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
|
|
||||||
+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
|
|
||||||
#define HA_MAX_KEY_SEG 16 /* Max segments for key */
|
|
||||||
|
|
||||||
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- include/my_openssl.h.orig 2020-03-23 17:35:17 UTC
|
|
||||||
+++ include/my_openssl.h
|
|
||||||
@@ -51,7 +51,7 @@ extern "C" {
|
|
||||||
*/
|
|
||||||
static inline int mysql_OPENSSL_init()
|
|
||||||
{
|
|
||||||
-#if defined(HAVE_STATIC_OPENSSL)
|
|
||||||
+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
|
|
||||||
#else
|
|
||||||
return SSL_library_init();
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- include/myisam.h.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/myisam.h
|
|
||||||
@@ -45,7 +45,7 @@ extern "C" {
|
|
||||||
The following defines can be increased if necessary.
|
|
||||||
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
|
|
||||||
*/
|
|
||||||
-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
|
|
||||||
+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
|
|
||||||
#define MI_MAX_KEY_SEG 16 /* Max segments for key */
|
|
||||||
|
|
||||||
#define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ libmysql/CMakeLists.txt
|
|
||||||
@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
|
|
||||||
COMPONENT SharedLibraries)
|
|
||||||
IF(UNIX)
|
|
||||||
# libtool compatability
|
|
||||||
- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
|
|
||||||
+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
|
|
||||||
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
|
|
||||||
ELSE()
|
|
||||||
SET(OS_SHARED_LIB_VERSION
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
|
|
||||||
+++ man/CMakeLists.txt
|
|
||||||
@@ -15,10 +15,6 @@
|
|
||||||
|
|
||||||
# Copy man pages
|
|
||||||
FILE(GLOB MAN1_FILES *.1)
|
|
||||||
-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
|
|
||||||
-FILE(GLOB MAN1_NDB ndb*.1)
|
|
||||||
-FILE(GLOB MAN8_FILES *.8)
|
|
||||||
-FILE(GLOB MAN8_NDB ndb*.8)
|
|
||||||
IF(MAN1_FILES)
|
|
||||||
IF(MAN1_EXCLUDE)
|
|
||||||
LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
|
|
||||||
+++ mysys_ssl/my_default.cc
|
|
||||||
@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
|
|
||||||
|
|
||||||
/* Which directories are searched for options (and in which order) */
|
|
||||||
|
|
||||||
-#define MAX_DEFAULT_DIRS 6
|
|
||||||
+#define MAX_DEFAULT_DIRS 7
|
|
||||||
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
|
|
||||||
static const char **default_directories = NULL;
|
|
||||||
|
|
||||||
@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
|
|
||||||
return 1; /* Ignore wrong files */
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (strstr(name, "/etc") == name)
|
|
||||||
+ {
|
|
||||||
+ fprintf(stderr,
|
|
||||||
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
|
|
||||||
+ name,name);
|
|
||||||
+ goto err;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
|
|
||||||
{
|
|
||||||
line++;
|
|
||||||
@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
|
|
||||||
end[(strlen(end)-1)] = ' ';
|
|
||||||
else
|
|
||||||
strxmov(end, conf_file, *ext , " ", NullS);
|
|
||||||
- fputs(name, stdout);
|
|
||||||
+ if (strstr(name, "/etc") != name)
|
|
||||||
+ fputs(name, stdout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1411,13 +1420,8 @@ static const char **init_default_directo
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
- errors += add_directory(alloc, "/etc/", dirs);
|
|
||||||
- errors += add_directory(alloc, "/etc/mysql/", dirs);
|
|
||||||
-
|
|
||||||
-#if defined(DEFAULT_SYSCONFDIR)
|
|
||||||
- if (DEFAULT_SYSCONFDIR[0])
|
|
||||||
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
|
|
||||||
-#endif /* DEFAULT_SYSCONFDIR */
|
|
||||||
+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
|
|
||||||
+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
|
|
||||||
MY_STAT stat_info;
|
|
||||||
|
|
||||||
if (!my_stat(file_name,&stat_info,MYF(0)))
|
|
||||||
- return 1;
|
|
||||||
+ return 0;
|
|
||||||
/*
|
|
||||||
Ignore .mylogin.cnf file if not exclusively readable/writable
|
|
||||||
by current user.
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- mysys_ssl/my_kdf.cc.orig 2022-11-04 07:31:17 UTC
|
|
||||||
+++ mysys_ssl/my_kdf.cc
|
|
||||||
@@ -59,7 +59,7 @@ int create_kdf_key(const unsigned char *key, const uns
|
|
||||||
Key_derivation_function *kdf_function = NULL;
|
|
||||||
|
|
||||||
if (kdf_name == "hkdf") {
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
kdf_function = new Key_hkdf_function(kdf_options);
|
|
||||||
#else
|
|
||||||
return 1;
|
|
||||||
@@ -87,7 +87,7 @@ Key_derivation_function::Key_derivation_function() {
|
|
||||||
options_valid_ = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) {
|
|
||||||
kdf_options_ = kdf_options;
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- mysys_ssl/my_kdf.h.orig 2022-11-04 07:35:11 UTC
|
|
||||||
+++ mysys_ssl/my_kdf.h
|
|
||||||
@@ -61,7 +61,7 @@ class Key_derivation_function {
|
|
||||||
bool options_valid_;
|
|
||||||
};
|
|
||||||
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
|
|
||||||
/** Class to implement KDF method hkdf. */
|
|
||||||
class Key_hkdf_function : public Key_derivation_function {
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- mysys/mf_iocache2.c.orig 2018-10-28 11:22:04 UTC
|
|
||||||
+++ mysys/mf_iocache2.c
|
|
||||||
@@ -19,6 +19,7 @@
|
|
||||||
|
|
||||||
#include "mysys_priv.h"
|
|
||||||
#include "my_sys.h"
|
|
||||||
+#include "mysql/psi/mysql_file.h"
|
|
||||||
#include <m_string.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <m_ctype.h>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- mysys/my_symlink.c.orig 2017-07-19 12:10:42 UTC
|
|
||||||
+++ mysys/my_symlink.c
|
|
||||||
@@ -23,6 +23,7 @@
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
+#include "my_dir.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
Reads the content of a symbolic link
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400
|
|
||||||
+++ scripts/CMakeLists.txt 2019-08-01 10:59:24.177559000 -0400
|
|
||||||
@@ -46,6 +46,7 @@
|
|
||||||
MESSAGE(FATAL_ERROR "Cannot concatenate files")
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
# Build mysql_fix_privilege_tables.c
|
|
||||||
ADD_CUSTOM_COMMAND(
|
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
|
|
||||||
@@ -66,6 +67,7 @@
|
|
||||||
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
|
|
||||||
)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
# If we do not have performance schema compiled in then sys will not work,
|
|
||||||
# so only create an empty sys database with an auto-generated file,
|
|
||||||
@@ -146,6 +148,7 @@
|
|
||||||
)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
IF(UNIX)
|
|
||||||
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
|
||||||
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
|
|
||||||
@@ -153,6 +156,7 @@
|
|
||||||
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
|
||||||
)
|
|
||||||
ENDIF()
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
IF(NOT WITHOUT_SERVER)
|
|
||||||
INSTALL(FILES
|
|
||||||
@@ -326,6 +330,8 @@
|
|
||||||
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
|
|
||||||
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
|
|
||||||
SET(${var} "${${var}}-l${lib} " )
|
|
||||||
+ ELSEIF(lib STREQUAL "-pthread")
|
|
||||||
+ SET(${var} "${${var}}-pthread " )
|
|
||||||
ELSE()
|
|
||||||
SET(${var} "${${var}}-l${lib} " )
|
|
||||||
ENDIF()
|
|
||||||
@@ -411,19 +417,7 @@
|
|
||||||
# On Unix, most of the files end up in the bin directory
|
|
||||||
SET(mysql_config_COMPONENT COMPONENT Development)
|
|
||||||
|
|
||||||
- IF(WITH_SYSTEMD)
|
|
||||||
- SET(BIN_SCRIPTS
|
|
||||||
- mysql_config
|
|
||||||
- mysqldumpslow
|
|
||||||
- )
|
|
||||||
- ELSE()
|
|
||||||
- SET(BIN_SCRIPTS
|
|
||||||
- mysql_config
|
|
||||||
- mysqldumpslow
|
|
||||||
- mysqld_multi
|
|
||||||
- mysqld_safe
|
|
||||||
- )
|
|
||||||
- ENDIF()
|
|
||||||
+ SET(BIN_SCRIPTS mysql_config)
|
|
||||||
|
|
||||||
SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
|
|
||||||
STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- sql/auth/sha2_password_common.cc
|
|
||||||
+++ sql/auth/sha2_password_common.cc
|
|
||||||
@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
|
|
||||||
DBUG_RETURN(true);
|
|
||||||
}
|
|
||||||
m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
|
|
||||||
-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
|
|
||||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
|
|
||||||
EVP_MD_CTX_cleanup(md_context);
|
|
||||||
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
||||||
EVP_MD_CTX_reset(md_context);
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
--- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ storage/myisam/mi_dynrec.c
|
|
||||||
@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
|
|
||||||
DBUG_RETURN(1);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
- I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
|
|
||||||
- MAP_NORESERVE
|
|
||||||
- Do not reserve swap space for this mapping. When swap space is
|
|
||||||
- reserved, one has the guarantee that it is possible to modify the
|
|
||||||
- mapping. When swap space is not reserved one might get SIGSEGV
|
|
||||||
- upon a write if no physical memory is available.
|
|
||||||
+ MAP_NORESERVE is unimplemented in FreeBSD
|
|
||||||
*/
|
|
||||||
info->s->file_map= (uchar*)
|
|
||||||
my_mmap(0, (size_t) size,
|
|
||||||
info->s->mode==O_RDONLY ? PROT_READ :
|
|
||||||
PROT_READ | PROT_WRITE,
|
|
||||||
- MAP_SHARED | MAP_NORESERVE,
|
|
||||||
+ MAP_SHARED,
|
|
||||||
info->dfile, 0L);
|
|
||||||
if (info->s->file_map == (uchar*) MAP_FAILED)
|
|
||||||
{
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
--- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC
|
|
||||||
+++ support-files/CMakeLists.txt
|
|
||||||
@@ -47,6 +47,7 @@ IF(UNIX)
|
|
||||||
SET (PIDOF "pgrep -d' ' -f")
|
|
||||||
ENDIF()
|
|
||||||
SET(prefix ${CMAKE_INSTALL_PREFIX})
|
|
||||||
+IF (FALSE)
|
|
||||||
FOREACH(script mysqld_multi.server mysql-log-rotate)
|
|
||||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
|
|
||||||
@@ -59,9 +60,11 @@ IF(UNIX)
|
|
||||||
IF(INSTALL_SUPPORTFILESDIR)
|
|
||||||
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
|
|
||||||
ENDIF()
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
SET(bindir ${prefix}/${INSTALL_BINDIR})
|
|
||||||
SET(sbindir ${prefix}/${INSTALL_SBINDIR})
|
|
||||||
SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
|
|
||||||
@@ -74,3 +77,4 @@ IF(UNIX)
|
|
||||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
|
|
||||||
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
|
|
||||||
ENDIF()
|
|
||||||
+ENDIF()
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
[
|
|
||||||
{ type: install
|
|
||||||
message: <<EOM
|
|
||||||
This is the mysql CLIENT without the server.
|
|
||||||
for complete server and client, please install databases/mysql57-server
|
|
||||||
EOM
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -1,140 +0,0 @@
|
|||||||
bin/mysql
|
|
||||||
bin/mysql_config
|
|
||||||
bin/mysql_config_editor
|
|
||||||
bin/mysql_ssl_rsa_setup
|
|
||||||
bin/mysqladmin
|
|
||||||
bin/mysqlbinlog
|
|
||||||
bin/mysqlcheck
|
|
||||||
bin/mysqldump
|
|
||||||
bin/mysqlimport
|
|
||||||
bin/mysqlpump
|
|
||||||
bin/mysqlshow
|
|
||||||
bin/mysqlslap
|
|
||||||
include/mysql/binary_log_types.h
|
|
||||||
include/mysql/big_endian.h
|
|
||||||
include/mysql/byte_order_generic.h
|
|
||||||
include/mysql/byte_order_generic_x86.h
|
|
||||||
include/mysql/decimal.h
|
|
||||||
include/mysql/errmsg.h
|
|
||||||
include/mysql/hash.h
|
|
||||||
include/mysql/keycache.h
|
|
||||||
include/mysql/little_endian.h
|
|
||||||
include/mysql/m_ctype.h
|
|
||||||
include/mysql/m_string.h
|
|
||||||
include/mysql/my_alloc.h
|
|
||||||
include/mysql/my_byteorder.h
|
|
||||||
include/mysql/my_command.h
|
|
||||||
include/mysql/my_compiler.h
|
|
||||||
include/mysql/my_config.h
|
|
||||||
include/mysql/my_dbug.h
|
|
||||||
include/mysql/my_dir.h
|
|
||||||
include/mysql/my_getopt.h
|
|
||||||
include/mysql/my_global.h
|
|
||||||
include/mysql/my_list.h
|
|
||||||
include/mysql/my_sys.h
|
|
||||||
include/mysql/my_thread.h
|
|
||||||
include/mysql/my_thread_local.h
|
|
||||||
include/mysql/my_xml.h
|
|
||||||
include/mysql/mysql.h
|
|
||||||
include/mysql/mysql/client_authentication.h
|
|
||||||
include/mysql/mysql/client_plugin.h
|
|
||||||
include/mysql/mysql/client_plugin.h.pp
|
|
||||||
include/mysql/mysql/com_data.h
|
|
||||||
include/mysql/mysql/get_password.h
|
|
||||||
include/mysql/mysql/group_replication_priv.h
|
|
||||||
include/mysql/mysql/innodb_priv.h
|
|
||||||
include/mysql/mysql/mysql_lex_string.h
|
|
||||||
include/mysql/mysql/plugin.h
|
|
||||||
include/mysql/mysql/plugin_audit.h
|
|
||||||
include/mysql/mysql/plugin_audit.h.pp
|
|
||||||
include/mysql/mysql/plugin_auth.h
|
|
||||||
include/mysql/mysql/plugin_auth.h.pp
|
|
||||||
include/mysql/mysql/plugin_auth_common.h
|
|
||||||
include/mysql/mysql/plugin_ftparser.h
|
|
||||||
include/mysql/mysql/plugin_ftparser.h.pp
|
|
||||||
include/mysql/mysql/plugin_group_replication.h
|
|
||||||
include/mysql/mysql/plugin_keyring.h
|
|
||||||
include/mysql/mysql/plugin_keyring.h.pp
|
|
||||||
include/mysql/mysql/plugin_trace.h
|
|
||||||
include/mysql/mysql/plugin_validate_password.h
|
|
||||||
include/mysql/mysql/psi/mysql_file.h
|
|
||||||
include/mysql/mysql/psi/mysql_idle.h
|
|
||||||
include/mysql/mysql/psi/mysql_mdl.h
|
|
||||||
include/mysql/mysql/psi/mysql_memory.h
|
|
||||||
include/mysql/mysql/psi/mysql_ps.h
|
|
||||||
include/mysql/mysql/psi/mysql_socket.h
|
|
||||||
include/mysql/mysql/psi/mysql_sp.h
|
|
||||||
include/mysql/mysql/psi/mysql_stage.h
|
|
||||||
include/mysql/mysql/psi/mysql_statement.h
|
|
||||||
include/mysql/mysql/psi/mysql_table.h
|
|
||||||
include/mysql/mysql/psi/mysql_thread.h
|
|
||||||
include/mysql/mysql/psi/mysql_transaction.h
|
|
||||||
include/mysql/mysql/psi/psi.h
|
|
||||||
include/mysql/mysql/psi/psi_base.h
|
|
||||||
include/mysql/mysql/psi/psi_memory.h
|
|
||||||
include/mysql/mysql/service_command.h
|
|
||||||
include/mysql/mysql/service_locking.h
|
|
||||||
include/mysql/mysql/service_my_plugin_log.h
|
|
||||||
include/mysql/mysql/service_my_snprintf.h
|
|
||||||
include/mysql/mysql/service_mysql_alloc.h
|
|
||||||
include/mysql/mysql/service_mysql_keyring.h
|
|
||||||
include/mysql/mysql/service_mysql_password_policy.h
|
|
||||||
include/mysql/mysql/service_mysql_string.h
|
|
||||||
include/mysql/mysql/service_parser.h
|
|
||||||
include/mysql/mysql/service_rpl_transaction_ctx.h
|
|
||||||
include/mysql/mysql/service_rpl_transaction_write_set.h
|
|
||||||
include/mysql/mysql/service_rules_table.h
|
|
||||||
include/mysql/mysql/service_security_context.h
|
|
||||||
include/mysql/mysql/service_srv_session.h
|
|
||||||
include/mysql/mysql/service_srv_session_info.h
|
|
||||||
include/mysql/mysql/service_ssl_wrapper.h
|
|
||||||
include/mysql/mysql/service_thd_alloc.h
|
|
||||||
include/mysql/mysql/service_thd_engine_lock.h
|
|
||||||
include/mysql/mysql/service_thd_wait.h
|
|
||||||
include/mysql/mysql/service_thread_scheduler.h
|
|
||||||
include/mysql/mysql/services.h
|
|
||||||
include/mysql/mysql/services.h.pp
|
|
||||||
include/mysql/mysql/thread_pool_priv.h
|
|
||||||
include/mysql/mysql/thread_type.h
|
|
||||||
include/mysql/mysql_com.h
|
|
||||||
include/mysql/mysql_com_server.h
|
|
||||||
include/mysql/mysql_embed.h
|
|
||||||
include/mysql/mysql_time.h
|
|
||||||
include/mysql/mysql_version.h
|
|
||||||
include/mysql/mysqld_ername.h
|
|
||||||
include/mysql/mysqld_error.h
|
|
||||||
include/mysql/plugin.h
|
|
||||||
include/mysql/plugin_audit.h
|
|
||||||
include/mysql/plugin_ftparser.h
|
|
||||||
include/mysql/plugin_group_replication.h
|
|
||||||
include/mysql/plugin_keyring.h
|
|
||||||
include/mysql/plugin_validate_password.h
|
|
||||||
include/mysql/sql_common.h
|
|
||||||
include/mysql/sql_state.h
|
|
||||||
include/mysql/sslopt-case.h
|
|
||||||
include/mysql/sslopt-longopts.h
|
|
||||||
include/mysql/sslopt-vars.h
|
|
||||||
include/mysql/thr_cond.h
|
|
||||||
include/mysql/thr_mutex.h
|
|
||||||
include/mysql/thr_rwlock.h
|
|
||||||
include/mysql/typelib.h
|
|
||||||
lib/mysql/libmysqlclient.a
|
|
||||||
lib/mysql/libmysqlclient.so
|
|
||||||
lib/mysql/libmysqlclient.so.20
|
|
||||||
lib/mysql/libmysqlclient_r.a
|
|
||||||
lib/mysql/libmysqlclient_r.so
|
|
||||||
lib/mysql/libmysqlclient_r.so.20
|
|
||||||
%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
|
|
||||||
libdata/pkgconfig/mysqlclient.pc
|
|
||||||
share/man/man1/comp_err.1.gz
|
|
||||||
share/man/man1/mysql.1.gz
|
|
||||||
share/man/man1/mysql_config.1.gz
|
|
||||||
share/man/man1/mysql_config_editor.1.gz
|
|
||||||
share/man/man1/mysqladmin.1.gz
|
|
||||||
share/man/man1/mysqlbinlog.1.gz
|
|
||||||
share/man/man1/mysqlcheck.1.gz
|
|
||||||
share/man/man1/mysqldump.1.gz
|
|
||||||
share/man/man1/mysqlimport.1.gz
|
|
||||||
share/man/man1/mysqlshow.1.gz
|
|
||||||
share/man/man1/mysqlslap.1.gz
|
|
||||||
share/aclocal/mysql.m4
|
|
||||||
@ -1,185 +0,0 @@
|
|||||||
PORTNAME?= mysql
|
|
||||||
PORTVERSION= 5.7.44
|
|
||||||
PORTREVISION?= 2
|
|
||||||
CATEGORIES= databases
|
|
||||||
MASTER_SITES= MYSQL/MySQL-5.7
|
|
||||||
PKGNAMESUFFIX?= 57-server
|
|
||||||
DISTNAME= ${PORTNAME}-boost-${PORTVERSION}
|
|
||||||
|
|
||||||
MAINTAINER= joneum@FreeBSD.org
|
|
||||||
COMMENT?= Multithreaded SQL database (server)
|
|
||||||
WWW= https://www.mysql.com/
|
|
||||||
|
|
||||||
LICENSE= GPLv2
|
|
||||||
|
|
||||||
DEPRECATED= Upstream support ended in October 2019
|
|
||||||
EXPIRATION_DATE= 2023-12-31
|
|
||||||
|
|
||||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
|
||||||
|
|
||||||
SLAVEDIRS= databases/mysql57-client
|
|
||||||
USES= bison:build cmake:noninja compiler:c11 compiler:c++11-lib \
|
|
||||||
cpe groff:run libedit localbase perl5 shebangfix ssl
|
|
||||||
CPE_VENDOR= oracle
|
|
||||||
|
|
||||||
USE_PERL5= run
|
|
||||||
|
|
||||||
MY_DBDIR= /var/db/mysql
|
|
||||||
MY_SECDIR= /var/db/mysql_secure
|
|
||||||
MY_TMPDIR= /var/db/mysql_tmpdir
|
|
||||||
|
|
||||||
LIB_DEPENDS+= libcurl.so:ftp/curl \
|
|
||||||
libevent.so:devel/libevent \
|
|
||||||
liblz4.so:archivers/liblz4
|
|
||||||
|
|
||||||
CMAKE_BUILD_TYPE= Release
|
|
||||||
|
|
||||||
CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
|
|
||||||
-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
|
|
||||||
-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
|
|
||||||
-DINSTALL_DOCDIR="share/doc/mysql" \
|
|
||||||
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
|
|
||||||
-DINSTALL_INCLUDEDIR="include/mysql" \
|
|
||||||
-DINSTALL_INFODIR="${INFO_PATH}" \
|
|
||||||
-DINSTALL_LIBDIR="lib/mysql" \
|
|
||||||
-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
|
|
||||||
-DINSTALL_MANDIR="share/man" \
|
|
||||||
-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
|
|
||||||
-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
|
|
||||||
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
|
|
||||||
-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
|
|
||||||
-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
|
|
||||||
-DINSTALL_SBINDIR="libexec" \
|
|
||||||
-DINSTALL_SCRIPTDIR="bin" \
|
|
||||||
-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
|
|
||||||
-DINSTALL_SHAREDIR="share" \
|
|
||||||
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
|
|
||||||
-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
|
|
||||||
-DWITH_BOOST="${WRKSRC}/boost" \
|
|
||||||
-DWITH_EDITLINE=system \
|
|
||||||
-DWITH_LIBEVENT=system \
|
|
||||||
-DWITH_LZ4=system \
|
|
||||||
-DWITH_ZLIB=system \
|
|
||||||
-DWITH_PROTOBUF=bundled \
|
|
||||||
-DWITH_CURL=system \
|
|
||||||
-DINSTALL_MYSQLTESTDIR=0 \
|
|
||||||
-DWITH_DEBUG=0
|
|
||||||
|
|
||||||
SHEBANG_FILES= scripts/*.pl* scripts/*.sh
|
|
||||||
|
|
||||||
.ifdef USE_MYSQL
|
|
||||||
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
|
|
||||||
.endif
|
|
||||||
|
|
||||||
SUB_LIST= MY_DBDIR=${MY_DBDIR} \
|
|
||||||
MY_SECDIR=${MY_SECDIR} \
|
|
||||||
MY_TMPDIR=${MY_TMPDIR}
|
|
||||||
|
|
||||||
PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
|
|
||||||
MY_SECDIR=${MY_SECDIR} \
|
|
||||||
MY_TMPDIR=${MY_TMPDIR}
|
|
||||||
|
|
||||||
OPTIONS_SUB= YES
|
|
||||||
|
|
||||||
# MySQL-Server part
|
|
||||||
.if !defined(CLIENT_ONLY)
|
|
||||||
USES+= mysql:57
|
|
||||||
|
|
||||||
CONFLICTS_INSTALL= mysql*-server \
|
|
||||||
mysqlwsrep*-server \
|
|
||||||
mariadb*-server \
|
|
||||||
percona*-server
|
|
||||||
|
|
||||||
USE_RC_SUBR= mysql-server
|
|
||||||
|
|
||||||
SUB_FILES= my.cnf.sample pkg-message
|
|
||||||
|
|
||||||
USERS= mysql
|
|
||||||
GROUPS= mysql
|
|
||||||
|
|
||||||
USE_CXXSTD= c++11
|
|
||||||
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
|
|
||||||
|
|
||||||
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
|
|
||||||
|
|
||||||
OPTIONS_GROUP+= STORAGE
|
|
||||||
OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
|
|
||||||
STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server)
|
|
||||||
ARCHIVE_DESC= Compile "Archive Storage" statically in server
|
|
||||||
BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server
|
|
||||||
EXAMPLE_DESC= Compile "Example Storage" statically in server
|
|
||||||
FEDERATED_DESC= Compile "Federated Storage" statically in server
|
|
||||||
INNOBASE_DESC= Compile "InnoDB Storage" statically in server
|
|
||||||
PARTITION_DESC= Compile "Partitioning support Storage" statically in server
|
|
||||||
PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server
|
|
||||||
|
|
||||||
ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1
|
|
||||||
BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1
|
|
||||||
EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1
|
|
||||||
FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1
|
|
||||||
INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1
|
|
||||||
PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1
|
|
||||||
PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1
|
|
||||||
|
|
||||||
OPTIONS_GROUP+= FEATURES
|
|
||||||
FEATURES_DESC= Default features knobs
|
|
||||||
OPTIONS_GROUP_FEATURES= PERFSCHM
|
|
||||||
PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage)
|
|
||||||
OPTIONS_DEFAULT+= PERFSCHM
|
|
||||||
|
|
||||||
PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
|
|
||||||
PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
|
|
||||||
FEDERATED_SUB_LIST+= FEDER="--federated"
|
|
||||||
FEDERATED_SUB_LIST_OFF+= FEDER=""
|
|
||||||
|
|
||||||
# issue 220865: Currently there's no source to be built with server-side support.
|
|
||||||
# But this keeps the pkg-plist not overlaping
|
|
||||||
CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.port.options.mk>
|
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
|
||||||
|
|
||||||
.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
|
|
||||||
IGNORE= Upstream only supports OpenSSL 1.0.1 upto 1.1.X
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${SSL_DEFAULT} == base
|
|
||||||
CMAKE_ARGS+= -DWITH_SSL=system
|
|
||||||
.else
|
|
||||||
CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${CHOSEN_COMPILER_TYPE} == gcc
|
|
||||||
CXXFLAGS+= -fpermissive
|
|
||||||
.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
|
|
||||||
# issue 220865: MySQL developers forgot that FreeBSD != Linux
|
|
||||||
@${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
|
|
||||||
${WRKSRC}/configure.cmake
|
|
||||||
@${REINPLACE_CMD} -e 's|__clang__|__undefined__|g' \
|
|
||||||
${WRKSRC}/boost/boost_1_59_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp
|
|
||||||
|
|
||||||
.if !defined(CLIENT_ONLY)
|
|
||||||
post-install:
|
|
||||||
${MKDIR} ${STAGEDIR}${ETCDIR}
|
|
||||||
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
|
|
||||||
${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
|
|
||||||
${MKDIR} ${STAGEDIR}${MY_SECDIR}
|
|
||||||
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.port.post.mk>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
TIMESTAMP = 1700161934
|
|
||||||
SHA256 (mysql-boost-5.7.44.tar.gz) = b8fe262c4679cb7bbc379a3f1addc723844db168628ce2acf78d33906849e491
|
|
||||||
SIZE (mysql-boost-5.7.44.tar.gz) = 53298645
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- config.h.cmake.orig 2014-12-05 16:24:02 UTC
|
|
||||||
+++ config.h.cmake
|
|
||||||
@@ -151,7 +151,8 @@
|
|
||||||
#cmakedefine HAVE_FESETROUND 1
|
|
||||||
#cmakedefine HAVE_FINITE 1
|
|
||||||
#cmakedefine HAVE_FP_EXCEPT 1
|
|
||||||
-#cmakedefine HAVE_FPSETMASK 1
|
|
||||||
+#cmakedefine HAVE_FPSETMASK 0
|
|
||||||
+#cmakedefine HAVE_FEDISABLEEXCEPT 1
|
|
||||||
#cmakedefine HAVE_FSEEKO 1
|
|
||||||
#cmakedefine HAVE_FSYNC 1
|
|
||||||
#cmakedefine HAVE_FTIME 1
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
[client]
|
|
||||||
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
|
|
||||||
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
|
|
||||||
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
|
|
||||||
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
|
|
||||||
net_retry_count = 16384
|
|
||||||
key_buffer_size = 256M
|
|
||||||
max_allowed_packet = 64M
|
|
||||||
query_cache_type = 0
|
|
||||||
query_cache_size = 0
|
|
||||||
long_query_time = 0.5
|
|
||||||
innodb_buffer_pool_size = 1G
|
|
||||||
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
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# PROVIDE: mysql
|
|
||||||
# REQUIRE: LOGIN
|
|
||||||
# KEYWORD: shutdown
|
|
||||||
|
|
||||||
#
|
|
||||||
# Add the following line to /etc/rc.conf to enable mysql:
|
|
||||||
# mysql_enable (bool): Set to "NO" by default.
|
|
||||||
# Set it to "YES" to enable MySQL.
|
|
||||||
# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
|
|
||||||
# Base database directory.
|
|
||||||
# mysql_confdir (str): Default to "%%ETCDIR%%"
|
|
||||||
# Base configuration directory.
|
|
||||||
# mysql_optfile (str): Server-specific option file.
|
|
||||||
# Set it in the rc.conf or default behaviour of
|
|
||||||
# `mysqld_safe` itself, will be picking
|
|
||||||
# ${mysql_confdir}/my.cnf if it exists.
|
|
||||||
# mysql_pidfile (str): Custom PID file path and name.
|
|
||||||
# Default to "${mysql_dbdir}/${hostname}.pid".
|
|
||||||
# mysql_args (str): Custom additional arguments to be passed
|
|
||||||
# to mysqld_safe (default empty).
|
|
||||||
#
|
|
||||||
|
|
||||||
. /etc/rc.subr
|
|
||||||
|
|
||||||
name="mysql"
|
|
||||||
rcvar=mysql_enable
|
|
||||||
|
|
||||||
load_rc_config $name
|
|
||||||
|
|
||||||
: ${mysql_enable="NO"}
|
|
||||||
: ${mysql_dbdir="%%MY_DBDIR%%"}
|
|
||||||
: ${mysql_confdir="%%ETCDIR%%"}
|
|
||||||
if [ -f "${mysql_confdir}/my.cnf" ]; then
|
|
||||||
: ${mysql_optfile="${mysql_confdir}/my.cnf"}
|
|
||||||
elif [ -f "${mysql_dbdir}/my.cnf" ]; then
|
|
||||||
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
|
|
||||||
fi
|
|
||||||
if [ ! -z "${mysql_optfile}" ]; then
|
|
||||||
mysql_extra="--defaults-extra-file=${mysql_optfile}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
mysql_user="mysql"
|
|
||||||
: ${hostname:=`/bin/hostname`}
|
|
||||||
pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
|
|
||||||
command="/usr/sbin/daemon"
|
|
||||||
command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
|
|
||||||
procname="%%PREFIX%%/libexec/mysqld"
|
|
||||||
start_precmd="${name}_prestart"
|
|
||||||
start_postcmd="${name}_poststart"
|
|
||||||
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
|
|
||||||
mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}"
|
|
||||||
|
|
||||||
mysql_create_auth_tables()
|
|
||||||
{
|
|
||||||
eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
mysql_prestart()
|
|
||||||
{
|
|
||||||
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
|
|
||||||
mysql_create_auth_tables || return 1
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
mysql_poststart()
|
|
||||||
{
|
|
||||||
local timeout=15
|
|
||||||
while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
|
|
||||||
timeout=$(( timeout - 1 ))
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
run_rc_command "$1"
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
--- CMakeLists.txt.orig 2021-07-26 19:43:45.021975000 +0200
|
|
||||||
+++ CMakeLists.txt 2021-07-26 19:49:38.318138000 +0200
|
|
||||||
@@ -715,12 +715,10 @@ IF(UNIX)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
IF(NOT WITHOUT_SERVER)
|
|
||||||
- ADD_SUBDIRECTORY(testclients)
|
|
||||||
ADD_SUBDIRECTORY(sql)
|
|
||||||
OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
|
|
||||||
IF(WITH_EMBEDDED_SERVER)
|
|
||||||
ADD_SUBDIRECTORY(libmysqld)
|
|
||||||
- ADD_SUBDIRECTORY(libmysqld/examples)
|
|
||||||
ENDIF(WITH_EMBEDDED_SERVER)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
@@ -729,8 +727,6 @@ ENDIF()
|
|
||||||
ADD_SUBDIRECTORY(scripts)
|
|
||||||
|
|
||||||
IF(NOT WITHOUT_SERVER)
|
|
||||||
- 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)
|
|
||||||
@@ -789,6 +785,7 @@ ENDIF()
|
|
||||||
#
|
|
||||||
# RPM installs documentation directly from the source tree
|
|
||||||
#
|
|
||||||
+IF(FALSE)
|
|
||||||
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
||||||
INSTALL(FILES
|
|
||||||
README
|
|
||||||
@@ -808,6 +805,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
||||||
PATTERN "mysql.info" EXCLUDE
|
|
||||||
PATTERN "sp-imp-spec.txt" EXCLUDE
|
|
||||||
)
|
|
||||||
+ENDIF()
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
INCLUDE(CPack)
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
--- client/CMakeLists.txt.orig 2019-09-27 09:00:15.000000000 +0200
|
|
||||||
+++ client/CMakeLists.txt 2019-11-24 17:42:52.649644000 +0100
|
|
||||||
@@ -38,17 +38,17 @@
|
|
||||||
|
|
||||||
## Subdirectory with common client code.
|
|
||||||
ADD_SUBDIRECTORY(base)
|
|
||||||
-## Subdirectory for mysqlpump code.
|
|
||||||
-ADD_SUBDIRECTORY(dump)
|
|
||||||
|
|
||||||
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
|
|
||||||
|
|
||||||
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
||||||
IF(UNIX)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
|
|
||||||
ENDIF(UNIX)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
IF(NOT WITHOUT_SERVER)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_upgrade
|
|
||||||
@@ -69,6 +69,7 @@
|
|
||||||
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
|
|
||||||
|
|
||||||
@@ -81,10 +82,12 @@
|
|
||||||
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
||||||
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
||||||
ADD_COMPILE_FLAGS(
|
|
||||||
mysqlbinlog.cc
|
|
||||||
@@ -101,6 +104,7 @@
|
|
||||||
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
||||||
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
||||||
@@ -116,9 +120,11 @@
|
|
||||||
ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
+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)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
||||||
IF(WIN32)
|
|
||||||
@@ -127,11 +133,6 @@
|
|
||||||
|
|
||||||
SET_TARGET_PROPERTIES (
|
|
||||||
mysql_plugin
|
|
||||||
- mysqlcheck
|
|
||||||
- mysqldump
|
|
||||||
- mysqlimport
|
|
||||||
- mysqlshow
|
|
||||||
- mysqlslap
|
|
||||||
PROPERTIES HAS_CXX TRUE)
|
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DHAVE_DLOPEN)
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC
|
|
||||||
+++ cmake/build_configurations/compiler_options.cmake
|
|
||||||
@@ -43,7 +43,7 @@ IF(UNIX)
|
|
||||||
|
|
||||||
# Default GCC flags
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
|
||||||
- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
+ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
# Disable inline optimizations for valgrind testing to avoid false positives
|
|
||||||
IF(WITH_VALGRIND)
|
|
||||||
STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
|
|
||||||
@@ -68,7 +68,7 @@ IF(UNIX)
|
|
||||||
ENDIF()
|
|
||||||
ENDIF()
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
+ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
|
||||||
# GCC 6 has C++14 as default, set it explicitly to the old default.
|
|
||||||
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
|
|
||||||
OUTPUT_VARIABLE GXX_VERSION)
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC
|
|
||||||
+++ cmake/os/FreeBSD.cmake
|
|
||||||
@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
|
|
||||||
IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
|
|
||||||
MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
|
|
||||||
ENDIF()
|
|
||||||
+ 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()
|
|
||||||
ELSE()
|
|
||||||
MESSAGE(FATAL_ERROR "Unsupported compiler!")
|
|
||||||
ENDIF()
|
|
||||||
@@ -38,4 +52,6 @@ ENDIF()
|
|
||||||
# Should not be needed any more, but kept for easy resurrection if needed
|
|
||||||
# #Legacy option, maybe not needed anymore , taken as is from autotools build
|
|
||||||
# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
|
|
||||||
-
|
|
||||||
+# For GCC maybe it's also good idea to use
|
|
||||||
+# ADD_DEFINITIONS(-D_GNU_SOURCE)
|
|
||||||
+
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
|
|
||||||
+++ cmake/plugin.cmake
|
|
||||||
@@ -263,13 +270,17 @@ 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})
|
|
||||||
+ IF(CMAKE_BUILD_TYPE MATCHES "Debug")
|
|
||||||
+ INSTALL_DEBUG_TARGET(${target}
|
|
||||||
+ DESTINATION ${INSTALL_PLUGINDIR}/debug
|
|
||||||
+ COMPONENT ${INSTALL_COMPONENT})
|
|
||||||
+ # Add installed files to list for RPMs
|
|
||||||
+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
|
|
||||||
+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
|
|
||||||
+ ENDIF()
|
|
||||||
# Add installed files to list for RPMs
|
|
||||||
FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
|
|
||||||
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
|
|
||||||
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
|
|
||||||
+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
|
|
||||||
# For internal testing in PB2, append collections files
|
|
||||||
IF(DEFINED ENV{PB2WORKDIR})
|
|
||||||
PLUGIN_APPEND_COLLECTIONS(${plugin})
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
--- cmake/ssl.cmake.orig 2023-11-10 17:37:52.213133000 +0100
|
|
||||||
+++ cmake/ssl.cmake 2023-11-10 17:50:19.620626000 +0100
|
|
||||||
@@ -232,30 +232,21 @@ MACRO (MYSQL_CHECK_SSL)
|
|
||||||
MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
- # On mac this list is <.dylib;.so;.a>
|
|
||||||
- # We prefer static libraries, so we reverse it here.
|
|
||||||
- IF (WITH_SSL_PATH)
|
|
||||||
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
|
|
||||||
- MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
|
|
||||||
- ENDIF()
|
|
||||||
-
|
|
||||||
FIND_LIBRARY(OPENSSL_LIBRARY
|
|
||||||
NAMES ssl libssl ssleay32 ssleay32MD
|
|
||||||
HINTS ${OPENSSL_ROOT_DIR}/lib)
|
|
||||||
FIND_LIBRARY(CRYPTO_LIBRARY
|
|
||||||
NAMES crypto libcrypto libeay32
|
|
||||||
HINTS ${OPENSSL_ROOT_DIR}/lib)
|
|
||||||
- IF (WITH_SSL_PATH)
|
|
||||||
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
|
|
||||||
- ENDIF()
|
|
||||||
|
|
||||||
IF(OPENSSL_INCLUDE_DIR)
|
|
||||||
FIND_OPENSSL_VERSION()
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
- IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
|
|
||||||
- ADD_DEFINITIONS(-DHAVE_TLSv13)
|
|
||||||
- SET(HAVE_TLSv13 1)
|
|
||||||
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
|
|
||||||
+ IF(HAVE_TLS1_3_VERSION)
|
|
||||||
+ #ADD_DEFINITIONS(-DHAVE_TLSv13)
|
|
||||||
+ #SET(HAVE_TLSv13 1)
|
|
||||||
IF(SOLARIS)
|
|
||||||
SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
|
|
||||||
ENDIF()
|
|
||||||
@@ -263,8 +254,13 @@ MACRO (MYSQL_CHECK_SSL)
|
|
||||||
IF(OPENSSL_INCLUDE_DIR AND
|
|
||||||
OPENSSL_LIBRARY AND
|
|
||||||
CRYPTO_LIBRARY AND
|
|
||||||
- (OPENSSL_MAJOR_VERSION STREQUAL "1" OR
|
|
||||||
- OPENSSL_MAJOR_VERSION STREQUAL "3")
|
|
||||||
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
|
|
||||||
+ )
|
|
||||||
+ SET(OPENSSL_FOUND TRUE)
|
|
||||||
+ ELSEIF(OPENSSL_INCLUDE_DIR AND
|
|
||||||
+ OPENSSL_LIBRARY AND
|
|
||||||
+ CRYPTO_LIBRARY AND
|
|
||||||
+ OPENSSL_MAJOR_VERSION STREQUAL "2"
|
|
||||||
)
|
|
||||||
SET(OPENSSL_FOUND TRUE)
|
|
||||||
ELSE()
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/CMakeLists.txt
|
|
||||||
@@ -69,14 +69,13 @@ SET(HEADERS
|
|
||||||
${HEADERS_GEN_CONFIGURE}
|
|
||||||
)
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
INSTALL(FILES
|
|
||||||
../libbinlogevents/export/binary_log_types.h
|
|
||||||
DESTINATION ${INSTALL_INCLUDEDIR}
|
|
||||||
- COMPONENT Development)
|
|
||||||
-INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
|
|
||||||
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development
|
|
||||||
PATTERN "*.h"
|
|
||||||
PATTERN "psi_abi*" EXCLUDE
|
|
||||||
)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- include/my_compare.h.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/my_compare.h
|
|
||||||
@@ -40,7 +40,7 @@ extern "C" {
|
|
||||||
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
|
|
||||||
+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
|
|
||||||
#define HA_MAX_KEY_SEG 16 /* Max segments for key */
|
|
||||||
|
|
||||||
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
--- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/my_thread_os_id.h
|
|
||||||
@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
|
|
||||||
return pthread_getthreadid_np();
|
|
||||||
#else
|
|
||||||
#ifdef HAVE_INTEGER_PTHREAD_SELF
|
|
||||||
+# ifdef __DragonFly__
|
|
||||||
+ return syscall(SYS_lwp_gettid);
|
|
||||||
+# else
|
|
||||||
/* Unknown platform, fallback. */
|
|
||||||
return pthread_self();
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
/* Feature not available. */
|
|
||||||
return 0;
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- include/my_openssl.h.orig 2020-03-23 17:35:17 UTC
|
|
||||||
+++ include/my_openssl.h
|
|
||||||
@@ -51,7 +51,7 @@ extern "C" {
|
|
||||||
*/
|
|
||||||
static inline int mysql_OPENSSL_init()
|
|
||||||
{
|
|
||||||
-#if defined(HAVE_STATIC_OPENSSL)
|
|
||||||
+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
|
|
||||||
#else
|
|
||||||
return SSL_library_init();
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- include/myisam.h.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ include/myisam.h
|
|
||||||
@@ -45,7 +45,7 @@ extern "C" {
|
|
||||||
The following defines can be increased if necessary.
|
|
||||||
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
|
|
||||||
*/
|
|
||||||
-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
|
|
||||||
+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
|
|
||||||
#define MI_MAX_KEY_SEG 16 /* Max segments for key */
|
|
||||||
|
|
||||||
#define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
--- libmysql/CMakeLists.txt.orig 2019-09-27 09:00:15.000000000 +0200
|
|
||||||
+++ libmysql/CMakeLists.txt 2019-11-24 17:45:54.008082000 +0100
|
|
||||||
@@ -266,7 +266,7 @@
|
|
||||||
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})
|
|
||||||
|
|
||||||
# Visual Studio users need debug static library for debug projects
|
|
||||||
@@ -312,8 +312,9 @@
|
|
||||||
# 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})
|
|
||||||
+IF(FALSE)
|
|
||||||
IF(UNIX)
|
|
||||||
# libtool compatability
|
|
||||||
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
|
|
||||||
@@ -369,6 +370,7 @@
|
|
||||||
# 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()
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
--- libmysql/authentication_ldap/CMakeLists.txt.orig 2020-01-16 09:39:09.585385000 +0100
|
|
||||||
+++ libmysql/authentication_ldap/CMakeLists.txt 2020-01-16 09:41:59.054985000 +0100
|
|
||||||
@@ -47,6 +47,7 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H)
|
|
||||||
CROAK_AND_RETURN("Required LBER header is missing.")
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
+IF (WITH_AUTHENTICATION_LDAP)
|
|
||||||
MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
|
|
||||||
auth_ldap_sasl_client.cc
|
|
||||||
log_client.cc
|
|
||||||
@@ -57,6 +58,7 @@ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
|
|
||||||
CLIENT_ONLY
|
|
||||||
MODULE_ONLY
|
|
||||||
MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
|
|
||||||
+ENDIF ()
|
|
||||||
|
|
||||||
# The plugin may need symbols which are not loaded by the client.
|
|
||||||
IF(STATIC_SASL_LIBRARY)
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
--- libservices/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ libservices/CMakeLists.txt
|
|
||||||
@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
|
|
||||||
mysql_keyring_service.c)
|
|
||||||
|
|
||||||
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
|
|
||||||
+IF(FALSE)
|
|
||||||
INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
|
|
||||||
+ENDIF()
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
|
|
||||||
+++ man/CMakeLists.txt
|
|
||||||
@@ -15,8 +15,6 @@
|
|
||||||
|
|
||||||
# Copy man pages
|
|
||||||
FILE(GLOB MAN1_FILES *.1)
|
|
||||||
-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
|
|
||||||
-FILE(GLOB MAN1_NDB ndb*.1)
|
|
||||||
FILE(GLOB MAN8_FILES *.8)
|
|
||||||
FILE(GLOB MAN8_NDB ndb*.8)
|
|
||||||
IF(MAN1_FILES)
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
|
|
||||||
+++ mysys_ssl/my_default.cc
|
|
||||||
@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
|
|
||||||
|
|
||||||
/* Which directories are searched for options (and in which order) */
|
|
||||||
|
|
||||||
-#define MAX_DEFAULT_DIRS 6
|
|
||||||
+#define MAX_DEFAULT_DIRS 7
|
|
||||||
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
|
|
||||||
static const char **default_directories = NULL;
|
|
||||||
|
|
||||||
@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
|
|
||||||
return 1; /* Ignore wrong files */
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (strstr(name, "/etc") == name)
|
|
||||||
+ {
|
|
||||||
+ fprintf(stderr,
|
|
||||||
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
|
|
||||||
+ name,name);
|
|
||||||
+ goto err;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
|
|
||||||
{
|
|
||||||
line++;
|
|
||||||
@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
|
|
||||||
end[(strlen(end)-1)] = ' ';
|
|
||||||
else
|
|
||||||
strxmov(end, conf_file, *ext , " ", NullS);
|
|
||||||
- fputs(name, stdout);
|
|
||||||
+ if (strstr(name, "/etc") != name)
|
|
||||||
+ fputs(name, stdout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1411,13 +1420,8 @@ static const char **init_default_directo
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
- errors += add_directory(alloc, "/etc/", dirs);
|
|
||||||
- errors += add_directory(alloc, "/etc/mysql/", dirs);
|
|
||||||
-
|
|
||||||
-#if defined(DEFAULT_SYSCONFDIR)
|
|
||||||
- if (DEFAULT_SYSCONFDIR[0])
|
|
||||||
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
|
|
||||||
-#endif /* DEFAULT_SYSCONFDIR */
|
|
||||||
+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
|
|
||||||
+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
|
|
||||||
MY_STAT stat_info;
|
|
||||||
|
|
||||||
if (!my_stat(file_name,&stat_info,MYF(0)))
|
|
||||||
- return 1;
|
|
||||||
+ return 0;
|
|
||||||
/*
|
|
||||||
Ignore .mylogin.cnf file if not exclusively readable/writable
|
|
||||||
by current user.
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- mysys_ssl/my_kdf.cc.orig 2022-11-04 07:47:44 UTC
|
|
||||||
+++ mysys_ssl/my_kdf.cc
|
|
||||||
@@ -59,7 +59,7 @@ int create_kdf_key(const unsigned char *key, const uns
|
|
||||||
Key_derivation_function *kdf_function = NULL;
|
|
||||||
|
|
||||||
if (kdf_name == "hkdf") {
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
kdf_function = new Key_hkdf_function(kdf_options);
|
|
||||||
#else
|
|
||||||
return 1;
|
|
||||||
@@ -87,7 +87,7 @@ Key_derivation_function::Key_derivation_function() {
|
|
||||||
options_valid_ = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) {
|
|
||||||
kdf_options_ = kdf_options;
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- mysys_ssl/my_kdf.h.orig 2022-11-04 07:47:17 UTC
|
|
||||||
+++ mysys_ssl/my_kdf.h
|
|
||||||
@@ -61,7 +61,7 @@ class Key_derivation_function {
|
|
||||||
bool options_valid_;
|
|
||||||
};
|
|
||||||
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
|
|
||||||
/** Class to implement KDF method hkdf. */
|
|
||||||
class Key_hkdf_function : public Key_derivation_function {
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- plugin/password_validation/validate_password.cc.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ plugin/password_validation/validate_password.cc
|
|
||||||
@@ -18,6 +18,8 @@
|
|
||||||
#include <mysql/plugin_validate_password.h>
|
|
||||||
#include <mysql/service_my_plugin_log.h>
|
|
||||||
#include <mysql/service_mysql_string.h>
|
|
||||||
+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
|
|
||||||
+#undef test
|
|
||||||
#include <set>
|
|
||||||
#include <iostream>
|
|
||||||
#include <fstream>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig 2019-04-13 13:32:15 UTC
|
|
||||||
+++ rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
|
||||||
@@ -29,7 +29,6 @@
|
|
||||||
#include <google/protobuf/io/tokenizer.h>
|
|
||||||
#include <google/protobuf/io/zero_copy_stream.h>
|
|
||||||
#include <google/protobuf/wire_format_lite.h>
|
|
||||||
-#include <google/protobuf/wire_format_lite_inl.h>
|
|
||||||
#include <google/protobuf/dynamic_message.h>
|
|
||||||
|
|
||||||
#include "mysqlx_connection.pb.h"
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2021-03-26 06:58:52 UTC
|
|
||||||
+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc
|
|
||||||
@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
|
|
||||||
donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"),
|
|
||||||
0,
|
|
||||||
NULL, NULL,
|
|
||||||
+ false,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
- NULL,
|
|
||||||
- NULL,
|
|
||||||
+ false,
|
|
||||||
DEFAULT_THREAD_PRIORITY,
|
|
||||||
1, false, true, true);
|
|
||||||
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
--- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2020-03-23 17:35:17 UTC
|
|
||||||
+++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
|
|
||||||
@@ -232,7 +232,7 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx,
|
|
||||||
const char* tls_version)
|
|
||||||
{
|
|
||||||
DH *dh= NULL;
|
|
||||||
-#ifdef HAVE_TLSv13
|
|
||||||
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
/* We support TLS up to 1.2, so explicitly disable TLS 1.3. */
|
|
||||||
long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3;
|
|
||||||
#else
|
|
||||||
@@ -257,14 +257,14 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx,
|
|
||||||
SSL_OP_NO_TLSv1 |
|
|
||||||
SSL_OP_NO_TLSv1_1
|
|
||||||
| SSL_OP_NO_TLSv1_2
|
|
||||||
-#ifdef HAVE_TLSv13
|
|
||||||
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
| SSL_OP_NO_TLSv1_3
|
|
||||||
#endif /* HAVE_TLSv13 */
|
|
||||||
);
|
|
||||||
|
|
||||||
SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
|
|
||||||
|
|
||||||
-#ifdef HAVE_TLSv13
|
|
||||||
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
/* We do not support TLS 1.3.
|
|
||||||
Setting empty TLS 1.3 ciphersuites disables them. */
|
|
||||||
if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0)
|
|
||||||
@@ -529,7 +529,7 @@ int xcom_init_ssl(const char *server_key_file, const c
|
|
||||||
break e.g. ODBC clients (if the client also uses SSL).
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#if defined(HAVE_STATIC_OPENSSL)
|
|
||||||
+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
|
|
||||||
#else
|
|
||||||
SSL_library_init();
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC
|
|
||||||
+++ rapid/plugin/x/CMakeLists.txt
|
|
||||||
@@ -92,13 +92,14 @@ ELSE()
|
|
||||||
${CMAKE_SOURCE_DIR}/include #temporary
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/generated
|
|
||||||
- ${SSL_INCLUDE_DIRS}
|
|
||||||
+ ${BOOST_INCLUDE_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
|
||||||
- ${BOOST_INCLUDE_DIR}
|
|
||||||
${PROTOBUF_INCLUDE_DIRS}
|
|
||||||
${LIBEVENT_INCLUDE_DIRS}
|
|
||||||
+ ${SSL_INCLUDE_DIRS}
|
|
||||||
+ ${ZLIB_INCLUDE_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
IF(XPLUGIN_NO_LITE_PROTOBUF)
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
--- rapid/plugin/x/mysqlx_configure.cmake.orig 2016-09-14 15:25:26 UTC
|
|
||||||
+++ rapid/plugin/x/mysqlx_configure.cmake
|
|
||||||
@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
|
|
||||||
CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
|
|
||||||
DESTINATION ${INSTALL_INCLUDEDIR}
|
|
||||||
COMPONENT Developement)
|
|
||||||
@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
|
|
||||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
|
|
||||||
DESTINATION ${INSTALL_INCLUDEDIR}
|
|
||||||
COMPONENT Developement)
|
|
||||||
+ENDIF()
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ rapid/unittest/gunit/xplugin/CMakeLists.txt
|
|
||||||
@@ -65,7 +65,6 @@ ENDIF()
|
|
||||||
ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
|
||||||
- ${BOOST_INCLUDE_DIR}
|
|
||||||
${PROTOBUF_INCLUDE_DIRS}
|
|
||||||
${SSL_INCLUDE_DIRS}
|
|
||||||
${LIBEVENT_INCLUDE_DIR}
|
|
||||||
@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|
||||||
)
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
|
||||||
+ ${BOOST_INCLUDE_DIR}
|
|
||||||
${CMAKE_SOURCE_DIR}/testing/include
|
|
||||||
${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
|
|
||||||
${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400
|
|
||||||
+++ scripts/CMakeLists.txt 2019-08-01 10:10:16.206052000 -0400
|
|
||||||
@@ -326,6 +326,8 @@
|
|
||||||
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
|
|
||||||
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
|
|
||||||
SET(${var} "${${var}}-l${lib} " )
|
|
||||||
+ ELSEIF(lib STREQUAL "-pthread")
|
|
||||||
+ SET(${var} "${${var}}-pthread " )
|
|
||||||
ELSE()
|
|
||||||
SET(${var} "${${var}}-l${lib} " )
|
|
||||||
ENDIF()
|
|
||||||
@@ -411,14 +413,13 @@
|
|
||||||
# On Unix, most of the files end up in the bin directory
|
|
||||||
SET(mysql_config_COMPONENT COMPONENT Development)
|
|
||||||
|
|
||||||
+
|
|
||||||
IF(WITH_SYSTEMD)
|
|
||||||
SET(BIN_SCRIPTS
|
|
||||||
- mysql_config
|
|
||||||
mysqldumpslow
|
|
||||||
)
|
|
||||||
ELSE()
|
|
||||||
SET(BIN_SCRIPTS
|
|
||||||
- mysql_config
|
|
||||||
mysqldumpslow
|
|
||||||
mysqld_multi
|
|
||||||
mysqld_safe
|
|
||||||
@@ -446,7 +447,7 @@
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
||||||
ESCAPE_QUOTES @ONLY)
|
|
||||||
|
|
||||||
- IF(INSTALL_PKGCONFIGDIR)
|
|
||||||
+ IF(FALSE)
|
|
||||||
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
|
|
||||||
INSTALL(FILES
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
||||||
@@ -452,7 +453,7 @@
|
|
||||||
FOREACH(file ${BIN_SCRIPTS})
|
|
||||||
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
|
||||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
|
||||||
- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
|
||||||
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
|
|
||||||
ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
|
|
||||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- scripts/mysqld_safe.sh.orig 2020-06-02 11:05:42 UTC
|
|
||||||
+++ scripts/mysqld_safe.sh
|
|
||||||
@@ -359,7 +359,7 @@ mysqld_ld_preload_text() {
|
|
||||||
# running mysqld. See ld.so for details.
|
|
||||||
set_malloc_lib() {
|
|
||||||
# This list is kept intentionally simple.
|
|
||||||
- malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu"
|
|
||||||
+ malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib"
|
|
||||||
malloc_lib="$1"
|
|
||||||
|
|
||||||
# Allow --malloc-lib='' to override other settings
|
|
||||||
@@ -378,6 +378,7 @@ set_malloc_lib() {
|
|
||||||
/usr/lib64) ;;
|
|
||||||
/usr/lib/i386-linux-gnu) ;;
|
|
||||||
/usr/lib/x86_64-linux-gnu) ;;
|
|
||||||
+ /usr/local/lib) ;;
|
|
||||||
*)
|
|
||||||
log_error "--malloc-lib must be located in one of the directories: $malloc_dirs"
|
|
||||||
exit 1
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- sql/CMakeLists.txt.orig 2021-07-26 19:53:15.028262000 +0200
|
|
||||||
+++ sql/CMakeLists.txt 2021-07-26 19:55:42.226384000 +0200
|
|
||||||
@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES(
|
|
||||||
${CMAKE_SOURCE_DIR}/regex
|
|
||||||
${SSL_INCLUDE_DIRS}
|
|
||||||
${CMAKE_BINARY_DIR}/sql
|
|
||||||
+ ${CMAKE_BINARY_DIR}/include
|
|
||||||
+ ${CMAKE_BINARY_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(CONF_SOURCES
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- sql/auth/sha2_password_common.cc
|
|
||||||
+++ sql/auth/sha2_password_common.cc
|
|
||||||
@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
|
|
||||||
DBUG_RETURN(true);
|
|
||||||
}
|
|
||||||
m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
|
|
||||||
-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
|
|
||||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
|
|
||||||
EVP_MD_CTX_cleanup(md_context);
|
|
||||||
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
||||||
EVP_MD_CTX_reset(md_context);
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
--- sql/conn_handler/socket_connection.cc.orig 2017-03-18 07:45:14 UTC
|
|
||||||
+++ sql/conn_handler/socket_connection.cc
|
|
||||||
@@ -942,22 +942,25 @@ 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);
|
|
||||||
|
|
||||||
- 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));
|
|
||||||
+ "refused connect from %s", 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);
|
|
||||||
+ ((void (*)(int)) (req.sink))(req.fd);
|
|
||||||
#else
|
|
||||||
// Some distros have not patched tcpd.h
|
|
||||||
if (req.sink)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC
|
|
||||||
+++ sql/locks/shared_spin_lock.cc
|
|
||||||
@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or
|
|
||||||
#if defined(__APPLE__)
|
|
||||||
my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
|
|
||||||
#else
|
|
||||||
- my_atomic_store64(&this->m_exclusive_owner, self);
|
|
||||||
+ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
|
|
||||||
#endif
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- sql/mysqld.cc.orig 2019-09-27 09:00:15.000000000 +0200
|
|
||||||
+++ sql/mysqld.cc 2019-11-24 17:47:52.395539000 +0100
|
|
||||||
@@ -3419,7 +3419,7 @@
|
|
||||||
static int init_ssl()
|
|
||||||
{
|
|
||||||
#ifdef HAVE_OPENSSL
|
|
||||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
CRYPTO_malloc_init();
|
|
||||||
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
||||||
OPENSSL_malloc_init();
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
--- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ sql/sys_vars.cc
|
|
||||||
@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
|
|
||||||
"connection before closing it",
|
|
||||||
SESSION_VAR(net_interactive_timeout),
|
|
||||||
CMD_LINE(REQUIRED_ARG),
|
|
||||||
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
|
|
||||||
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
|
|
||||||
|
|
||||||
static Sys_var_ulong Sys_join_buffer_size(
|
|
||||||
"join_buffer_size",
|
|
||||||
@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
|
|
||||||
"Number of seconds to wait for more data from a connection before "
|
|
||||||
"aborting the read",
|
|
||||||
SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
|
|
||||||
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
|
|
||||||
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
|
|
||||||
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
|
|
||||||
ON_UPDATE(fix_net_read_timeout));
|
|
||||||
|
|
||||||
@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
|
|
||||||
"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),
|
|
||||||
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
|
|
||||||
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
|
|
||||||
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
|
|
||||||
ON_UPDATE(fix_net_write_timeout));
|
|
||||||
|
|
||||||
@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
|
|
||||||
"The number of seconds the server waits for activity on a "
|
|
||||||
"connection before closing it",
|
|
||||||
SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
|
|
||||||
- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
|
|
||||||
+ VALID_RANGE(1, INT_MAX32/1000),
|
|
||||||
DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
|
|
||||||
|
|
||||||
static Sys_var_plugin Sys_default_storage_engine(
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- storage/innobase/fsp/fsp0fsp.cc.orig 2021-03-26 06:58:52 UTC
|
|
||||||
+++ storage/innobase/fsp/fsp0fsp.cc
|
|
||||||
@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info(
|
|
||||||
|
|
||||||
if (elen == MY_AES_BAD_DATA) {
|
|
||||||
my_free(master_key);
|
|
||||||
- return(NULL);
|
|
||||||
+ return(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check checksum bytes. */
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ storage/innobase/include/srv0mon.h
|
|
||||||
@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang
|
|
||||||
/* Required for FreeBSD so that INT64_MAX is defined. */
|
|
||||||
#define __STDC_LIMIT_MACROS
|
|
||||||
#endif /* __STDC_LIMIT_MACROS */
|
|
||||||
+#ifdef __DragonFly__
|
|
||||||
+/* The hack above doen't work for dragonfly, stdint.h already imported */
|
|
||||||
+#include <machine/int_limits.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
--- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ storage/myisam/mi_dynrec.c
|
|
||||||
@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
|
|
||||||
DBUG_RETURN(1);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
- I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
|
|
||||||
- MAP_NORESERVE
|
|
||||||
- Do not reserve swap space for this mapping. When swap space is
|
|
||||||
- reserved, one has the guarantee that it is possible to modify the
|
|
||||||
- mapping. When swap space is not reserved one might get SIGSEGV
|
|
||||||
- upon a write if no physical memory is available.
|
|
||||||
+ MAP_NORESERVE is unimplemented in FreeBSD
|
|
||||||
*/
|
|
||||||
info->s->file_map= (uchar*)
|
|
||||||
my_mmap(0, (size_t) size,
|
|
||||||
info->s->mode==O_RDONLY ? PROT_READ :
|
|
||||||
PROT_READ | PROT_WRITE,
|
|
||||||
- MAP_SHARED | MAP_NORESERVE,
|
|
||||||
+ MAP_SHARED,
|
|
||||||
info->dfile, 0L);
|
|
||||||
if (info->s->file_map == (uchar*) MAP_FAILED)
|
|
||||||
{
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
||||||
+++ support-files/CMakeLists.txt
|
|
||||||
@@ -69,7 +69,9 @@ IF(UNIX)
|
|
||||||
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
+IF(FALSE)
|
|
||||||
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
SET(bindir ${prefix}/${INSTALL_BINDIR})
|
|
||||||
SET(sbindir ${prefix}/${INSTALL_SBINDIR})
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
[
|
|
||||||
{ type: install
|
|
||||||
message: <<EOM
|
|
||||||
Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
|
|
||||||
ie. when you want to use "mysql -u root -p" first you should see password
|
|
||||||
in /root/.mysql_secret
|
|
||||||
|
|
||||||
MySQL57 has a default %%ETCDIR%%/my.cnf,
|
|
||||||
remember to replace it with your own
|
|
||||||
or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
|
|
||||||
EOM
|
|
||||||
}
|
|
||||||
{ type: upgrade
|
|
||||||
message: <<EOM
|
|
||||||
Remember to run mysql_upgrade the first time you start the MySQL server
|
|
||||||
after an upgrade from an earlier version.
|
|
||||||
EOM
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
MySQL is a very fast, multi-threaded, multi-user and robust SQL
|
|
||||||
(Structured Query Language) database server.
|
|
||||||
@ -1,162 +0,0 @@
|
|||||||
bin/innochecksum
|
|
||||||
bin/lz4_decompress
|
|
||||||
bin/my_print_defaults
|
|
||||||
bin/myisam_ftdump
|
|
||||||
bin/myisamchk
|
|
||||||
bin/myisamlog
|
|
||||||
bin/myisampack
|
|
||||||
bin/mysql_install_db
|
|
||||||
bin/mysql_plugin
|
|
||||||
bin/mysql_secure_installation
|
|
||||||
bin/mysql_tzinfo_to_sql
|
|
||||||
bin/mysql_upgrade
|
|
||||||
bin/mysqld_multi
|
|
||||||
bin/mysqld_safe
|
|
||||||
bin/mysqldumpslow
|
|
||||||
bin/mysqltest
|
|
||||||
bin/mysqlxtest
|
|
||||||
bin/perror
|
|
||||||
bin/replace
|
|
||||||
bin/resolve_stack_dump
|
|
||||||
bin/resolveip
|
|
||||||
bin/zlib_decompress
|
|
||||||
lib/mysql/libmysqld.a
|
|
||||||
lib/mysql/plugin/adt_null.so
|
|
||||||
lib/mysql/plugin/auth.so
|
|
||||||
lib/mysql/plugin/auth_test_plugin.so
|
|
||||||
lib/mysql/plugin/connection_control.so
|
|
||||||
lib/mysql/plugin/daemon_example.ini
|
|
||||||
lib/mysql/plugin/group_replication.so
|
|
||||||
%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
|
|
||||||
lib/mysql/plugin/keyring_file.so
|
|
||||||
lib/mysql/plugin/keyring_udf.so
|
|
||||||
lib/mysql/plugin/libdaemon_example.so
|
|
||||||
lib/mysql/plugin/libtest_framework.so
|
|
||||||
lib/mysql/plugin/libtest_services.so
|
|
||||||
lib/mysql/plugin/libtest_services_threaded.so
|
|
||||||
lib/mysql/plugin/libtest_session_detach.so
|
|
||||||
lib/mysql/plugin/libtest_session_in_thd.so
|
|
||||||
lib/mysql/plugin/libtest_session_info.so
|
|
||||||
lib/mysql/plugin/libtest_sql_2_sessions.so
|
|
||||||
lib/mysql/plugin/libtest_sql_all_col_types.so
|
|
||||||
lib/mysql/plugin/libtest_sql_cmds_1.so
|
|
||||||
lib/mysql/plugin/libtest_sql_commit.so
|
|
||||||
lib/mysql/plugin/libtest_sql_complex.so
|
|
||||||
lib/mysql/plugin/libtest_sql_errors.so
|
|
||||||
lib/mysql/plugin/libtest_sql_lock.so
|
|
||||||
lib/mysql/plugin/libtest_sql_processlist.so
|
|
||||||
lib/mysql/plugin/libtest_sql_replication.so
|
|
||||||
lib/mysql/plugin/libtest_sql_shutdown.so
|
|
||||||
lib/mysql/plugin/libtest_sql_sqlmode.so
|
|
||||||
lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
|
|
||||||
lib/mysql/plugin/libtest_sql_views_triggers.so
|
|
||||||
lib/mysql/plugin/libtest_x_sessions_deinit.so
|
|
||||||
lib/mysql/plugin/libtest_x_sessions_init.so
|
|
||||||
lib/mysql/plugin/locking_service.so
|
|
||||||
lib/mysql/plugin/mypluglib.so
|
|
||||||
lib/mysql/plugin/mysql_no_login.so
|
|
||||||
lib/mysql/plugin/mysqlx.so
|
|
||||||
lib/mysql/plugin/qa_auth_client.so
|
|
||||||
lib/mysql/plugin/qa_auth_interface.so
|
|
||||||
lib/mysql/plugin/qa_auth_server.so
|
|
||||||
lib/mysql/plugin/replication_observers_example_plugin.so
|
|
||||||
lib/mysql/plugin/rewrite_example.so
|
|
||||||
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_udf_services.so
|
|
||||||
%%EXAMPLE%%lib/mysql/plugin/udf_example.so
|
|
||||||
lib/mysql/plugin/validate_password.so
|
|
||||||
lib/mysql/plugin/version_token.so
|
|
||||||
libexec/mysqld
|
|
||||||
share/info/mysql.info
|
|
||||||
share/man/man1/my_print_defaults.1.gz
|
|
||||||
share/man/man1/myisam_ftdump.1.gz
|
|
||||||
share/man/man1/myisamchk.1.gz
|
|
||||||
share/man/man1/myisamlog.1.gz
|
|
||||||
share/man/man1/myisampack.1.gz
|
|
||||||
share/man/man1/mysql.server.1.gz
|
|
||||||
share/man/man1/mysql_install_db.1.gz
|
|
||||||
share/man/man1/mysql_plugin.1.gz
|
|
||||||
share/man/man1/mysql_secure_installation.1.gz
|
|
||||||
share/man/man1/mysql_tzinfo_to_sql.1.gz
|
|
||||||
share/man/man1/mysql_upgrade.1.gz
|
|
||||||
share/man/man1/mysqld_multi.1.gz
|
|
||||||
share/man/man1/mysqld_safe.1.gz
|
|
||||||
share/man/man1/mysqldumpslow.1.gz
|
|
||||||
share/man/man1/mysqlman.1.gz
|
|
||||||
share/man/man1/perror.1.gz
|
|
||||||
share/man/man1/replace.1.gz
|
|
||||||
share/man/man1/resolve_stack_dump.1.gz
|
|
||||||
share/man/man1/resolveip.1.gz
|
|
||||||
share/man/man8/mysqld.8.gz
|
|
||||||
%%DATADIR%%/bulgarian/errmsg.sys
|
|
||||||
%%DATADIR%%/charsets/Index.xml
|
|
||||||
%%DATADIR%%/charsets/README
|
|
||||||
%%DATADIR%%/charsets/armscii8.xml
|
|
||||||
%%DATADIR%%/charsets/ascii.xml
|
|
||||||
%%DATADIR%%/charsets/cp1250.xml
|
|
||||||
%%DATADIR%%/charsets/cp1251.xml
|
|
||||||
%%DATADIR%%/charsets/cp1256.xml
|
|
||||||
%%DATADIR%%/charsets/cp1257.xml
|
|
||||||
%%DATADIR%%/charsets/cp850.xml
|
|
||||||
%%DATADIR%%/charsets/cp852.xml
|
|
||||||
%%DATADIR%%/charsets/cp866.xml
|
|
||||||
%%DATADIR%%/charsets/dec8.xml
|
|
||||||
%%DATADIR%%/charsets/geostd8.xml
|
|
||||||
%%DATADIR%%/charsets/greek.xml
|
|
||||||
%%DATADIR%%/charsets/hebrew.xml
|
|
||||||
%%DATADIR%%/charsets/hp8.xml
|
|
||||||
%%DATADIR%%/charsets/keybcs2.xml
|
|
||||||
%%DATADIR%%/charsets/koi8r.xml
|
|
||||||
%%DATADIR%%/charsets/koi8u.xml
|
|
||||||
%%DATADIR%%/charsets/latin1.xml
|
|
||||||
%%DATADIR%%/charsets/latin2.xml
|
|
||||||
%%DATADIR%%/charsets/latin5.xml
|
|
||||||
%%DATADIR%%/charsets/latin7.xml
|
|
||||||
%%DATADIR%%/charsets/macce.xml
|
|
||||||
%%DATADIR%%/charsets/macroman.xml
|
|
||||||
%%DATADIR%%/charsets/swe7.xml
|
|
||||||
%%DATADIR%%/czech/errmsg.sys
|
|
||||||
%%DATADIR%%/danish/errmsg.sys
|
|
||||||
%%DATADIR%%/dictionary.txt
|
|
||||||
%%DATADIR%%/dutch/errmsg.sys
|
|
||||||
%%DATADIR%%/english/errmsg.sys
|
|
||||||
%%DATADIR%%/errmsg-utf8.txt
|
|
||||||
%%DATADIR%%/estonian/errmsg.sys
|
|
||||||
%%DATADIR%%/fill_help_tables.sql
|
|
||||||
%%DATADIR%%/french/errmsg.sys
|
|
||||||
%%DATADIR%%/german/errmsg.sys
|
|
||||||
%%DATADIR%%/greek/errmsg.sys
|
|
||||||
%%DATADIR%%/hungarian/errmsg.sys
|
|
||||||
%%DATADIR%%/innodb_memcached_config.sql
|
|
||||||
%%DATADIR%%/install_rewriter.sql
|
|
||||||
%%DATADIR%%/italian/errmsg.sys
|
|
||||||
%%DATADIR%%/japanese/errmsg.sys
|
|
||||||
%%DATADIR%%/korean/errmsg.sys
|
|
||||||
%%DATADIR%%/magic
|
|
||||||
%%DATADIR%%/mysql-log-rotate
|
|
||||||
%%DATADIR%%/mysql.server
|
|
||||||
%%DATADIR%%/mysql_security_commands.sql
|
|
||||||
%%DATADIR%%/mysql_sys_schema.sql
|
|
||||||
%%DATADIR%%/mysql_system_tables.sql
|
|
||||||
%%DATADIR%%/mysql_system_tables_data.sql
|
|
||||||
%%DATADIR%%/mysql_test_data_timezone.sql
|
|
||||||
%%DATADIR%%/mysqld_multi.server
|
|
||||||
%%DATADIR%%/norwegian-ny/errmsg.sys
|
|
||||||
%%DATADIR%%/norwegian/errmsg.sys
|
|
||||||
%%DATADIR%%/polish/errmsg.sys
|
|
||||||
%%DATADIR%%/portuguese/errmsg.sys
|
|
||||||
%%DATADIR%%/romanian/errmsg.sys
|
|
||||||
%%DATADIR%%/russian/errmsg.sys
|
|
||||||
%%DATADIR%%/serbian/errmsg.sys
|
|
||||||
%%DATADIR%%/slovak/errmsg.sys
|
|
||||||
%%DATADIR%%/spanish/errmsg.sys
|
|
||||||
%%DATADIR%%/swedish/errmsg.sys
|
|
||||||
%%DATADIR%%/ukrainian/errmsg.sys
|
|
||||||
%%DATADIR%%/uninstall_rewriter.sql
|
|
||||||
@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
|
|
||||||
@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
|
|
||||||
@dir(mysql,mysql,0750) %%MY_SECDIR%%
|
|
||||||
@dir(mysql,mysql,0750) %%MY_TMPDIR%%
|
|
||||||
@ -105,7 +105,7 @@ MYSQL_INTERNAL_USES= mysql:server
|
|||||||
MYSQL_INTERNAL_CMAKE_BOOL= ENABLE_INTERNALMYSQL
|
MYSQL_INTERNAL_CMAKE_BOOL= ENABLE_INTERNALMYSQL
|
||||||
# Only works with MariaDB. Try to keep this in sync with supported MySQL
|
# Only works with MariaDB. Try to keep this in sync with supported MySQL
|
||||||
# versions and add any version not ending with 'm' to the IGNORE list.
|
# versions and add any version not ending with 'm' to the IGNORE list.
|
||||||
MYSQL_INTERNAL_VARS= IGNORE_WITH_MYSQL="57 80 81"
|
MYSQL_INTERNAL_VARS= IGNORE_WITH_MYSQL="80 81"
|
||||||
MYSQL_INTERNAL_IMPLIES= MYSQL
|
MYSQL_INTERNAL_IMPLIES= MYSQL
|
||||||
|
|
||||||
NLS_DESC= Digikam i18n translations
|
NLS_DESC= Digikam i18n translations
|
||||||
|
|||||||
@ -63,7 +63,6 @@ MYSQL_USES= mysql
|
|||||||
MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE}
|
MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE}
|
||||||
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
||||||
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
||||||
MYSQL_VARS= IGNORE_WITH_MYSQL="57"
|
|
||||||
|
|
||||||
LIBVIRT_CONFIGURE_WITH= libvirt=${LOCALBASE}
|
LIBVIRT_CONFIGURE_WITH= libvirt=${LOCALBASE}
|
||||||
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
||||||
|
|||||||
@ -61,7 +61,6 @@ MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
|
|||||||
MYSQL_CONFIGURE_OFF= --without-mysql
|
MYSQL_CONFIGURE_OFF= --without-mysql
|
||||||
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
||||||
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
||||||
MYSQL_VARS= IGNORE_WITH_MYSQL="57"
|
|
||||||
|
|
||||||
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
||||||
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
||||||
|
|||||||
@ -61,7 +61,6 @@ MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
|
|||||||
MYSQL_CONFIGURE_OFF= --without-mysql
|
MYSQL_CONFIGURE_OFF= --without-mysql
|
||||||
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
||||||
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
||||||
MYSQL_VARS= IGNORE_WITH_MYSQL="57"
|
|
||||||
|
|
||||||
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
||||||
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
||||||
|
|||||||
@ -61,7 +61,6 @@ MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
|
|||||||
MYSQL_CONFIGURE_OFF= --without-mysql
|
MYSQL_CONFIGURE_OFF= --without-mysql
|
||||||
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
||||||
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
||||||
MYSQL_VARS= IGNORE_WITH_MYSQL="57"
|
|
||||||
|
|
||||||
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
||||||
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
||||||
|
|||||||
@ -61,7 +61,6 @@ MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
|
|||||||
MYSQL_CONFIGURE_OFF= --without-mysql
|
MYSQL_CONFIGURE_OFF= --without-mysql
|
||||||
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
|
||||||
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
|
||||||
MYSQL_VARS= IGNORE_WITH_MYSQL="57"
|
|
||||||
|
|
||||||
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
|
||||||
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt
|
||||||
|
|||||||
@ -12,7 +12,6 @@ WWW= https://typo3.org/
|
|||||||
LICENSE= GPLv2
|
LICENSE= GPLv2
|
||||||
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
||||||
|
|
||||||
IGNORE_WITH_MYSQL= 57
|
|
||||||
IGNORE_WITH_PHP= 80 83
|
IGNORE_WITH_PHP= 80 83
|
||||||
|
|
||||||
USES= cpe php:web,flavors shebangfix
|
USES= cpe php:web,flavors shebangfix
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user