Index: branches/2018Q2/databases/mariadb55-server/Makefile =================================================================== --- branches/2018Q2/databases/mariadb55-server/Makefile (revision 468422) +++ branches/2018Q2/databases/mariadb55-server/Makefile (revision 468423) @@ -1,126 +1,133 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.59 +PORTVERSION= 5.5.60 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 PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES+= cmake: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_aarch64= Fails to link: missing sbrk BROKEN_sparc64= Does not compile: Unsupported platform BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' .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/2018Q2/databases/mariadb55-server/distinfo =================================================================== --- branches/2018Q2/databases/mariadb55-server/distinfo (revision 468422) +++ branches/2018Q2/databases/mariadb55-server/distinfo (revision 468423) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516351401 -SHA256 (mariadb-5.5.59.tar.gz) = c3269ce20b45b177239fd1e3d6d9428a94131711f12758ebf5f65222278bb110 -SIZE (mariadb-5.5.59.tar.gz) = 45804920 +TIMESTAMP = 1524505018 +SHA256 (mariadb-5.5.60.tar.gz) = 4d3d444555416028ce39d3fb4cdc9cf6a658fcd4b0d2d0c45a73f9bf01d07929 +SIZE (mariadb-5.5.60.tar.gz) = 45822878 Index: branches/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 =================================================================== --- branches/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 (nonexistent) +++ branches/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 (revision 468423) @@ -0,0 +1,47 @@ +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/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 468422) +++ branches/2018Q2 (revision 468423) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r468131