Page MenuHomeFreeBSD
Files F146152698

D37052.id.diff
No OneTemporary
Actions

D37052.id.diff
View Options

diff --git a/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h b/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h
deleted file mode 100644
--- a/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
-
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL
-+#undef OPENSSL_VERSION_NUMBER
-+#define OPENSSL_VERSION_NUMBER 0x1000107fL
-+#endif
-+
- static inline const BIGNUM*
- rsa_get_n(const RSA *rsa)
- {
diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c
--- a/databases/freetds/files/patch-src_tds_tls.c
+++ b/databases/freetds/files/patch-src_tds_tls.c
@@ -11,19 +11,21 @@
#include <freetds/tds.h>
#include <freetds/utils/string.h>
#include <freetds/tls.h>
-@@ -74,6 +78,15 @@
- #define SSL_PUSH_ARGS gnutls_transport_ptr_t ptr, const void *data, size_t len
- #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
+@@ -600,7 +604,7 @@ tds_ssl_free(BIO *a)
+ return 1;
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010000FL
+ static BIO_METHOD tds_method_login[1] = {
+ {
+ BIO_TYPE_MEM,
+@@ -664,7 +668,7 @@ tds_deinit_openssl_methods(void)
+ # endif
+ #endif
+
+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010000FL
+ static tds_mutex *openssl_locks;
- /* some compatibility layer */
- #if !HAVE_BIO_GET_DATA
+ static void

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 6:48 AM (12 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29102195
Default Alt Text
D37052.id.diff (1 KB)

Event Timeline