kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/freetds: Fix build with LibreSSL 2.7

Browse source 
- LibreSSL 2.7 introduces the OpenSSL 1.1 API

PR:		226911
Approved by:	maintainer time-out
This commit is contained in:
Bernard Spil 2018-05-07 18:44:50 +00:00
parent 49f160c680
commit 58cd07eceb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=469309
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h → databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h
View file

@ -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

13
databases/freetds/files/patch-src_tds_tls.c
View file

@ -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