From 36da12278900ef3d76607fd89366d684b6254042 Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Sat, 11 Aug 2018 17:52:22 +0000 Subject: mysql57-server: Fix build with LibreSSL 2.7 PR: 230527 Submitted by: Markus Kohlmeyer Reported by: Markus Kohlmeyer Sponsored by: The FreeBSD Foundation --- databases/mysql57-server/Makefile | 2 +- databases/mysql57-server/files/patch-sql_mysqld.cc | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 databases/mysql57-server/files/patch-sql_mysqld.cc (limited to 'databases/mysql57-server') diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index d3d5803dcf04..e859d70e13df 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.23 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server diff --git a/databases/mysql57-server/files/patch-sql_mysqld.cc b/databases/mysql57-server/files/patch-sql_mysqld.cc new file mode 100644 index 000000000000..64f8899c8b25 --- /dev/null +++ b/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(); -- cgit v1.2.3