Date: Fri, 11 May 2018 09:37:50 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469620 - in head/databases/mariadb101-server: . files Message-ID: <201805110937.w4B9bomT013040@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Fri May 11 09:37:49 2018 New Revision: 469620 URL: https://svnweb.freebsd.org/changeset/ports/469620 Log: databases/mariadb101-server: Security update to 10.1.33 - Fix build on aarch64 [1] - Remove ${name}_limits for 11-STABLE [2] PR: 227628 [1], 227434 [2], 228148 [3] Submitted by: Naram Qashat <cyberbotx cyberbotx com> [1] Submitted by: 0mp [2] Reported by: Miroslav Lachman <000 fbsd quip cz> [3] MFH: 2018Q2 Security: 57aec168-453e-11e8-8777-b499baebfeaf Added: head/databases/mariadb101-server/files/patch-MDEV-15961 (contents, props changed) Deleted: head/databases/mariadb101-server/files/patch-sql-common_client.c Modified: head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/distinfo head/databases/mariadb101-server/pkg-plist Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Fri May 11 09:34:02 2018 (r469619) +++ head/databases/mariadb101-server/Makefile Fri May 11 09:37:49 2018 (r469620) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.32 -PORTREVISION?= 2 +PORTVERSION= 10.1.33 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -22,7 +22,6 @@ 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_aarch64= Fails to link: missing sbrk BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' @@ -184,11 +183,10 @@ post-install-MROONGA-on: .include <bsd.port.options.mk> -.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1101514 || \ - ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057 -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.else +.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: head/databases/mariadb101-server/distinfo ============================================================================== --- head/databases/mariadb101-server/distinfo Fri May 11 09:34:02 2018 (r469619) +++ head/databases/mariadb101-server/distinfo Fri May 11 09:37:49 2018 (r469620) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522324355 -SHA256 (mariadb-10.1.32.tar.gz) = 0e2aae6a6a190d07c8e36e87dd43377057fa82651ca3c583462563f3e9369096 -SIZE (mariadb-10.1.32.tar.gz) = 68001321 +TIMESTAMP = 1525903240 +SHA256 (mariadb-10.1.33.tar.gz) = 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d +SIZE (mariadb-10.1.33.tar.gz) = 65292094 Added: head/databases/mariadb101-server/files/patch-MDEV-15961 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-server/files/patch-MDEV-15961 Fri May 11 09:37:49 2018 (r469620) @@ -0,0 +1,46 @@ +--- mysys/stacktrace.c.orig 2018-03-26 14:18:03 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__ +@@ -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)) + { Modified: head/databases/mariadb101-server/pkg-plist ============================================================================== --- head/databases/mariadb101-server/pkg-plist Fri May 11 09:34:02 2018 (r469619) +++ head/databases/mariadb101-server/pkg-plist Fri May 11 09:37:49 2018 (r469620) @@ -72,8 +72,8 @@ include/mysql/private/my_md5.h include/mysql/private/my_nosys.h include/mysql/private/my_rdtsc.h include/mysql/private/my_rnd.h +include/mysql/private/my_service_manager.h include/mysql/private/my_stacktrace.h -include/mysql/private/my_systemd.h include/mysql/private/my_time.h include/mysql/private/my_tree.h include/mysql/private/my_uctype.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805110937.w4B9bomT013040>