From owner-svn-ports-head@freebsd.org Mon May 7 18:44:52 2018 Return-Path: Delivered-To: svn-ports-head@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 07B95FB95CE; Mon, 7 May 2018 18:44:52 +0000 (UTC) (envelope-from brnrd@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 A66236A7CC; Mon, 7 May 2018 18:44:51 +0000 (UTC) (envelope-from brnrd@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 82FB51F332; Mon, 7 May 2018 18:44:51 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w47Iipna046497; Mon, 7 May 2018 18:44:51 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w47IipbL046495; Mon, 7 May 2018 18:44:51 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805071844.w47IipbL046495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 7 May 2018 18:44:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469309 - head/databases/freetds/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/databases/freetds/files X-SVN-Commit-Revision: 469309 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2018 18:44:52 -0000 Author: brnrd Date: Mon May 7 18:44:50 2018 New Revision: 469309 URL: https://svnweb.freebsd.org/changeset/ports/469309 Log: databases/freetds: Fix build with LibreSSL 2.7 - LibreSSL 2.7 introduces the OpenSSL 1.1 API PR: 226911 Approved by: maintainer time-out Added: head/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h - copied, changed from r469308, head/databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h Deleted: head/databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h Modified: head/databases/freetds/files/patch-src_tds_tls.c Copied and modified: head/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h (from r469308, head/databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h) ============================================================================== --- head/databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h Mon May 7 18:42:54 2018 (r469308, copy source) +++ head/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h Mon May 7 18:44:50 2018 (r469309) @@ -1,10 +1,10 @@ ---- src/tds/sec_negotiate_openssl.h.orig 2017-03-06 16:07:14 UTC +--- src/tds/sec_negotiate_openssl.h.orig 2017-02-15 09:00:01 UTC +++ src/tds/sec_negotiate_openssl.h @@ -37,6 +37,11 @@ #error HAVE_OPENSSL not defines, this file should not be included #endif -+#ifdef LIBRESSL_VERSION_NUMBER ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL +#undef OPENSSL_VERSION_NUMBER +#define OPENSSL_VERSION_NUMBER 0x1000107fL +#endif Modified: head/databases/freetds/files/patch-src_tds_tls.c ============================================================================== --- head/databases/freetds/files/patch-src_tds_tls.c Mon May 7 18:42:54 2018 (r469308) +++ head/databases/freetds/files/patch-src_tds_tls.c Mon May 7 18:44:50 2018 (r469309) @@ -1,8 +1,8 @@ ---- src/tds/tls.c.orig 2015-06-09 10:38:40 UTC +--- src/tds/tls.c.orig 2017-11-30 09:00:01 UTC +++ src/tds/tls.c -@@ -46,6 +46,10 @@ - #include - #endif /* HAVE_SYS_STAT_H */ +@@ -50,6 +50,10 @@ + #include + #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include @@ -11,14 +11,17 @@ #include #include #include -@@ -72,6 +76,12 @@ +@@ -72,6 +76,15 @@ #define SSL_PTR ptr #else +#ifdef LIBRESSL_VERSION_NUMBER ++#if LIBRESSL_VERSION_NUMBER < 0x2070000FL +static pthread_mutex_t *openssllocks; +#undef OPENSSL_VERSION_NUMBER +#define OPENSSL_VERSION_NUMBER 0x1000107fL ++#endif ++#define TLS_ST_OK SSL_ST_OK +#endif + /* some compatibility layer */