svn commit: r422257 - in head/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files
Thomas Zander
riggs at FreeBSD.org
Fri Sep 16 15:55:18 UTC 2016
Author: riggs
Date: Fri Sep 16 15:55:15 2016
New Revision: 422257
URL: https://svnweb.freebsd.org/changeset/ports/422257
Log:
Update to upstream version 5.7.15; fixes zero-day remote vuln CVE-2016-6662
PR: 212690
Submitted by: mokhi64 at gmail.com (maintainer)
MFH: 2016Q3
Security: CVE 2016-6662
Added:
head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (contents, props changed)
Deleted:
head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake
Modified:
head/databases/mysql57-client/Makefile
head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
head/databases/mysql57-server/Makefile
head/databases/mysql57-server/distinfo
head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
head/databases/mysql57-server/files/patch-sql_CMakeLists.txt
Modified: head/databases/mysql57-client/Makefile
==============================================================================
--- head/databases/mysql57-client/Makefile Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-client/Makefile Fri Sep 16 15:55:15 2016 (r422257)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION?= 1
+PORTREVISION?= 0
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
Modified: head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
==============================================================================
--- head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake Fri Sep 16 15:55:15 2016 (r422257)
@@ -1,6 +1,6 @@
---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-28 18:06:12 UTC
+--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC
+++ cmake/build_configurations/compiler_options.cmake
-@@ -28,7 +28,7 @@ IF(UNIX)
+@@ -29,7 +29,7 @@ IF(UNIX)
# Default GCC flags
IF(CMAKE_COMPILER_IS_GNUCC)
@@ -9,12 +9,12 @@
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
-@@ -37,7 +37,7 @@ IF(UNIX)
+@@ -42,7 +42,7 @@ IF(UNIX)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX)
- 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}")
+ # 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)
Modified: head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
==============================================================================
--- head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Fri Sep 16 15:55:15 2016 (r422257)
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC
+--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
+++ mysys_ssl/my_default.cc
-@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
+@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
/* Which directories are searched for options (and in which order) */
@@ -9,7 +9,7 @@
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
-@@ -909,6 +909,14 @@
+@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
return 1; /* Ignore wrong files */
}
@@ -21,10 +21,10 @@
+ goto err;
+ }
+
- while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
+ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
{
line++;
-@@ -1245,7 +1253,8 @@
+@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
end[(strlen(end)-1)] = ' ';
else
strxmov(end, conf_file, *ext , " ", NullS);
@@ -34,7 +34,7 @@
}
}
}
-@@ -1404,13 +1413,8 @@
+@@ -1411,13 +1420,8 @@ static const char **init_default_directo
#else
@@ -50,7 +50,7 @@
#endif
-@@ -1480,7 +1484,7 @@
+@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
MY_STAT stat_info;
if (!my_stat(file_name,&stat_info,MYF(0)))
Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-server/Makefile Fri Sep 16 15:55:15 2016 (r422257)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.7.13
-PORTREVISION?= 1
+PORTVERSION= 5.7.15
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
@@ -55,7 +55,8 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
-DWITH_EDITLINE=system \
-DWITH_LIBEVENT=system \
-DWITH_LZ4=system \
- -DWITH_ZLIB=system
+ -DWITH_ZLIB=system \
+ -DINSTALL_MYSQLTESTDIR=0
SHEBANG_FILES= scripts/*.pl* scripts/*.sh
@@ -128,15 +129,19 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
.endif
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
### Just for the sake of FreeBSD 9.X ###
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
. if !defined(CLIENT_ONLY)
EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
. endif
+### Just like deperecated `WITH_OPENSSL_PORT=yes` a workaround for building on 9.X ###
+DEFAULT_VERSIONS+=ssl=openssl
.endif
+.include <bsd.port.pre.mk>
+
.if ${SSL_DEFAULT} == base
BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports
CMAKE_ARGS+= -DWITH_SSL=system
Modified: head/databases/mysql57-server/distinfo
==============================================================================
--- head/databases/mysql57-server/distinfo Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-server/distinfo Fri Sep 16 15:55:15 2016 (r422257)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465065317
-SHA256 (mysql-boost-5.7.13.tar.gz) = 2a768682c37dfbca286912bd137f1a526075ac1f00a6a46da8b6fe63f6fcfa37
-SIZE (mysql-boost-5.7.13.tar.gz) = 60561931
+TIMESTAMP = 1473858917
+SHA256 (mysql-boost-5.7.15.tar.gz) = 7342a3a3e40878378dfaee252d42a3a5b06c58237f49c2544424d27316738945
+SIZE (mysql-boost-5.7.15.tar.gz) = 60583907
Modified: head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
==============================================================================
--- head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Fri Sep 16 15:55:15 2016 (r422257)
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC
+--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
+++ mysys_ssl/my_default.cc
-@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
+@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
/* Which directories are searched for options (and in which order) */
@@ -9,7 +9,7 @@
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
-@@ -909,6 +909,14 @@
+@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
return 1; /* Ignore wrong files */
}
@@ -21,10 +21,10 @@
+ goto err;
+ }
+
- while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
+ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
{
line++;
-@@ -1245,7 +1253,8 @@
+@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
end[(strlen(end)-1)] = ' ';
else
strxmov(end, conf_file, *ext , " ", NullS);
@@ -34,7 +34,7 @@
}
}
}
-@@ -1404,13 +1413,8 @@
+@@ -1411,13 +1420,8 @@ static const char **init_default_directo
#else
@@ -50,7 +50,7 @@
#endif
-@@ -1480,7 +1484,7 @@
+@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
MY_STAT stat_info;
if (!my_stat(file_name,&stat_info,MYF(0)))
Added: head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake Fri Sep 16 15:55:15 2016 (r422257)
@@ -0,0 +1,15 @@
+--- 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()
Modified: head/databases/mysql57-server/files/patch-sql_CMakeLists.txt
==============================================================================
--- head/databases/mysql57-server/files/patch-sql_CMakeLists.txt Fri Sep 16 14:35:16 2016 (r422256)
+++ head/databases/mysql57-server/files/patch-sql_CMakeLists.txt Fri Sep 16 15:55:15 2016 (r422257)
@@ -1,4 +1,4 @@
---- sql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
+--- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC
+++ sql/CMakeLists.txt
@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
${ZLIB_INCLUDE_DIR}
@@ -6,6 +6,6 @@
${CMAKE_BINARY_DIR}/sql
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}
+ ${LZ4_INCLUDE_DIR}
)
- SET(CONF_SOURCES
More information about the svn-ports-head
mailing list