svn commit: r482423 - in branches/2018Q4/databases: mysql56-client mysql56-server mysql56-server/files

[Antoine Brodin]

Author: antoine
Date: Fri Oct 19 11:56:07 2018
New Revision: 482423
URL: https://svnweb.freebsd.org/changeset/ports/482423

Log:
  MFH: r481608 r481848
  
  databases/mysql56-{client, server}: Fix build with OpenSSL1.1.x
  This is the backport of fix on mysql57
  
  PR:		225888
  Reported by:	brnrd
  Reviewed by:	antoine
  Sponsored by:	The FreeBSD Foundation
  
  databases/mysql56-server: Fix build with libressl after r481608
  
  PR:		228899
  Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>
  Reported by:	brnrd
  Sponsored by:	The FreeBSD Foundation

Added:
  branches/2018Q4/databases/mysql56-server/files/patch-PR225888.diff
     - copied, changed from r481608, head/databases/mysql56-server/files/patch-PR225888.diff
Deleted:
  branches/2018Q4/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc
  branches/2018Q4/databases/mysql56-server/files/patch-vio_viosslfactories.c
Modified:
  branches/2018Q4/databases/mysql56-client/Makefile
  branches/2018Q4/databases/mysql56-server/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/databases/mysql56-client/Makefile
==============================================================================
--- branches/2018Q4/databases/mysql56-client/Makefile	Fri Oct 19 10:54:12 2018	(r482422)
+++ branches/2018Q4/databases/mysql56-client/Makefile	Fri Oct 19 11:56:07 2018	(r482423)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -31,5 +31,6 @@ MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
 
 CLIENT_ONLY=	yes
+EXTRA_PATCHES+=	${MASTERDIR}/files/patch-PR225888.diff
 
 .include "${MASTERDIR}/Makefile"

Modified: branches/2018Q4/databases/mysql56-server/Makefile
==============================================================================
--- branches/2018Q4/databases/mysql56-server/Makefile	Fri Oct 19 10:54:12 2018	(r482422)
+++ branches/2018Q4/databases/mysql56-server/Makefile	Fri Oct 19 11:56:07 2018	(r482423)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.41
-PORTREVISION?=	0
+PORTREVISION?=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server

Copied and modified: branches/2018Q4/databases/mysql56-server/files/patch-PR225888.diff (from r481608, head/databases/mysql56-server/files/patch-PR225888.diff)
==============================================================================
--- head/databases/mysql56-server/files/patch-PR225888.diff	Tue Oct  9 07:49:27 2018	(r481608, copy source)
+++ branches/2018Q4/databases/mysql56-server/files/patch-PR225888.diff	Fri Oct 19 11:56:07 2018	(r482423)
@@ -185,7 +185,7 @@ index 4acff4e4d9b..307778771be 100644
  {
  #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();