diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-05-07 18:44:50 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-05-07 18:44:50 +0000 |
| commit | 58cd07ecebe240485d77f37625f813270a3ea6a8 (patch) | |
| tree | c8ff7dc27478517bfde9b73c4d92a4c12e5307c1 | |
| parent | Update the kqueue file monitering backend. (diff) | |
databases/freetds: Fix build with LibreSSL 2.7
- LibreSSL 2.7 introduces the OpenSSL 1.1 API
PR: 226911
Approved by: maintainer time-out
Notes
Notes:
svn path=/head/; revision=469309
| -rw-r--r-- | databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h (renamed from databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h) | 4 | ||||
| -rw-r--r-- | databases/freetds/files/patch-src_tds_tls.c | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h b/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h index d9bb1e3a9a76..301e80834bf7 100644 --- a/databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h +++ b/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h @@ -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 diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c index 7226bbe3ee8e..07a8cb8ec5ac 100644 --- a/databases/freetds/files/patch-src_tds_tls.c +++ b/databases/freetds/files/patch-src_tds_tls.c @@ -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,15 +11,18 @@ #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 */ #if OPENSSL_VERSION_NUMBER < 0x1010000FL |