View | Details | Raw Unified | Return to bug 226911
Collapse All | Expand All

(-)databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h (-2 / +2 lines)
Lines 1-10 Link Here
1
--- src/tds/sec_negotiate_openssl.h.orig	2017-03-06 16:07:14 UTC
1
--- src/tds/sec_negotiate_openssl.h.orig	2017-02-15 09:00:01 UTC
2
+++ src/tds/sec_negotiate_openssl.h
2
+++ src/tds/sec_negotiate_openssl.h
3
@@ -37,6 +37,11 @@
3
@@ -37,6 +37,11 @@
4
 #error HAVE_OPENSSL not defines, this file should not be included
4
 #error HAVE_OPENSSL not defines, this file should not be included
5
 #endif
5
 #endif
6
 
6
 
7
+#ifdef LIBRESSL_VERSION_NUMBER
7
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL
8
+#undef OPENSSL_VERSION_NUMBER
8
+#undef OPENSSL_VERSION_NUMBER
9
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
9
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
10
+#endif
10
+#endif
(-)databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h (-14 lines)
Lines 1-14 Link Here
1
--- src/tds/sec_negotiate_openssl.h.orig	2017-03-06 16:07:14 UTC
2
+++ src/tds/sec_negotiate_openssl.h
3
@@ -37,6 +37,11 @@
4
 #error HAVE_OPENSSL not defines, this file should not be included
5
 #endif
6
 
7
+#ifdef LIBRESSL_VERSION_NUMBER
8
+#undef OPENSSL_VERSION_NUMBER
9
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
10
+#endif
11
+
12
 static inline const BIGNUM*
13
 rsa_get_n(const RSA *rsa)
14
 {
(-)databases/freetds/files/patch-src_tds_tls.c (-5 / +8 lines)
Lines 1-8 Link Here
1
--- src/tds/tls.c.orig	2015-06-09 10:38:40 UTC
1
--- src/tds/tls.c.orig	2017-11-30 09:00:01 UTC
2
+++ src/tds/tls.c
2
+++ src/tds/tls.c
3
@@ -46,6 +46,10 @@
3
@@ -50,6 +50,10 @@
4
 #include <sys/stat.h>
4
 #include <sys/socket.h>
5
 #endif /* HAVE_SYS_STAT_H */
5
 #endif
6
 
6
 
7
+#if defined(__FreeBSD__) || defined(__DragonFly__)
7
+#if defined(__FreeBSD__) || defined(__DragonFly__)
8
+#include <sys/socket.h>
8
+#include <sys/socket.h>
Lines 11-25 Link Here
11
 #include <freetds/tds.h>
11
 #include <freetds/tds.h>
12
 #include <freetds/string.h>
12
 #include <freetds/string.h>
13
 #include <freetds/tls.h>
13
 #include <freetds/tls.h>
14
@@ -72,6 +76,12 @@
14
@@ -72,6 +76,15 @@
15
 #define SSL_PTR ptr
15
 #define SSL_PTR ptr
16
 #else
16
 #else
17
 
17
 
18
+#ifdef LIBRESSL_VERSION_NUMBER
18
+#ifdef LIBRESSL_VERSION_NUMBER
19
+#if LIBRESSL_VERSION_NUMBER < 0x2070000FL
19
+static pthread_mutex_t *openssllocks;
20
+static pthread_mutex_t *openssllocks;
20
+#undef OPENSSL_VERSION_NUMBER
21
+#undef OPENSSL_VERSION_NUMBER
21
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
22
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
22
+#endif
23
+#endif
24
+#define TLS_ST_OK SSL_ST_OK
25
+#endif
23
+
26
+
24
 /* some compatibility layer */
27
 /* some compatibility layer */
25
 #if OPENSSL_VERSION_NUMBER < 0x1010000FL
28
 #if OPENSSL_VERSION_NUMBER < 0x1010000FL

Return to bug 226911