[Midnightbsd-cvs] mports [23286] trunk/databases: update mysql to 5.6.39
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Apr 30 19:43:05 EDT 2018
Revision: 23286
http://svnweb.midnightbsd.org/mports/?rev=23286
Author: laffer1
Date: 2018-04-30 19:43:04 -0400 (Mon, 30 Apr 2018)
Log Message:
-----------
update mysql to 5.6.39
Modified Paths:
--------------
trunk/databases/mysql56-client/files/patch-CMakeLists.txt
trunk/databases/mysql56-client/files/patch-client_CMakeLists.txt
trunk/databases/mysql56-client/files/patch-extra_CMakeLists.txt
trunk/databases/mysql56-client/files/patch-man_CMakeLists.txt
trunk/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
trunk/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
trunk/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
trunk/databases/mysql56-server/Makefile
trunk/databases/mysql56-server/distinfo
Added Paths:
-----------
trunk/databases/mysql56-client/files/patch-cmake_ssl.cmake
trunk/databases/mysql56-client/files/patch-sql-common_client__authentication.cc
Modified: trunk/databases/mysql56-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-CMakeLists.txt 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100
-+++ CMakeLists.txt 2016-04-19 17:30:13.343558770 +0200
-@@ -475,8 +475,8 @@ ENDIF()
+--- CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
++++ CMakeLists.txt
+@@ -481,8 +481,8 @@ ENDIF()
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(client)
@@ -10,7 +10,7 @@
IF(UNIX)
ADD_SUBDIRECTORY(man)
-@@ -546,18 +546,17 @@ ELSE()
+@@ -552,18 +552,17 @@ ELSE()
SET(CPACK_GENERATOR "TGZ")
ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
@@ -30,7 +30,7 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -579,6 +578,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
Modified: trunk/databases/mysql56-client/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-client_CMakeLists.txt 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-client_CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
@@ -8,9 +8,9 @@
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")
Added: trunk/databases/mysql56-client/files/patch-cmake_ssl.cmake
===================================================================
--- trunk/databases/mysql56-client/files/patch-cmake_ssl.cmake (rev 0)
+++ trunk/databases/mysql56-client/files/patch-cmake_ssl.cmake 2018-04-30 23:43:04 UTC (rev 23286)
@@ -0,0 +1,11 @@
+--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC
++++ cmake/ssl.cmake
+@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL)
+ 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)
+ ELSE()
Property changes on: trunk/databases/mysql56-client/files/patch-cmake_ssl.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql56-client/files/patch-extra_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-extra_CMakeLists.txt 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-extra_CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,6 +1,14 @@
---- extra/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100
-+++ extra/CMakeLists.txt 2016-04-19 17:37:34.634528313 +0200
-@@ -60,6 +60,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
+--- 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()
@@ -8,7 +16,7 @@
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 +97,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+@@ -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()
Modified: trunk/databases/mysql56-client/files/patch-man_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-man_CMakeLists.txt 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-man_CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,13 +1,15 @@
---- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
+--- 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_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})
Modified: trunk/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
===================================================================
--- trunk/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
+--- 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) */
@@ -9,18 +9,48 @@
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
-@@ -1395,7 +1395,10 @@
+@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
+ return 1; /* Ignore wrong files */
+ }
- #if defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR[0])
++ if (strstr(name, "/etc") == name)
+ {
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
+ }
- #endif /* DEFAULT_SYSCONFDIR */
++
+ 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
-@@ -1466,7 +1469,7 @@
+
+@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
MY_STAT stat_info;
if (!my_stat(file_name,&stat_info,MYF(0)))
Modified: trunk/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-scripts_CMakeLists.txt 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-scripts_CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt 2013-02-13 14:14:11.000000000 +0100
-@@ -71,6 +71,7 @@
+--- scripts/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
++++ scripts/CMakeLists.txt
+@@ -71,6 +71,7 @@ IF(UNIX)
)
ENDIF()
@@ -8,7 +8,7 @@
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@
+@@ -80,6 +81,7 @@ INSTALL(FILES
${FIX_PRIVILEGES_SQL}
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
)
@@ -16,7 +16,7 @@
# TCMalloc hacks
IF(MALLOC_LIB)
-@@ -139,6 +141,7 @@
+@@ -168,6 +170,7 @@ ENDIF()
SET(HOSTNAME "hostname")
SET(MYSQLD_USER "mysql")
@@ -24,7 +24,7 @@
# Required for mysqlbug until autotools are deprecated, once done remove these
# and expand default cmake variables
SET(CC ${CMAKE_C_COMPILER})
-@@ -175,6 +178,7 @@
+@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
DESTINATION ${INSTALL_BINDIR}
COMPONENT Server
)
@@ -32,7 +32,7 @@
ENDIF(UNIX)
-@@ -199,6 +203,7 @@
+@@ -228,6 +232,7 @@ ELSE()
SET(localstatedir ${MYSQL_DATADIR})
ENDIF()
@@ -40,15 +40,15 @@
IF(UNIX)
SET(EXT)
ELSE()
-@@ -213,6 +218,7 @@
+@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
DESTINATION ${DEST}
COMPONENT Server
)
+ENDIF()
-
SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -264,6 +270,8 @@
+ 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} " )
@@ -57,7 +57,7 @@
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
-@@ -316,17 +324,9 @@
+@@ -353,17 +361,9 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config
@@ -75,7 +75,7 @@
)
FOREACH(file ${BIN_SCRIPTS})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -350,6 +350,7 @@
+@@ -387,6 +387,7 @@ ELSE()
)
ENDFOREACH()
@@ -83,7 +83,7 @@
# Input files with pl.in extension - drop the extension completely
SET(PLIN_FILES mysql_secure_installation)
FOREACH(file ${PLIN_FILES})
-@@ -362,6 +363,7 @@
+@@ -399,6 +400,7 @@ ELSE()
INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
ENDFOREACH()
ENDIF()
Added: trunk/databases/mysql56-client/files/patch-sql-common_client__authentication.cc
===================================================================
--- trunk/databases/mysql56-client/files/patch-sql-common_client__authentication.cc (rev 0)
+++ trunk/databases/mysql56-client/files/patch-sql-common_client__authentication.cc 2018-04-30 23:43:04 UTC (rev 23286)
@@ -0,0 +1,17 @@
+sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int')
+ mysql->options.extension->server_public_key_path != '\0')
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~
+
+Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4
+
+--- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC
++++ sql-common/client_authentication.cc
+@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
+
+ if (mysql->options.extension != NULL &&
+ mysql->options.extension->server_public_key_path != NULL &&
+- mysql->options.extension->server_public_key_path != '\0')
++ mysql->options.extension->server_public_key_path[0] != '\0')
+ {
+ pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+ "r");
Property changes on: trunk/databases/mysql56-client/files/patch-sql-common_client__authentication.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-support-files_CMakeLists.txt 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-client/files/patch-support-files_CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100
-+++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100
-@@ -44,14 +44,17 @@
+--- support-files/CMakeLists.txt.orig 2017-03-18 06:43:12 UTC
++++ support-files/CMakeLists.txt
+@@ -44,11 +44,13 @@ ELSE()
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF()
@@ -13,12 +13,16 @@
+ENDIF()
IF(UNIX)
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+@@ -57,6 +59,7 @@ IF(UNIX)
+ SET (PIDOF "pgrep -d' ' -f")
+ ENDIF()
SET(prefix ${CMAKE_INSTALL_PREFIX})
+IF(FALSE)
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,8 +71,10 @@
+@@ -73,8 +76,10 @@ IF(UNIX)
IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
ENDIF()
@@ -29,7 +33,7 @@
CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-@@ -94,3 +99,4 @@
+@@ -99,3 +104,4 @@ IF(UNIX)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDIF()
Modified: trunk/databases/mysql56-server/Makefile
===================================================================
--- trunk/databases/mysql56-server/Makefile 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-server/Makefile 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.34
+PORTVERSION= 5.6.39
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.6
@@ -19,6 +19,7 @@
LIB_DEPENDS+= libevent.so:devel/libevent \
liblz4.so:archivers/liblz4
+CMAKE_BUILD_TYPE= Release
CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-DINSTALL_INCLUDEDIR="include/mysql" \
Modified: trunk/databases/mysql56-server/distinfo
===================================================================
--- trunk/databases/mysql56-server/distinfo 2018-04-30 23:34:20 UTC (rev 23285)
+++ trunk/databases/mysql56-server/distinfo 2018-04-30 23:43:04 UTC (rev 23286)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477038469
-SHA256 (mysql-5.6.34.tar.gz) = ee90bafec6af3abe2715ccb0b3cc9345ed8d1cce025d41e6ec2b2b7a7d820823
-SIZE (mysql-5.6.34.tar.gz) = 32094762
+TIMESTAMP = 1525131625
+SHA256 (mysql-5.6.39.tar.gz) = ab1814b03af77bf88dc381eff558ed2e73e19e8e5a4170a78ba3370cd5da434d
+SIZE (mysql-5.6.39.tar.gz) = 32110958
More information about the Midnightbsd-cvs
mailing list