jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tg_owt: update to 0.0.0.20210203.

Browse source
This commit is contained in:
John 2021-03-07 11:17:37 +01:00 committed by John Zimmermann
parent 6a9a07314f
commit ea4496ae32
3 changed files with 4 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
srcpkgs/tg_owt/patches/libressl.patch
View file

@ -1,70 +0,0 @@
From 3f2d8238846d4795f1292c05923b9f212dc4d022 Mon Sep 17 00:00:00 2001
From: Charlie Li <git@vishwin.info>
Date: Sat, 21 Nov 2020 14:24:04 -0500
Subject: [PATCH] Fix build with LibreSSL
LibreSSL's dtls1.h uses some definitions from ssl.h and ssl3.h, but
expects consumers to include them. Reorder and include them before
dtls1.h.
LibreSSL does not define DTLS1_2_VERSION. Remove them from view.
---
src/rtc_base/openssl_stream_adapter.cc | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/rtc_base/openssl_stream_adapter.cc b/src/rtc_base/openssl_stream_adapter.cc
index 7f4b79a5..037002bc 100644
--- a/src/rtc_base/openssl_stream_adapter.cc
+++ b/src/rtc_base/openssl_stream_adapter.cc
@@ -17,8 +17,11 @@
#include <openssl/tls1.h>
#include <openssl/x509v3.h>
#ifndef OPENSSL_IS_BORINGSSL
-#include <openssl/dtls1.h>
#include <openssl/ssl.h>
+#ifdef LIBRESSL_VERSION_NUMBER
+#include <openssl/ssl3.h>
+#endif
+#include <openssl/dtls1.h>
#endif
#include <memory>
@@ -392,8 +395,10 @@ SSLProtocolVersion OpenSSLStreamAdapter::GetSslVersion() const {
if (ssl_mode_ == SSL_MODE_DTLS) {
if (ssl_version == DTLS1_VERSION) {
return SSL_PROTOCOL_DTLS_10;
+#ifndef LIBRESSL_VERSION_NUMBER
} else if (ssl_version == DTLS1_2_VERSION) {
return SSL_PROTOCOL_DTLS_12;
+#endif
}
} else {
if (ssl_version == TLS1_VERSION) {
@@ -985,15 +990,27 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
case SSL_PROTOCOL_TLS_12:
default:
SSL_CTX_set_max_proto_version(
+#ifdef LIBRESSL_VERSION_NUMBER
+ ctx, TLS1_2_VERSION);
+#else
ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
+#endif
break;
}
} else {
// TODO(https://bugs.webrtc.org/10261): Make this the default in M84.
SSL_CTX_set_min_proto_version(
+#ifdef LIBRESSL_VERSION_NUMBER
+ ctx, TLS1_2_VERSION);
+#else
ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
+#endif
SSL_CTX_set_max_proto_version(
+#ifdef LIBRESSL_VERSION_NUMBER
+ ctx, TLS1_2_VERSION);
+#else
ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
+#endif
}
#ifdef OPENSSL_IS_BORINGSSL

1
srcpkgs/tg_owt/patches/libressl.patch.args
View file

@ -1 +0,0 @@
-Np1

9
srcpkgs/tg_owt/template
View file

@ -1,9 +1,8 @@
# Template file for 'tg_owt'
pkgname=tg_owt
version=0.0.0.1
revision=2
_commit=756fd0fb5f40ffb4244c675208e84de781f766f3
_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
version=0.0.0.20210321
revision=1
_commit=2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3
_libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
wrksrc="tg_owt-$_commit"
build_style=cmake
@ -18,7 +17,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/desktop-app/tg_owt"
distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
checksum="@43d09b00a43f9206b1f04c6d6697f4b0cb3be0285100bf5df91144b1d689c89a
checksum="@2873f3c9a6e5a93976623d4502af59bf6c8a3536aa9928acf45cea0a20e23ec0
@1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"