Attachment 196994 Details for Bug 228344 – svn-diff-qt5-network-5.11.1

[patch] svn-diff-qt5-network-5.11.1

svn-diff-libressl (text/plain), 4.63 KB, created by Walter Schwarzenfeld on 2018-09-09 22:35:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-09-09 22:35:01 UTC

Size: 4.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 479339)
>+++ Makefile	(working copy)
>@@ -4,6 +4,7 @@
> DISTVERSION=	${QT5_VERSION}
> CATEGORIES=	net ipv6
> PKGNAMEPREFIX=	qt5-
>+PORTREVISION=	1
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt network module
>Index: files/patch-libressl
>===================================================================
>--- files/patch-libressl	(nonexistent)
>+++ files/patch-libressl	(working copy)
>@@ -0,0 +1,47 @@
>+--- config.tests/unix/openssl11/openssl.cpp	2017-11-05 16:07:40.963385070 -0500
>++++ config.tests/unix/openssl11/openssl.cpp	2017-11-05 16:07:51.755255545 -0500
>+@@ -39,7 +39,7 @@
>+ 
>+ #include <openssl/opensslv.h>
>+ 
>+-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L
>++#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+ #  error "OpenSSL >= 1.1 is required"
>+ #endif
>+ 
>+
>+--- src/network/ssl/qsslcontext_openssl.cpp
>++++ src/network/ssl/qsslcontext_openssl.cpp
>+@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
>+     if (sslContext->sslConfiguration.backendConfiguration().isEmpty())
>+         return;
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>+     if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
>+         QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
>+         if (cctx) {
>+
>+
>+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
>++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
>+@@ -402,7 +402,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
>+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
>+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
>+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return)
>+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return);
>+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
>+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
>+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
>++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
>+@@ -352,7 +352,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
>+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
>+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
>+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
>+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
>+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
>+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
>
>Property changes on: files/patch-libressl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-qsslsocket__openssl__symbols.cpp
>===================================================================
>--- files/patch-qsslsocket__openssl__symbols.cpp	(nonexistent)
>+++ files/patch-qsslsocket__openssl__symbols.cpp	(working copy)
>@@ -0,0 +1,18 @@
>+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2018-09-09 18:05:58 UTC
>++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
>+@@ -1157,6 +1157,7 @@ bool q_resolveOpenSslSymbols()
>+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
>+     RESOLVEFUNC(SSL_CTX_get_cert_store);
>+ #if OPENSSL_VERSION_NUMBER >= 0x10002000L
>++#if !defined(LIBRESSL_VERSION_NUMBER) 
>+     RESOLVEFUNC(SSL_CONF_CTX_new);
>+     RESOLVEFUNC(SSL_CONF_CTX_free);
>+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
>+@@ -1164,6 +1165,7 @@ bool q_resolveOpenSslSymbols()
>+     RESOLVEFUNC(SSL_CONF_CTX_finish);
>+     RESOLVEFUNC(SSL_CONF_cmd);
>+ #endif
>++#endif
>+     RESOLVEFUNC(SSL_accept)
>+     RESOLVEFUNC(SSL_clear)
>+     RESOLVEFUNC(SSL_connect)
>
>Property changes on: files/patch-qsslsocket__openssl__symbols.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 228344: 193533 | 193536 | 193559 | 193786 | 196989 | 196994 | 198438 | 198440 | 198490 | 198491 | 198600 | 198607 | 198610 | 198611 | 198618