svn commit: r469795 - in branches/2018Q2/databases: mariadb101-client/files mariadb101-server mariadb101-server/files

[Bernard Spil]

Author: brnrd
Date: Sun May 13 14:02:18 2018
New Revision: 469795
URL: https://svnweb.freebsd.org/changeset/ports/469795

Log:
  MFH: r469620 r469631
  
  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]
  Security:       57aec168-453e-11e8-8777-b499baebfeaf
  
  databases/mariadb101-client: Fix patch
  
  Reported by:	Niels Poppe
  
  Approved by:	portmgr (riggs)

Added:
  branches/2018Q2/databases/mariadb101-server/files/patch-MDEV-15961
     - copied unchanged from r469620, head/databases/mariadb101-server/files/patch-MDEV-15961
Deleted:
  branches/2018Q2/databases/mariadb101-client/files/patch-sql-common_client.c
  branches/2018Q2/databases/mariadb101-server/files/patch-sql-common_client.c
Modified:
  branches/2018Q2/databases/mariadb101-server/Makefile
  branches/2018Q2/databases/mariadb101-server/distinfo
  branches/2018Q2/databases/mariadb101-server/pkg-plist
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/databases/mariadb101-server/Makefile
==============================================================================
--- branches/2018Q2/databases/mariadb101-server/Makefile	Sun May 13 13:36:03 2018	(r469794)
+++ branches/2018Q2/databases/mariadb101-server/Makefile	Sun May 13 14:02:18 2018	(r469795)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.1.31
+PORTVERSION=	10.1.33
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${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'
 
@@ -183,6 +182,14 @@ post-install-MROONGA-on:
 		${STAGEDIR}${PREFIX}/share/groonga \
 		${STAGEDIR}${PREFIX}/share/mysql
 .endif # defined(CLIENT_ONLY)
+
+.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/mariadb101-server/distinfo
==============================================================================
--- branches/2018Q2/databases/mariadb101-server/distinfo	Sun May 13 13:36:03 2018	(r469794)
+++ branches/2018Q2/databases/mariadb101-server/distinfo	Sun May 13 14:02:18 2018	(r469795)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518260559
-SHA256 (mariadb-10.1.31.tar.gz) = ab7641c2fe4e5289da6141766a9c3350e013def56fafd6f1377080bc8048b2e6
-SIZE (mariadb-10.1.31.tar.gz) = 67982786
+TIMESTAMP = 1525903240
+SHA256 (mariadb-10.1.33.tar.gz) = 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d
+SIZE (mariadb-10.1.33.tar.gz) = 65292094

Copied: branches/2018Q2/databases/mariadb101-server/files/patch-MDEV-15961 (from r469620, head/databases/mariadb101-server/files/patch-MDEV-15961)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/databases/mariadb101-server/files/patch-MDEV-15961	Sun May 13 14:02:18 2018	(r469795, copy of r469620, head/databases/mariadb101-server/files/patch-MDEV-15961)
@@ -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: branches/2018Q2/databases/mariadb101-server/pkg-plist
==============================================================================
--- branches/2018Q2/databases/mariadb101-server/pkg-plist	Sun May 13 13:36:03 2018	(r469794)
+++ branches/2018Q2/databases/mariadb101-server/pkg-plist	Sun May 13 14:02:18 2018	(r469795)
@@ -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