Index: head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt (revision 476673) +++ head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt (nonexistent) @@ -1,48 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-01-12 01:45:23 UTC -+++ support-files/CMakeLists.txt -@@ -41,15 +41,18 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) - ENDFOREACH() -+ENDIF() - - IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+ IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -69,8 +72,10 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ADD_SUBDIRECTORY(SELinux) - ENDIF() -+ ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ IF(FALSE) - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - -@@ -94,6 +99,7 @@ IF(UNIX) - DESTINATION ${inst_location} COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ - - IF (INSTALL_SYSCONFDIR) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d -@@ -103,6 +109,7 @@ IF(UNIX) - RENAME mysql COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ ENDIF() - - INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} - COMPONENT Common) Property changes on: head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt ___________________________________________________________________ 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: head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt (revision 476673) +++ head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt (nonexistent) @@ -1,78 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC -+++ scripts/CMakeLists.txt -@@ -73,6 +73,7 @@ IF(UNIX) - ) - ENDIF() - -+IF(FALSE) - INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -82,6 +83,7 @@ INSTALL(FILES - ${FIX_PRIVILEGES_SQL} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server - ) -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -134,6 +136,7 @@ ENDIF() - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - -+IF(FALSE) - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables - SET(CC ${CMAKE_C_COMPILER}) -@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - ENDIF(UNIX) - -@@ -192,6 +196,7 @@ ELSE() - SET(localstatedir ${MYSQL_DATADIR}) - ENDIF() - -+IF() - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -207,6 +212,7 @@ INSTALL_SCRIPT( - COMPONENT Server - ) - ENDIF() -+ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") - IF(INSTALL_SYSCONFDIR) -@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -327,18 +335,8 @@ ELSE() - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_fix_extensions -- mysql_setpermission -- mysql_secure_installation -- mysql_zap - mysqlaccess -- mysql_convert_table_format - mysql_find_rows -- mytop -- mysqlhotcopy -- mysqldumpslow -- mysqld_multi -- mysqld_safe - ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) Property changes on: head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt ___________________________________________________________________ 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: head/databases/mariadb100-client/pkg-plist =================================================================== --- head/databases/mariadb100-client/pkg-plist (revision 476673) +++ head/databases/mariadb100-client/pkg-plist (revision 476674) @@ -1,104 +1,113 @@ bin/msql2mysql bin/mysql bin/mysql_config bin/mysql_find_rows bin/mysql_waitpid bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlshow bin/mysqlslap include/mysql/auth_dialog_client.h include/mysql/big_endian.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h include/mysql/byte_order_generic_x86_64.h include/mysql/client_plugin.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/handler_ername.h include/mysql/handler_state.h include/mysql/keycache.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/ma_dyncol.h include/mysql/my_alloc.h include/mysql/my_attribute.h include/mysql/my_byteorder.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h include/mysql/my_decimal_limits.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_pthread.h include/mysql/my_sys.h include/mysql/my_valgrind.h include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_com_server.h include/mysql/mysql_embed.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysqld_ername.h include/mysql/mysqld_error.h include/mysql/plugin.h include/mysql/plugin_audit.h include/mysql/plugin_auth.h include/mysql/plugin_auth_common.h include/mysql/plugin_ftparser.h include/mysql/psi/mysql_file.h include/mysql/psi/mysql_idle.h include/mysql/psi/mysql_socket.h include/mysql/psi/mysql_stage.h include/mysql/psi/mysql_statement.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/service_debug_sync.h include/mysql/service_kill_statement.h include/mysql/service_logger.h include/mysql/service_my_plugin_log.h include/mysql/service_my_snprintf.h include/mysql/service_progress_report.h include/mysql/service_sha1.h include/mysql/service_thd_alloc.h include/mysql/service_thd_autoinc.h include/mysql/service_thd_error_context.h include/mysql/service_thd_timezone.h include/mysql/service_thd_wait.h include/mysql/services.h include/mysql/sql_common.h include/mysql/sql_state.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.18 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_find_rows.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqlaccess.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz +@comment bin/mytop +@comment %%DATADIR%%/SELinux/mariadb.te +@comment %%DATADIR%%/SELinux/rhel4-mysql.fc +@comment %%DATADIR%%/SELinux/rhel4-mysql.te +@comment %%DATADIR%%/binary-configure +@comment %%DATADIR%%/magic +@comment %%DATADIR%%/mysql-log-rotate +@comment %%DATADIR%%/mysql.server +@comment %%DATADIR%%/mysqld_multi.server Index: head/databases/mariadb100-server/Makefile =================================================================== --- head/databases/mariadb100-server/Makefile (revision 476673) +++ head/databases/mariadb100-server/Makefile (revision 476674) @@ -1,183 +1,183 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.35 -PORTREVISION?= 1 +PORTVERSION= 10.0.36 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 100-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' SUB_FILES= pkg-message SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake:noninja compiler:c++11-lib cpe \ ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX NO_OPTIONS_SORT= yes FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mariadb" \ -DINSTALL_DOCREADMEDIR="share/doc/mariadb" \ -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= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_SSL=${OPENSSLBASE} \ -DWITH_LIBWRAP=1 \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ .if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY OPTIONS_DEFAULT+= MAXKEY OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine ENGINES_DESC= Optional MariaDB storage engines INNOBASE_DESC= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine OQGRAPH_DESC= Open Query Graph Computation engine (Requires GCC) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine OPTIONS_SUB= yes .endif FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline .else # MySQL-Server part BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory USES+= mysql:100m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 .endfor CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= PATENTS README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi post-install: # Remove programs to avoid conflict with mariadb100-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now . for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ bin/mysqlaccess share/aclocal/mysql.m4 ${RM} ${STAGEDIR}${PREFIX}/${f} . endfor ${RM} -r ${STAGEDIR}${DATADIR}/SELinux post-install-TOKUDB-on: ${RM} ${STAGEDIR}${DOCSDIR}/COPYING.GPLv2 \ ${STAGEDIR}${DOCSDIR}/COPYING.AGPLv3 .endif .include .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MTOKUDB} NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif .if ${ARCH} == 'i386' # Server segfaults on i386 when built with clang >= 3.4 USE_GCC= yes .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif post-patch: @${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 .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif post-configure-MROONGA-on: ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt .include Index: head/databases/mariadb100-server/distinfo =================================================================== --- head/databases/mariadb100-server/distinfo (revision 476673) +++ head/databases/mariadb100-server/distinfo (revision 476674) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524825442 -SHA256 (mariadb-10.0.35.tar.gz) = 401edb2c1e6be0badb94813b3db606ce8e57b6751a7e89f41127b943195ea828 -SIZE (mariadb-10.0.35.tar.gz) = 66551964 +TIMESTAMP = 1533756534 +SHA256 (mariadb-10.0.36.tar.gz) = edf5c73b171ebdd0ef1d847c16f6702e831c351662515bf570bdf025d727f1ce +SIZE (mariadb-10.0.36.tar.gz) = 66577105 Index: head/databases/mariadb100-server/files/patch-MDEV-15768 =================================================================== --- head/databases/mariadb100-server/files/patch-MDEV-15768 (revision 476673) +++ head/databases/mariadb100-server/files/patch-MDEV-15768 (nonexistent) @@ -1,72 +0,0 @@ ---- storage/connect/tabjson.cpp.orig 2018-04-26 19:47:48 UTC -+++ storage/connect/tabjson.cpp -@@ -195,7 +195,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ - tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL); - - if (!(tdp->Database = SetPath(g, db))) -- return NULL; -+ return 0; - - tdp->Objname = GetStringTableOption(g, topt, "Object", NULL); - tdp->Base = GetIntegerTableOption(g, topt, "Base", 0) ? 1 : 0; -@@ -243,14 +243,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ - tjsp = new(g) TDBJSON(tdp, new(g) MAPFAM(tdp)); - - if (tjsp->MakeDocument(g)) -- return NULL; -+ return 0; - - jsp = (tjsp->GetDoc()) ? tjsp->GetDoc()->GetValue(0) : NULL; - } else { - if (!(tdp->Lrecl = GetIntegerTableOption(g, topt, "Lrecl", 0))) - if (!mgo) { - sprintf(g->Message, "LRECL must be specified for pretty=%d", tdp->Pretty); -- return NULL; -+ return 0; - } else - tdp->Lrecl = 8192; // Should be enough - -@@ -261,7 +261,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ - tjnp = new(g)TDBJSN(tdp, new(g) UNZFAM(tdp)); - #else // !ZIP_SUPPORT - sprintf(g->Message, MSG(NO_FEAT_SUPPORT), "ZIP"); -- return NULL; -+ return 0; - #endif // !ZIP_SUPPORT - } else if (tdp->Uri) { - if (tdp->Driver && toupper(*tdp->Driver) == 'C') { -@@ -269,14 +269,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ - tjnp = new(g) TDBJSN(tdp, new(g) CMGFAM(tdp)); - #else - sprintf(g->Message, "Mongo %s Driver not available", "C"); -- return NULL; -+ return 0; - #endif - } else if (tdp->Driver && toupper(*tdp->Driver) == 'J') { - #if defined(JAVA_SUPPORT) - tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp)); - #else - sprintf(g->Message, "Mongo %s Driver not available", "Java"); -- return NULL; -+ return 0; - #endif - } else { // Driver not specified - #if defined(CMGO_SUPPORT) -@@ -285,7 +285,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ - tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp)); - #else - sprintf(g->Message, MSG(NO_FEAT_SUPPORT), "MONGO"); -- return NULL; -+ return 0; - #endif - } // endif Driver - -@@ -304,7 +304,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ - tjnp->SetG(G); - - if (tjnp->OpenDB(g)) -- return NULL; -+ return 0; - - switch (tjnp->ReadDB(g)) { - case RC_EF: Property changes on: head/databases/mariadb100-server/files/patch-MDEV-15768 ___________________________________________________________________ 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: head/databases/mariadb100-server/files/patch-mysys_stacktrace.c =================================================================== --- head/databases/mariadb100-server/files/patch-mysys_stacktrace.c (revision 476673) +++ head/databases/mariadb100-server/files/patch-mysys_stacktrace.c (revision 476674) @@ -1,46 +1,48 @@ +https://jira.mariadb.org/browse/MDEV-15961 + --- mysys/stacktrace.c.orig 2018-01-27 18:40:37 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__ @@ -149,15 +149,15 @@ static int safe_print_str(const char *ad int my_safe_print_str(const char* val, int max_len) { +#ifdef __linux__ char *heap_end; -#ifdef __linux__ // Try and make use of /proc filesystem to safely print memory contents. if (!safe_print_str(val, max_len)) return 0; -#endif heap_end= (char*) sbrk(0); +#endif if (!PTR_SANE(val)) {