From owner-svn-ports-all@freebsd.org Wed Oct 31 19:40:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D2D510E3837; Wed, 31 Oct 2018 19:40:16 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26F5F85BB9; Wed, 31 Oct 2018 19:40:16 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0396010E72; Wed, 31 Oct 2018 19:40:16 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VJeFE1097053; Wed, 31 Oct 2018 19:40:15 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VJeFbY097052; Wed, 31 Oct 2018 19:40:15 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201810311940.w9VJeFbY097052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Wed, 31 Oct 2018 19:40:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483609 - head/databases/percona56-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: flo X-SVN-Commit-Paths: head/databases/percona56-server/files X-SVN-Commit-Revision: 483609 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 19:40:16 -0000 Author: flo Date: Wed Oct 31 19:40:15 2018 New Revision: 483609 URL: https://svnweb.freebsd.org/changeset/ports/483609 Log: Fix build with libressl PR: 232358 Submitted by: pizzamig Modified: head/databases/percona56-server/files/patch-sql_mysqld.cc Modified: head/databases/percona56-server/files/patch-sql_mysqld.cc ============================================================================== --- head/databases/percona56-server/files/patch-sql_mysqld.cc Wed Oct 31 19:30:30 2018 (r483608) +++ head/databases/percona56-server/files/patch-sql_mysqld.cc Wed Oct 31 19:40:15 2018 (r483609) @@ -17,3 +17,12 @@ static void set_proxy() { const char *p; +@@ -4685,7 +4695,7 @@ static void openssl_lock(int mode, opens + static int init_ssl() + { + #ifdef HAVE_OPENSSL +-#ifndef HAVE_YASSL ++#if !defined(HAVE_YASSL) && defined(OPENSSL_FIPS) + int fips_mode= FIPS_mode(); + if (fips_mode != 0) + {