Skip to content
Snippets Groups Projects
Commit 1fb68a4d authored by Muhammad Moinur Rahman's avatar Muhammad Moinur Rahman
Browse files

databases/mysql56-*: Sunset

2023-06-30 databases/mysql56-*: Upstream support ended in February 2021

Approved by:	portmgr (blanket)
parent 68b6a7c4
No related branches found
No related tags found
No related merge requests found
Showing
with 5 additions and 520 deletions
......@@ -7662,3 +7662,5 @@ databases/mysql-q4m||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/mysqlbigram||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/ateam_mysql_ldap_auth||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/mysqlwsrep56-server||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/mysql56-server||2023-06-30|Has expired: Upstream support ended in February 2021
databases/mysql56-client||2023-06-30|Has expired: Upstream support ended in February 2021
......@@ -64,7 +64,6 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
# MySQL client version currently supported.
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
MYSQL56_LIBVER= 18
MYSQL57_LIBVER= 20
MYSQL57p_LIBVER= 20
MYSQL80_LIBVER= 21
......
......@@ -93,7 +93,7 @@ LUAJIT_DEFAULT?= luajit-devel
. endif
# Possible values: 5.10, 5.20, 6.8
MONO_DEFAULT?= 5.10
# Possible values: 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.7p, 5.7w
# Possible values: 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.7p, 5.7w
MYSQL_DEFAULT?= 8.0
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
......
......@@ -209,8 +209,6 @@
SUBDIR += mysql-connector-odbc-80
SUBDIR += mysql-udf
SUBDIR += mysql2pgsql
SUBDIR += mysql56-client
SUBDIR += mysql56-server
SUBDIR += mysql57-client
SUBDIR += mysql57-server
SUBDIR += mysql80-client
......
......@@ -10,7 +10,7 @@ WWW= https://github.com/ateamsystems/ateam_mysql_ldap_auth
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
IGNORE_WITH_MYSQL= 56 80 101m 102m 103m
IGNORE_WITH_MYSQL= 80 101m 102m 103m
LIB_DEPENDS= libconfig.so:devel/libconfig
......
......@@ -17,7 +17,7 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \
libzstd.so:archivers/zstd
USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
IGNORE_WITH_MYSQL= 56 57 101m 102m 103m 57p 57w
IGNORE_WITH_MYSQL= 57 101m 102m 103m 57p 57w
USE_LDCONFIG= yes
CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1
......
PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= 56-client
COMMENT= Multithreaded SQL database (client)
LICENSE+= LGPL21
DEPRECATED= Upstream support ended in February 2021
EXPIRATION_DATE= 2023-06-30
BROKEN_sparc64= Does not build: reports unsupported compiler
MASTERDIR= ${.CURDIR}/../mysql56-server
PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql5[0-57-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
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
.include "${MASTERDIR}/Makefile"
--- CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
+++ CMakeLists.txt
@@ -481,8 +481,8 @@ ENDIF()
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(libservices)
+ADD_SUBDIRECTORY(support-files)
IF(UNIX)
ADD_SUBDIRECTORY(man)
@@ -552,18 +552,17 @@ ELSE()
SET(CPACK_GENERATOR "TGZ")
ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
-ADD_SUBDIRECTORY(packaging/solaris)
# Create a single package with "make package"
# (see http://public.kitware.com/Bug/view.php?id=11452)
SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
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}
@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
INCLUDE(CPack)
--- client/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100
+++ client/CMakeLists.txt 2016-04-19 17:30:13.344558659 +0200
@@ -37,9 +37,11 @@ IF(UNIX)
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
ENDIF(UNIX)
+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()
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ENDIF()
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)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
@@ -81,8 +87,6 @@ IF(WIN32)
ENDIF(WIN32)
SET_TARGET_PROPERTIES (
- mysql_plugin
- mysql_upgrade
mysqlcheck
mysqldump
mysqlimport
--- cmake/build_configurations/compiler_options.cmake.orig 2020-01-01 21:24:49.736077000 +0100
+++ cmake/build_configurations/compiler_options.cmake 2020-01-01 21:25:22.307418000 +0100
@@ -32,7 +32,7 @@ IF(UNIX)
# Default GCC flags
IF(CMAKE_COMPILER_IS_GNUCC)
- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
@@ -47,7 +47,7 @@ IF(UNIX)
IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
ENDIF()
- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
--- cmake/ssl.cmake.orig 2021-01-05 17:19:59.000000000 +0700
+++ cmake/ssl.cmake 2023-06-13 13:07:00.168639000 +0700
@@ -169,6 +169,25 @@ MACRO (MYSQL_CHECK_SSL)
ENDIF()
IF(OPENSSL_INCLUDE_DIR)
+ FOREACH(version_part
+ OPENSSL_VERSION_MAJOR
+ OPENSSL_VERSION_MINOR
+ OPENSSL_VERSION_PATCH
+ )
+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" ${version_part}
+ REGEX "^#[\t ]*define[\t ]+${version_part}[\t ]+([0-9]+).*")
+ STRING(REGEX REPLACE
+ "^.*${version_part}[\t ]+([0-9]+).*" "\\1"
+ ${version_part} "${${version_part}}")
+ ENDFOREACH()
+
+ IF(OPENSSL_VERSION_MAJOR VERSION_EQUAL 3)
+ # OpenSSL 3
+ SET(OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_MAJOR}")
+ SET(OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_MINOR}")
+ SET(OPENSSL_FIX_VERSION "${OPENSSL_VERSION_PATCH}")
+ SET(OPENSSL_FOUND TRUE)
+ ELSE()
# Verify version number. Version information looks like:
# #define OPENSSL_VERSION_NUMBER 0x1000103fL
# Encoded as MNNFFPPS: major minor fix patch status
@@ -188,14 +207,22 @@ MACRO (MYSQL_CHECK_SSL)
"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
)
+ ENDIF()
ENDIF()
- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
- ADD_DEFINITIONS(-DHAVE_TLSv13)
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+ IF(HAVE_TLS1_3_VERSION)
+ #ADD_DEFINITIONS(-DHAVE_TLSv13)
ENDIF()
IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND
- OPENSSL_MAJOR_VERSION STREQUAL "1"
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
+ ELSEIF(OPENSSL_INCLUDE_DIR AND
+ OPENSSL_LIBRARY AND
+ CRYPTO_LIBRARY AND
+ OPENSSL_MAJOR_VERSION STREQUAL "2"
)
SET(OPENSSL_FOUND TRUE)
ELSE()
--- extra/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
+++ extra/CMakeLists.txt
@@ -35,6 +35,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/
@@ -60,6 +61,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)
@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
ENDIF()
+ENDIF()
IF(UNIX)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
--- include/CMakeLists.txt.orig 2014-01-14 23:38:00.000000000 +0800
+++ include/CMakeLists.txt 2014-02-28 04:51:50.269412818 +0800
@@ -35,6 +35,7 @@
SET(HEADERS
${HEADERS_ABI}
+ hash.h
my_dbug.h
m_string.h
my_sys.h
--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200
+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200
@@ -39,7 +39,7 @@
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)
--- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100
+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100
@@ -48,7 +48,7 @@
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)
--- man/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
+++ man/CMakeLists.txt
@@ -14,11 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# 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)
+FILE(GLOB MAN1_FILES 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)
IF(MAN1_FILES)
IF(MAN1_EXCLUDE)
LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
--- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC
+++ mysys_ssl/my_aes_openssl.cc
@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX stack_ctx;
EVP_CIPHER_CTX *ctx= &stack_ctx;
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_init(ctx);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX stack_ctx;
EVP_CIPHER_CTX *ctx= &stack_ctx;
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_init(ctx);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
+++ mysys_ssl/my_default.cc
@@ -110,7 +110,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;
@@ -903,6 +903,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++;
@@ -1241,7 +1249,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);
}
}
}
@@ -1400,13 +1409,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
@@ -1477,7 +1481,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.
--- scripts/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
+++ scripts/CMakeLists.txt
@@ -71,6 +71,7 @@ IF(UNIX)
)
ENDIF()
+IF(FALSE)
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
@@ -80,6 +81,7 @@ INSTALL(FILES
${FIX_PRIVILEGES_SQL}
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
)
+ENDIF()
# TCMalloc hacks
IF(MALLOC_LIB)
@@ -168,6 +170,7 @@ ENDIF()
SET(HOSTNAME "hostname")
SET(MYSQLD_USER "mysql")
+IF(FALSE)
# Required for mysqlbug until autotools are deprecated, once done remove these
# and expand default cmake variables
SET(CC ${CMAKE_C_COMPILER})
@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
DESTINATION ${INSTALL_BINDIR}
COMPONENT Server
)
+ENDIF()
ENDIF(UNIX)
@@ -228,6 +232,7 @@ ELSE()
SET(localstatedir ${MYSQL_DATADIR})
ENDIF()
+IF(FALSE)
IF(UNIX)
SET(EXT)
ELSE()
@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
DESTINATION ${DEST}
COMPONENT Server
)
+ENDIF()
SET(prefix "${CMAKE_INSTALL_PREFIX}")
SET(sysconfdir ${prefix})
@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
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()
@@ -353,17 +361,9 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_zap
mysqlaccess
mysqlaccess.conf
- mysql_convert_table_format
mysql_find_rows
- mysqlhotcopy
- mysqldumpslow
- mysqld_multi
- mysqld_safe
)
FOREACH(file ${BIN_SCRIPTS})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
@@ -387,6 +387,7 @@ ELSE()
)
ENDFOREACH()
+IF(FALSE)
# Input files with pl.in extension - drop the extension completely
SET(PLIN_FILES mysql_secure_installation)
FOREACH(file ${PLIN_FILES})
@@ -399,6 +400,7 @@ ELSE()
INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
ENDFOREACH()
ENDIF()
+ENDIF()
# Install libgcc as mylibgcc.a
IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
--- sql-common/client.c.orig 2019-11-26 16:53:45 UTC
+++ sql-common/client.c
@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
goto error;
}
- cn= (char *) ASN1_STRING_data(cn_asn1);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ cn= (const char *) ASN1_STRING_data(cn_asn1);
+#else
+ cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
+#endif
// There should not be any NULL embedded in the CN
if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment