Date: Wed, 8 May 2019 20:08:56 +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: r501050 - in branches/2019Q2/databases: mariadb55-client/files mariadb55-server mariadb55-server/files Message-ID: <201905082008.x48K8u61056998@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed May 8 20:08:56 2019 New Revision: 501050 URL: https://svnweb.freebsd.org/changeset/ports/501050 Log: MFH: r500269 databases/mariadb55-server: Security update to 5.5.64 Security: 4e1997e8-5de0-11e9-b95c-b499baebfeaf Approved by: ports-secteam (joneum) Deleted: branches/2019Q2/databases/mariadb55-server/files/patch-MDEV-15961 Modified: branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt branches/2019Q2/databases/mariadb55-server/Makefile branches/2019Q2/databases/mariadb55-server/distinfo branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt Wed May 8 20:08:27 2019 (r501049) +++ branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt Wed May 8 20:08:56 2019 (r501050) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC +--- client/CMakeLists.txt.orig 2019-04-26 12:37:01 UTC +++ client/CMakeLists.txt -@@ -34,11 +34,12 @@ IF(UNIX) +@@ -35,12 +35,13 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -9,12 +9,13 @@ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- +ENDIF() +- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -50,15 +51,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -51,15 +52,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -34,17 +35,18 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -76,10 +81,12 @@ IF(WIN32) +@@ -76,11 +81,13 @@ IF(WIN32) + MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) ENDIF(WIN32) - # async_example is just a code example, do not install it. +IF(FALSE) + # async_example is just a code example, do not install it. ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example mysqlclient) +ENDIF() --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example ++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Modified: branches/2019Q2/databases/mariadb55-server/Makefile ============================================================================== --- branches/2019Q2/databases/mariadb55-server/Makefile Wed May 8 20:08:27 2019 (r501049) +++ branches/2019Q2/databases/mariadb55-server/Makefile Wed May 8 20:08:56 2019 (r501050) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.63 +PORTVERSION= 5.5.64 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ Modified: branches/2019Q2/databases/mariadb55-server/distinfo ============================================================================== --- branches/2019Q2/databases/mariadb55-server/distinfo Wed May 8 20:08:27 2019 (r501049) +++ branches/2019Q2/databases/mariadb55-server/distinfo Wed May 8 20:08:56 2019 (r501050) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549015056 -SHA256 (mariadb-5.5.63.tar.gz) = ef1cf79eec32ced9d1051998a8e458bb33dfbc62de297cba37ee8e9f952b21ea -SIZE (mariadb-5.5.63.tar.gz) = 45946425 +TIMESTAMP = 1556393099 +SHA256 (mariadb-5.5.64.tar.gz) = c103f3c54741b296980d6be48b221340eebaa97c6bd95a02fd8d530a5df5c343 +SIZE (mariadb-5.5.64.tar.gz) = 45953561 Modified: branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt Wed May 8 20:08:27 2019 (r501049) +++ branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt Wed May 8 20:08:56 2019 (r501050) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC +--- client/CMakeLists.txt.orig 2019-04-26 12:37:01 UTC +++ client/CMakeLists.txt -@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES( +@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES( ) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) -@@ -33,6 +34,7 @@ IF(UNIX) +@@ -34,6 +35,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -16,7 +16,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -40,6 +42,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli +@@ -41,6 +43,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) @@ -24,7 +24,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -49,17 +52,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli +@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -46,7 +46,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -69,17 +76,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl +@@ -70,17 +77,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) @@ -63,8 +63,8 @@ TARGET_LINK_LIBRARIES(async_example mysqlclient) +ENDIF() --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example ++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905082008.x48K8u61056998>