Index: branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt =================================================================== --- branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt (revision 501049) +++ branches/2019Q2/databases/mariadb55-client/files/patch-client_CMakeLists.txt (revision 501050) @@ -1,50 +1,52 @@ ---- 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) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) 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) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +ENDIF() 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) Index: branches/2019Q2/databases/mariadb55-server/Makefile =================================================================== --- branches/2019Q2/databases/mariadb55-server/Makefile (revision 501049) +++ branches/2019Q2/databases/mariadb55-server/Makefile (revision 501050) @@ -1,130 +1,130 @@ # $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/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/ PKGNAMESUFFIX?= 55-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SUB_FILES= pkg-message SLAVEDIRS= databases/mariadb55-client USES+= cmake:insource,noninja shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh sql-bench/[a-km-z]* CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=yes \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql BROKEN_sparc64= Does not compile: Unsupported platform .if defined(USE_MYSQL) .error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif OPTIONS_DEFINE+= FASTMTX OPTIONS_SUB= yes NO_OPTIONS_SORT= yes FASTMTX_DESC= Replace mutexes with spinlocks FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 .if !defined(CLIENT_ONLY) # MySQL-Server part USES+= mysql:55m USE_LDCONFIG|= ${PREFIX}/lib/mysql/plugin CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ mariadb1*-server-* \ mysql[0-9]*-server-* \ mysqlwsrep* \ percona[0-9]*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=/usr/include \ -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OQGRAPH OPTIONS_DEFAULT+= MAXKEY MAXKEY_DESC= Change max key length from 1000 to 4000 OQGRAPH_DESC= Open Query Graph Computation engine OQGRAPH_USE= GCC=yes OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs OQGRAPH_BROKEN= OQGraph does not build MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my__compare.h .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif # Server segfaults on i386 when built with clang >= 3.4 .if ${ARCH} == 'i386' USE_GCC= yes .endif post-extract-OQGRAPH-off: @${RM} -r ${WRKSRC}/storage/oqgraph post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .include Index: branches/2019Q2/databases/mariadb55-server/distinfo =================================================================== --- branches/2019Q2/databases/mariadb55-server/distinfo (revision 501049) +++ branches/2019Q2/databases/mariadb55-server/distinfo (revision 501050) @@ -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 Index: branches/2019Q2/databases/mariadb55-server/files/patch-MDEV-15961 =================================================================== --- branches/2019Q2/databases/mariadb55-server/files/patch-MDEV-15961 (revision 501049) +++ branches/2019Q2/databases/mariadb55-server/files/patch-MDEV-15961 (nonexistent) @@ -1,47 +0,0 @@ -https://jira.mariadb.org/browse/MDEV-15961 - ---- mysys/stacktrace.c.orig 2018-01-18 17:10:31 UTC -+++ mysys/stacktrace.c -@@ -34,19 +34,19 @@ - #include - #endif - -+#ifdef __linux__ - #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) -- - static char *heap_start; -- --#ifdef HAVE_BSS_START - extern char *__bss_start; --#endif -+#else -+#define PTR_SANE(p) (p) -+#endif /* __linux */ - - void my_init_stacktrace() - { --#ifdef HAVE_BSS_START -+#ifdef __linux__ - heap_start = (char*) &__bss_start; --#endif -+#endif /* __linux__ */ - } - - #ifdef __linux__ -@@ -131,14 +131,14 @@ static int safe_print_str(const char *ad - - void my_safe_print_str(const char* val, int max_len) - { -+#ifdef __linux__ - char *heap_end; - --#ifdef __linux__ - if (!safe_print_str(val, max_len)) - return; --#endif - - heap_end= (char*) sbrk(0); -+#endif - - if (!PTR_SANE(val)) - { Property changes on: branches/2019Q2/databases/mariadb55-server/files/patch-MDEV-15961 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt =================================================================== --- branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt (revision 501049) +++ branches/2019Q2/databases/mariadb55-server/files/patch-client_CMakeLists.txt (revision 501050) @@ -1,70 +1,70 @@ ---- 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}) +IF(FALSE) 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) +ENDIF() 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) +IF(FALSE) 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) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +IF(FALSE) 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) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) ENDIF(WIN32) +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 (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) Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 501049) +++ branches/2019Q2 (revision 501050) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r500269