Attachment 191800 Details for Bug 226911 – svn diff for databases/freetds

[patch] svn diff for databases/freetds

patch-databases_freetds-LibreSSL2.7 (text/plain), 2.90 KB, created by Bernard Spil on 2018-03-25 11:04:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-03-25 11:04:50 UTC

Size: 2.90 KB

patch

obsolete

>Index: databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h
>===================================================================
>--- databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h	(revision 465230)
>+++ databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h	(working copy)
>@@ -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
>Index: databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h
>===================================================================
>--- databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h	(revision 465230)
>+++ databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h	(nonexistent)
>@@ -1,14 +0,0 @@
>---- src/tds/sec_negotiate_openssl.h.orig	2017-03-06 16:07:14 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
>-+#undef OPENSSL_VERSION_NUMBER
>-+#define OPENSSL_VERSION_NUMBER 0x1000107fL
>-+#endif
>-+
>- static inline const BIGNUM*
>- rsa_get_n(const RSA *rsa)
>- {
>
>Property changes on: databases/freetds/files/patch-src_tds_sec_negotiate_openssl.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: databases/freetds/files/patch-src_tds_tls.c
>===================================================================
>--- databases/freetds/files/patch-src_tds_tls.c	(revision 465230)
>+++ databases/freetds/files/patch-src_tds_tls.c	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 226911: 191800