svn commit: r477157 - in branches/2018Q3/databases: mysql57-client mysql57-server mysql57-server/files

[Mahdi Mokhtari]

Author: mmokhi
Date: Tue Aug 14 14:20:29 2018
New Revision: 477157
URL: https://svnweb.freebsd.org/changeset/ports/477157

Log:
  MFH: r476852 r476934
  
  mysql57-{client, server}: Update ports to 5.7.23
  This update includes Oracle Critical Patch Advisory published on July 2018
  More info:
  http://www.oracle.com/technetwork/security-advisory/cpujul2018-4258247.html#AppendixMSQL
  
  PR:		229860
  Submitted by:	Dani <i.dani at outlook.com<
  Reported by:	Markus Kohlmeyer <rootservice at gmail.com>
  Reviewed by:	brnrd , koobs
  Sponsored by:	The FreeBSD Foundation
  
  mysql57-server: Fix build with LibreSSL 2.7
  
  PR:		230527
  Submitted by:	Markus Kohlmeyer <rootservice at gmail.com>
  Reported by:	Markus Kohlmeyer <rootservice at gmail.com>
  Sponsored by:	The FreeBSD Foundation
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2018Q3/databases/mysql57-server/files/patch-sql_mysqld.cc
     - copied unchanged from r476934, head/databases/mysql57-server/files/patch-sql_mysqld.cc
Modified:
  branches/2018Q3/databases/mysql57-client/Makefile
  branches/2018Q3/databases/mysql57-server/Makefile
  branches/2018Q3/databases/mysql57-server/distinfo
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/databases/mysql57-client/Makefile
==============================================================================
--- branches/2018Q3/databases/mysql57-client/Makefile	Tue Aug 14 14:15:02 2018	(r477156)
+++ branches/2018Q3/databases/mysql57-client/Makefile	Tue Aug 14 14:20:29 2018	(r477157)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)

Modified: branches/2018Q3/databases/mysql57-server/Makefile
==============================================================================
--- branches/2018Q3/databases/mysql57-server/Makefile	Tue Aug 14 14:15:02 2018	(r477156)
+++ branches/2018Q3/databases/mysql57-server/Makefile	Tue Aug 14 14:20:29 2018	(r477157)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.7.22
-PORTREVISION?=	2
+PORTVERSION=	5.7.23
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server

Modified: branches/2018Q3/databases/mysql57-server/distinfo
==============================================================================
--- branches/2018Q3/databases/mysql57-server/distinfo	Tue Aug 14 14:15:02 2018	(r477156)
+++ branches/2018Q3/databases/mysql57-server/distinfo	Tue Aug 14 14:20:29 2018	(r477157)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524221054
-SHA256 (mysql-boost-5.7.22.tar.gz) = 5b2a61700af7c99f5630a7dfdb099af9283c3029843cddd9e123bcdbcc4aad03
-SIZE (mysql-boost-5.7.22.tar.gz) = 48985783
+TIMESTAMP = 1533936896
+SHA256 (mysql-boost-5.7.23.tar.gz) = d05700ec5c1c6dae9311059dc1713206c29597f09dbd237bf0679b3c6438e87a
+SIZE (mysql-boost-5.7.23.tar.gz) = 49025014

Copied: branches/2018Q3/databases/mysql57-server/files/patch-sql_mysqld.cc (from r476934, head/databases/mysql57-server/files/patch-sql_mysqld.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q3/databases/mysql57-server/files/patch-sql_mysqld.cc	Tue Aug 14 14:20:29 2018	(r477157, copy of r476934, head/databases/mysql57-server/files/patch-sql_mysqld.cc)
@@ -0,0 +1,11 @@
+--- sql/mysqld.cc.orig	2018-06-08 11:56:29.000000000 +0200
++++ sql/mysqld.cc	2018-08-11 13:38:48.782595000 +0200
+@@ -3408,7 +3408,7 @@
+ {
+ #ifdef HAVE_OPENSSL
+ #ifndef HAVE_YASSL
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+   CRYPTO_malloc_init();
+ #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+   OPENSSL_malloc_init();