Attachment 238743 Details for Bug 259735 – patch

[patch] patch

a3d53a24f8.patch (text/plain), 2.45 KB, created by Ivan Rozhuk on 2022-12-13 01:19:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2022-12-13 01:19:26 UTC

Size: 2.45 KB

patch

obsolete

>From a3d53a24f89a5d9f6466fb5c9a992879b97c6828 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Tue, 9 Nov 2021 20:56:41 +0300
>Subject: [PATCH] net/turnserver: fix build with libressl
>
>https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259735
>---
> .../files/patch-src_apps_relay_mainrelay.c    | 11 ++++++++++
> ...-src_apps_relay_ns__ioalib__engine__impl.c | 20 +++++++++++++++++++
> 2 files changed, 31 insertions(+)
> create mode 100644 net/turnserver/files/patch-src_apps_relay_mainrelay.c
> create mode 100644 net/turnserver/files/patch-src_apps_relay_ns__ioalib__engine__impl.c
>
>diff --git a/net/turnserver/files/patch-src_apps_relay_mainrelay.c b/net/turnserver/files/patch-src_apps_relay_mainrelay.c
>new file mode 100644
>index 000000000000..9656455a3cf5
>--- /dev/null
>+++ b/net/turnserver/files/patch-src_apps_relay_mainrelay.c
>@@ -0,0 +1,11 @@
>+--- src/apps/relay/mainrelay.c	2021-01-10 22:59:55.000000000 +0300
>++++ src/apps/relay/mainrelay.c	2022-09-26 04:46:36.814362000 +0300
>+@@ -36,7 +36,7 @@
>+ #endif
>+ 
>+ 
>+-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
>++#if (!defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
>+ #undef OPENSSL_VERSION_NUMBER
>+ #define OPENSSL_VERSION_NUMBER 0x1000107FL
>+ #endif
>diff --git a/net/turnserver/files/patch-src_apps_relay_ns__ioalib__engine__impl.c b/net/turnserver/files/patch-src_apps_relay_ns__ioalib__engine__impl.c
>new file mode 100644
>index 000000000000..87a89f040a72
>--- /dev/null
>+++ b/net/turnserver/files/patch-src_apps_relay_ns__ioalib__engine__impl.c
>@@ -0,0 +1,20 @@
>+--- src/apps/relay/ns_ioalib_engine_impl.c	2021-01-10 22:59:55.000000000 +0300
>++++ src/apps/relay/ns_ioalib_engine_impl.c	2021-11-10 00:19:54.463428000 +0300
>+@@ -1833,7 +1833,7 @@
>+ 	BIO* rbio = BIO_new_mem_buf(buffer, old_buffer_len);
>+ 	BIO_set_mem_eof_return(rbio, -1);
>+ 
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER < 0x3040000fL)
>+ 	ssl->rbio = rbio;
>+ #else
>+ 	SSL_set0_rbio(ssl,rbio);
>+@@ -1928,7 +1928,7 @@
>+ 	if(ret>0) {
>+ 		ioa_network_buffer_add_offset_size(nbh, (uint16_t)buf_size, 0, (size_t)ret);
>+ 	}
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER < 0x3040000fL)
>+ 	ssl->rbio = NULL;
>+ 	BIO_free(rbio);
>+ #else

Actions: View | Diff

Attachments on bug 259735: 229383 | 229395 | 236828 | 238743 | 241956