Date: Mon, 7 May 2018 18:44:51 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469309 - head/databases/freetds/files Message-ID: <201805071844.w47IipbL046495@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/stat.h> - #endif /* HAVE_SYS_STAT_H */ +@@ -50,6 +50,10 @@ + #include <sys/socket.h> + #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include <sys/socket.h> @@ -11,14 +11,17 @@ #include <freetds/tds.h> #include <freetds/string.h> #include <freetds/tls.h> -@@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805071844.w47IipbL046495>