svn commit: r522469 - in branches/2020Q1/databases: mysql56-client mysql56-client/files mysql56-server mysql56-server/files
Jochen Neumeister
joneum at FreeBSD.org
Thu Jan 9 06:40:28 UTC 2020
Author: joneum
Date: Thu Jan 9 06:40:26 2020
New Revision: 522469
URL: https://svnweb.freebsd.org/changeset/ports/522469
Log:
MFH: r521874
databases/mysql56-{client, server}: Update to latest release 5.6.46
Bugfix:
- Improper locking during storage engine initialization could cause a server exit.
- A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly.
- VS2019 produced compilation errors with debug compilation selected due to use of the /ZI flag. Now /Z7 is used instead.
- For MySQL Community Edition, the cipher order specified by the client was used in preference to the order on the server side, unless the server was confi
- Password masking was incomplete for SHOW PROCESSLIST and some INFORMATION_SCHEMA and Performance Schema tables.
- The -DWITH_EXAMPLE_STORAGE_ENGINE=1 CMake option was ignored but should not have been. If -DWITH_EXAMPLE_STORAGE_ENGINE=0 is given, the EXAMPLE storage e
More Info: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-46.html
Approved by: mmokhi (maintainer, implicit)
Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf
Sponsored by: Netzkommune GmbH
Approved by: ports-secteam (with hat)
Deleted:
branches/2020Q1/databases/mysql56-server/files/patch-PR225888.diff
Modified:
branches/2020Q1/databases/mysql56-client/Makefile
branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
branches/2020Q1/databases/mysql56-server/Makefile
branches/2020Q1/databases/mysql56-server/distinfo
branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt
branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
Directory Properties:
branches/2020Q1/ (props changed)
Modified: branches/2020Q1/databases/mysql56-client/Makefile
==============================================================================
--- branches/2020Q1/databases/mysql56-client/Makefile Thu Jan 9 03:56:24 2020 (r522468)
+++ branches/2020Q1/databases/mysql56-client/Makefile Thu Jan 9 06:40:26 2020 (r522469)
@@ -31,6 +31,5 @@ MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
CLIENT_ONLY= yes
-EXTRA_PATCHES+= ${MASTERDIR}/files/patch-PR225888.diff
.include "${MASTERDIR}/Makefile"
Modified: branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
==============================================================================
--- branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Thu Jan 9 03:56:24 2020 (r522468)
+++ branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Thu Jan 9 06:40:26 2020 (r522469)
@@ -1,6 +1,6 @@
---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100
-+++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200
-@@ -25,7 +25,7 @@ IF(UNIX)
+--- 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)
@@ -9,10 +9,10 @@
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
-@@ -34,7 +34,7 @@ IF(UNIX)
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
- ENDIF()
- IF(CMAKE_COMPILER_IS_GNUCXX)
+@@ -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
Modified: branches/2020Q1/databases/mysql56-server/Makefile
==============================================================================
--- branches/2020Q1/databases/mysql56-server/Makefile Thu Jan 9 03:56:24 2020 (r522468)
+++ branches/2020Q1/databases/mysql56-server/Makefile Thu Jan 9 06:40:26 2020 (r522469)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.45
+PORTVERSION= 5.6.46
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.6
Modified: branches/2020Q1/databases/mysql56-server/distinfo
==============================================================================
--- branches/2020Q1/databases/mysql56-server/distinfo Thu Jan 9 03:56:24 2020 (r522468)
+++ branches/2020Q1/databases/mysql56-server/distinfo Thu Jan 9 06:40:26 2020 (r522469)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565035854
-SHA256 (mysql-5.6.45.tar.gz) = 404d798974dd89aca4a19e67194b534eddc7508489982175978966360607aabb
-SIZE (mysql-5.6.45.tar.gz) = 32525559
+TIMESTAMP = 1577785560
+SHA256 (mysql-5.6.46.tar.gz) = 12e1fbabf2086e6175359767ca89fa8a58f9274fcad40434aa6a56e582d65f49
+SIZE (mysql-5.6.46.tar.gz) = 32395002
Modified: branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt
==============================================================================
--- branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt Thu Jan 9 03:56:24 2020 (r522468)
+++ branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000
-+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000
-@@ -500,12 +500,10 @@
+--- CMakeLists.txt.orig 2020-01-01 20:46:13.771078000 +0100
++++ CMakeLists.txt 2020-01-01 20:49:28.631677000 +0100
+@@ -558,12 +558,10 @@ IF(UNIX)
ENDIF()
IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
ENDIF(WITH_EMBEDDED_SERVER)
ENDIF()
-@@ -514,10 +512,7 @@
+@@ -572,10 +570,7 @@ ENDIF()
ADD_SUBDIRECTORY(scripts)
IF(NOT WITHOUT_SERVER)
@@ -24,18 +24,19 @@
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
ENDIF()
-@@ -572,6 +567,7 @@
+@@ -634,6 +629,7 @@ 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}
-@@ -597,5 +593,6 @@
+ INSTALL(FILES
+ README
+@@ -652,6 +648,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "mysql.info" EXCLUDE
PATTERN "sp-imp-spec.txt" EXCLUDE
)
- ENDIF()
+ENDIF()
+ ENDIF()
INCLUDE(CPack)
Modified: branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
==============================================================================
--- branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 03:56:24 2020 (r522468)
+++ branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469)
@@ -1,15 +1,15 @@
---- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200
-+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200
-@@ -173,7 +173,7 @@
+--- libmysql/CMakeLists.txt.orig 2020-01-01 21:38:55.670126000 +0100
++++ libmysql/CMakeLists.txt 2020-01-01 21:47:51.799099000 +0100
+@@ -205,7 +205,7 @@ IF(WIN32)
ENDIF()
# Merge several convenience libraries into one big mysqlclient
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
+ TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
# Visual Studio users need debug static library for debug projects
- IF(MSVC)
-@@ -200,19 +200,22 @@
+@@ -234,20 +234,23 @@ IF(UNIX)
ENDMACRO()
ENDIF()
@@ -25,15 +25,16 @@
IF(NOT DISABLE_SHARED)
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+ MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
EXPORTS ${CLIENT_API_FUNCTIONS}
- COMPONENT SharedLibraries)
-+ COMPONENT SharedLibraries NOINSTALL)
-+ IF(FALSE)
++ COMPONENT SharedLibraries NOINSTALL)
+ TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
++ IF(FALSE)
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -271,4 +274,5 @@
+@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
${INSTALL_LIBDIR} SharedLibraries)
ENDFOREACH()
ENDIF()
More information about the svn-ports-all
mailing list