Date: Fri, 22 Feb 2019 19:52:41 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r493586 - in branches/2019Q1/databases: mariadb102-client/files mariadb102-server mariadb102-server/files Message-ID: <201902221952.x1MJqf2L082477@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Fri Feb 22 19:52:41 2019 New Revision: 493586 URL: https://svnweb.freebsd.org/changeset/ports/493586 Log: MFH: r493366 databases/mariadb102-server: Security update to 10.2.22 Security: d3d02d3a-2242-11e9-b95c-b499baebfeaf Approved by: ports-secteam (joneum) Deleted: branches/2019Q1/databases/mariadb102-client/files/patch-libmariadb_include_ma__pthread.h Modified: branches/2019Q1/databases/mariadb102-client/files/patch-client_CMakeLists.txt branches/2019Q1/databases/mariadb102-server/Makefile branches/2019Q1/databases/mariadb102-server/distinfo branches/2019Q1/databases/mariadb102-server/files/patch-client_CMakeLists.txt Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/databases/mariadb102-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2019Q1/databases/mariadb102-client/files/patch-client_CMakeLists.txt Fri Feb 22 19:48:16 2019 (r493585) +++ branches/2019Q1/databases/mariadb102-client/files/patch-client_CMakeLists.txt Fri Feb 22 19:52:41 2019 (r493586) @@ -1,20 +1,21 @@ ---- client/CMakeLists.txt.orig 2017-04-04 19:11:32 UTC +--- client/CMakeLists.txt.orig 2019-02-09 23:24:08 UTC +++ client/CMakeLists.txt -@@ -43,11 +43,12 @@ IF(UNIX) +@@ -44,12 +44,13 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) +IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) + TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- +ENDIF() +- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) -@@ -60,15 +61,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -61,15 +62,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) @@ -34,7 +35,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) -@@ -89,14 +94,21 @@ ENDIF(WIN32) +@@ -90,14 +95,21 @@ ENDIF(WIN32) ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) @@ -48,7 +49,7 @@ mysqladmin mysqlslap async_example) ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) ENDFOREACH() - ++ +IF(NOT WITHOUT_SERVER) +SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE) +FOREACH(t mysqltest mysql_upgrade mysql_plugin) @@ -56,6 +57,6 @@ +ENDFOREACH() +ENDIF() + -+ + ADD_DEFINITIONS(-DHAVE_DLOPEN) Modified: branches/2019Q1/databases/mariadb102-server/Makefile ============================================================================== --- branches/2019Q1/databases/mariadb102-server/Makefile Fri Feb 22 19:48:16 2019 (r493585) +++ branches/2019Q1/databases/mariadb102-server/Makefile Fri Feb 22 19:52:41 2019 (r493586) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.19 -PORTREVISION?= 2 +PORTVERSION= 10.2.22 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -27,7 +27,7 @@ SUB_FILES= pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql -SHEBANG_FILES= scripts/*.sh storage/rocksdb/myrocks_hotbackup +SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql @@ -207,6 +207,7 @@ CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif post-patch: + ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh Modified: branches/2019Q1/databases/mariadb102-server/distinfo ============================================================================== --- branches/2019Q1/databases/mariadb102-server/distinfo Fri Feb 22 19:48:16 2019 (r493585) +++ branches/2019Q1/databases/mariadb102-server/distinfo Fri Feb 22 19:52:41 2019 (r493586) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542115149 -SHA256 (mariadb-10.2.19.tar.gz) = c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727 -SIZE (mariadb-10.2.19.tar.gz) = 71856357 +TIMESTAMP = 1549889973 +SHA256 (mariadb-10.2.22.tar.gz) = 42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c +SIZE (mariadb-10.2.22.tar.gz) = 71907765 Modified: branches/2019Q1/databases/mariadb102-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2019Q1/databases/mariadb102-server/files/patch-client_CMakeLists.txt Fri Feb 22 19:48:16 2019 (r493585) +++ branches/2019Q1/databases/mariadb102-server/files/patch-client_CMakeLists.txt Fri Feb 22 19:52:41 2019 (r493586) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- client/CMakeLists.txt.orig 2019-02-09 23:24:08 UTC +++ client/CMakeLists.txt -@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) SET(CLIENT_LIB mariadbclient mysys) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -9,19 +9,20 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) -@@ -43,11 +45,6 @@ IF(UNIX) +@@ -44,12 +46,6 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) -MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) -SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") --TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) +-TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) -SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) - - +- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) -@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -61,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) @@ -38,7 +39,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) -@@ -89,14 +76,34 @@ ENDIF(WIN32) +@@ -90,12 +76,32 @@ ENDIF(WIN32) ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) @@ -50,9 +51,9 @@ -FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog +FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog mysqladmin mysqlslap async_example) - ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) - ENDFOREACH() - ++ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) ++ENDFOREACH() ++ +ENDIF() + +MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) @@ -71,8 +72,6 @@ +PROPERTIES HAS_CXX TRUE) + +FOREACH(t mysqltest mysql_plugin mysql_upgrade) -+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) -+ENDFOREACH() -+ - ADD_DEFINITIONS(-DHAVE_DLOPEN) + ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) + ENDFOREACH()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902221952.x1MJqf2L082477>