Date: Fri, 27 Apr 2018 11:35:08 +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: r468423 - in branches/2018Q2/databases/mariadb55-server: . files Message-ID: <201804271135.w3RBZ8r8045643@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Fri Apr 27 11:35:08 2018 New Revision: 468423 URL: https://svnweb.freebsd.org/changeset/ports/468423 Log: MFH: r468131 databases/mariadb55-server: Security update to 5.5.60 - Fix build with aarch64 [1] - Remove new ${name}_limits behavior from 11-STABLE [2] PR: 227628 [1], 227434 [2] Submitted by: Naram Qashat <cyberbotx cyberbotx com> [1], 0mp [2] Security: 57aec168-453e-11e8-8777-b499baebfeaf Approved by: ports-secteam (riggs) Added: branches/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 - copied unchanged from r468131, head/databases/mariadb55-server/files/patch-MDEV-15961 Modified: branches/2018Q2/databases/mariadb55-server/Makefile branches/2018Q2/databases/mariadb55-server/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/databases/mariadb55-server/Makefile ============================================================================== --- branches/2018Q2/databases/mariadb55-server/Makefile Fri Apr 27 11:23:14 2018 (r468422) +++ branches/2018Q2/databases/mariadb55-server/Makefile Fri Apr 27 11:35:08 2018 (r468423) @@ -1,7 +1,7 @@ # $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/ \ @@ -50,7 +50,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ 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' @@ -100,6 +99,14 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-li OQGRAPH_BROKEN= OQGraph does not build MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my__compare.h +.endif + +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include <bsd.port.pre.mk> Modified: branches/2018Q2/databases/mariadb55-server/distinfo ============================================================================== --- branches/2018Q2/databases/mariadb55-server/distinfo Fri Apr 27 11:23:14 2018 (r468422) +++ branches/2018Q2/databases/mariadb55-server/distinfo Fri Apr 27 11:35:08 2018 (r468423) @@ -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 Copied: branches/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 (from r468131, head/databases/mariadb55-server/files/patch-MDEV-15961) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/databases/mariadb55-server/files/patch-MDEV-15961 Fri Apr 27 11:35:08 2018 (r468423, copy of r468131, head/databases/mariadb55-server/files/patch-MDEV-15961) @@ -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 <execinfo.h> + #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)) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804271135.w3RBZ8r8045643>