From owner-svn-ports-all@freebsd.org Fri Jan 19 14:09:42 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E05A1EB45E9; Fri, 19 Jan 2018 14:09:42 +0000 (UTC) (envelope-from pizzamig@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 BA24382E8C; Fri, 19 Jan 2018 14:09:42 +0000 (UTC) (envelope-from pizzamig@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 F0AB7666A; Fri, 19 Jan 2018 14:09:41 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JE9fjt028217; Fri, 19 Jan 2018 14:09:41 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JE9fgM028212; Fri, 19 Jan 2018 14:09:41 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <201801191409.w0JE9fgM028212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Fri, 19 Jan 2018 14:09:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459415 - in head/databases: percona56-client/files percona56-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/databases: percona56-client/files percona56-server/files X-SVN-Commit-Revision: 459415 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.25 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: Fri, 19 Jan 2018 14:09:43 -0000 Author: pizzamig Date: Fri Jan 19 14:09:41 2018 New Revision: 459415 URL: https://svnweb.freebsd.org/changeset/ports/459415 Log: databases/percona56-server: fix SSL support with libressl databases/percona56-client: fix SSL support with libressl PR: 225261 Approved by: flo (maintainer) Sponsored by: trivago N.V. Added: head/databases/percona56-client/files/patch-sql-common_client.c (contents, props changed) head/databases/percona56-client/files/patch-vio_viosslfactories.c (contents, props changed) head/databases/percona56-server/files/patch-sql-common_client.c (contents, props changed) head/databases/percona56-server/files/patch-vio_viosslfactories.c (contents, props changed) Added: head/databases/percona56-client/files/patch-sql-common_client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-sql-common_client.c Fri Jan 19 14:09:41 2018 (r459415) @@ -0,0 +1,38 @@ +--- sql-common/client.c.orig 2018-01-17 11:39:51.315029000 +0000 ++++ sql-common/client.c 2018-01-17 11:44:53.493273000 +0000 +@@ -1884,7 +1884,7 @@ + *errptr= "Failed to get DNS name from SAN list item"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *)ASN1_STRING_data(dns_name); + #else + cn= (const char *)ASN1_STRING_get0_data(dns_name); +@@ -1946,7 +1946,7 @@ + *errptr= "Invalid IP address embedded in the certificate SAN IP address"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ip= ASN1_STRING_data(ip_address); + #else + ip= ASN1_STRING_get0_data(ip_address); +@@ -2111,7 +2111,7 @@ + if(server_ip_address != NULL) + { + iplen= ASN1_STRING_length(server_ip_address); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address); + #else + ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address); +@@ -2163,7 +2163,7 @@ + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *) ASN1_STRING_data(cn_asn1); + #else + cn= (const char *) ASN1_STRING_get0_data(cn_asn1); Added: head/databases/percona56-client/files/patch-vio_viosslfactories.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-vio_viosslfactories.c Fri Jan 19 14:09:41 2018 (r459415) @@ -0,0 +1,11 @@ +--- vio/viosslfactories.c.orig 2018-01-17 11:42:33.764076000 +0000 ++++ vio/viosslfactories.c 2018-01-17 11:43:21.072238000 +0000 +@@ -125,7 +125,7 @@ + { + BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER ) + dh->p= p; + dh->g= g; + if (! dh->p || ! dh->g) Added: head/databases/percona56-server/files/patch-sql-common_client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-sql-common_client.c Fri Jan 19 14:09:41 2018 (r459415) @@ -0,0 +1,38 @@ +--- sql-common/client.c.orig 2018-01-17 11:39:51.315029000 +0000 ++++ sql-common/client.c 2018-01-17 11:44:53.493273000 +0000 +@@ -1884,7 +1884,7 @@ + *errptr= "Failed to get DNS name from SAN list item"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *)ASN1_STRING_data(dns_name); + #else + cn= (const char *)ASN1_STRING_get0_data(dns_name); +@@ -1946,7 +1946,7 @@ + *errptr= "Invalid IP address embedded in the certificate SAN IP address"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ip= ASN1_STRING_data(ip_address); + #else + ip= ASN1_STRING_get0_data(ip_address); +@@ -2111,7 +2111,7 @@ + if(server_ip_address != NULL) + { + iplen= ASN1_STRING_length(server_ip_address); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address); + #else + ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address); +@@ -2163,7 +2163,7 @@ + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *) ASN1_STRING_data(cn_asn1); + #else + cn= (const char *) ASN1_STRING_get0_data(cn_asn1); Added: head/databases/percona56-server/files/patch-vio_viosslfactories.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-vio_viosslfactories.c Fri Jan 19 14:09:41 2018 (r459415) @@ -0,0 +1,11 @@ +--- vio/viosslfactories.c.orig 2018-01-17 11:42:33.764076000 +0000 ++++ vio/viosslfactories.c 2018-01-17 11:43:21.072238000 +0000 +@@ -125,7 +125,7 @@ + { + BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER ) + dh->p= p; + dh->g= g; + if (! dh->p || ! dh->g)