diff --git a/.portsignore b/.portsignore index 8fb5245bf46c..c26beb15b41f 100644 --- a/.portsignore +++ b/.portsignore @@ -4569,6 +4569,7 @@ net/py-libdnet net/py-qt5-networkauth net/py-qt6-networkauth net/qoauth-qt5 +net/qt5-network net/qt5-networkauth net/radiator net/rclone-browser diff --git a/net/Makefile b/net/Makefile index decc8432fcbd..e143b95732c6 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1094,7 +1094,6 @@ SUBDIR += pyrad SUBDIR += qadsl SUBDIR += qrcp - SUBDIR += qt5-network SUBDIR += qt6-coap SUBDIR += qt6-mqtt SUBDIR += qt6-networkauth diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile deleted file mode 100644 index 4685b1473397..000000000000 --- a/net/qt5-network/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -PORTNAME= network -PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 -CATEGORIES= net -PKGNAMEPREFIX= qt5- - -MAINTAINER= kde@FreeBSD.org -COMMENT= Qt network module - -USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base ssl -USE_PERL5= extract -USE_QT= core buildtools:build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -HAS_CONFIGURE= yes -CONFIGURE_ARGS= -no-gui -no-xcb - -BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -QT_DEFINES= OPENSSL SSL -QT_CONFIG= openssl - -.include - -# LibreSSL does not currently support BIO_ADDR in DTLSv1_listen() -.if ${SSL_DEFAULT:Mlibressl*} -CONFIGURE_ARGS+= -no-feature-dtls -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp - @${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \ - ${BUILD_WRKSRC}/ssl/qsslsocket_openssl_symbols.cpp - -post-configure: -.for d in src/network src/plugins/bearer/generic - ${MKDIR} ${WRKSRC}/${d} - cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} -.endfor - -post-build: - @cd ${WRKSRC}/src/plugins/bearer/generic && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ - ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} - -post-install: - @cd ${WRKSRC}/src/plugins/bearer/generic && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ - ${MAKE_ARGS} ${INSTALL_TARGET} - -.include diff --git a/net/qt5-network/distinfo b/net/qt5-network/distinfo deleted file mode 100644 index fadff284d571..000000000000 --- a/net/qt5-network/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1732250634 -SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 -SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp deleted file mode 100644 index b2d7469257b1..000000000000 --- a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp +++ /dev/null @@ -1,99 +0,0 @@ -Clean up interface type and MTU detection. - - - Introduce a class SockPuppet that handles closing the socket - automatically, and handles different address families as well. - - Finding MTU requires using AF_LOCAL, cribbed that detail from ifconfig.c - - Zero out structures more diligently, initialize pointers to nullptr. - - In particular, don't use a union of structs passed in to ioctl(). - Make them separate structs (with block scope so the compiler might - place them on top of each other, that would be ok). - - IFM_FDDI (still) exists in 11.2, not in 12.0 - ---- src/network/kernel/qnetworkinterface_unix.cpp.orig 2019-10-25 07:16:48 UTC -+++ src/network/kernel/qnetworkinterface_unix.cpp -@@ -420,13 +420,24 @@ QT_BEGIN_INCLUDE_NAMESPACE - #endif // QT_PLATFORM_UIKIT - QT_END_INCLUDE_NAMESPACE - --static int openSocket(int &socket) -+template struct SockPuppet - { -- if (socket == -1) -- socket = qt_safe_socket(AF_INET, SOCK_DGRAM, 0); -- return socket; --} -+ int socket{-1}; - -+ int open() -+ { -+ if (socket == -1) -+ socket = qt_safe_socket(address_family, SOCK_DGRAM, 0); -+ return socket; -+ } -+ -+ ~SockPuppet() -+ { -+ if (socket != -1) -+ qt_safe_close(socket); -+ } -+}; -+ - static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, struct ifmediareq *req) - { - // Determine the interface type. -@@ -480,16 +491,9 @@ static QNetworkInterface::InterfaceType probeIfType(in - static QList createInterfaces(ifaddrs *rawList) - { - QList interfaces; -- union { -- struct ifmediareq mediareq; -- struct ifreq req; -- }; -- int socket = -1; -- memset(&mediareq, 0, sizeof(mediareq)); - -- // ensure both structs start with the name field, of size IFNAMESIZ -- Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name)); -- Q_ASSERT(&mediareq.ifm_name == &req.ifr_name); -+ SockPuppet socket; -+ SockPuppet localSocket; - - // on NetBSD we use AF_LINK and sockaddr_dl - // scan the list for that family -@@ -503,14 +507,22 @@ static QList createInterfa - iface->name = QString::fromLatin1(ptr->ifa_name); - iface->flags = convertFlags(ptr->ifa_flags); - iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl)); -+ { -+ ifmediareq req; -+ memset(&req, 0, sizeof(req)); -+ strncpy(req.ifm_name, ptr->ifa_name, sizeof(req.ifm_name)); -+ iface->type = probeIfType(socket.open(), sdl->sdl_type, &req); -+ } -+ { -+ ifreq req; -+ memset(&req, 0, sizeof(req)); -+ strncpy(req.ifr_name, ptr->ifa_name, sizeof(req.ifr_name)); -+ req.ifr_addr.sa_family = AF_LOCAL; -+ iface->mtu = getMtu(localSocket.open(), &req); -+ } - -- qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name)); -- iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq); -- iface->mtu = getMtu(socket, &req); - } - -- if (socket != -1) -- qt_safe_close(socket); - return interfaces; - } - -@@ -609,7 +621,7 @@ static QList interfaceList - { - QList interfaces; - -- ifaddrs *interfaceListing; -+ ifaddrs *interfaceListing = nullptr; - if (getifaddrs(&interfaceListing) == -1) { - // error - return interfaces; diff --git a/net/qt5-network/files/patch-src_network_socket_qnet__unix__p.h b/net/qt5-network/files/patch-src_network_socket_qnet__unix__p.h deleted file mode 100644 index 8e6ca284ab48..000000000000 --- a/net/qt5-network/files/patch-src_network_socket_qnet__unix__p.h +++ /dev/null @@ -1,17 +0,0 @@ -Some extra includes for us. - ---- src/network/socket/qnet_unix_p.h.orig 2018-12-03 11:15:26 UTC -+++ src/network/socket/qnet_unix_p.h -@@ -71,6 +71,12 @@ - # include - #endif - -+#if defined(Q_OS_FREEBSD) -+# include -+# include -+# include -+#endif -+ - QT_BEGIN_NAMESPACE - - // Almost always the same. If not, specify in qplatformdefs.h. diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp deleted file mode 100644 index 046805b006c3..000000000000 --- a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/network/ssl/qsslcertificate_openssl.cpp.orig 2022-12-09 10:58:56 UTC -+++ src/network/ssl/qsslcertificate_openssl.cpp -@@ -727,7 +727,7 @@ static QMultiMap _q_mapFromX509Na - unsigned char *data = nullptr; - int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info.insert(name, QString::fromUtf8((char*)data, size)); --#if QT_CONFIG(opensslv11) -+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) - q_CRYPTO_free(data, nullptr, 0); - #else - q_CRYPTO_free(data); diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp deleted file mode 100644 index 0fc24a49fc2a..000000000000 --- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp +++ /dev/null @@ -1,77 +0,0 @@ ---- src/network/ssl/qsslcontext_openssl.cpp.orig 2022-06-22 10:58:13 UTC -+++ src/network/ssl/qsslcontext_openssl.cpp -@@ -54,12 +54,14 @@ - - QT_BEGIN_NAMESPACE - -+#ifdef SSL_SECOP_PEER - Q_GLOBAL_STATIC(bool, forceSecurityLevel) - - Q_NETWORK_EXPORT void qt_ForceTlsSecurityLevel() - { - *forceSecurityLevel() = true; - } -+#endif //SSL_SECOP_PEER - - // defined in qsslsocket_openssl.cpp: - extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); -@@ -351,9 +353,11 @@ init_context: - return; - } - -+#ifdef SSL_SECOP_PEER - // A nasty hacked OpenSSL using a level that will make our auto-tests fail: - if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) - q_SSL_CTX_set_security_level(sslContext->ctx, 1); -+#endif //SSL_SECOP_PEER - - const long anyVersion = - #if QT_CONFIG(dtls) -@@ -408,16 +412,28 @@ init_context: - maxVersion = DTLS1_VERSION; - break; - case QSsl::DtlsV1_0OrLater: -+#ifdef DTLS_MAX_VERSION - minVersion = DTLS1_VERSION; - maxVersion = 0; -+#else -+ Q_UNREACHABLE(); -+#endif // DTLS_MAX_VERSION - break; - case QSsl::DtlsV1_2: -+#ifdef DTLS1_2_VERSION - minVersion = DTLS1_2_VERSION; - maxVersion = DTLS1_2_VERSION; -+#else -+ Q_UNREACHABLE(); -+#endif // DTLS1_2_VERSION - break; - case QSsl::DtlsV1_2OrLater: -+#if defined(DTLS1_2_VERSION) - minVersion = DTLS1_2_VERSION; - maxVersion = 0; -+#else -+ Q_UNREACHABLE(); -+#endif // DTLS1_2_VERSION - break; - case QSsl::TlsV1_3OrLater: - #ifdef TLS1_3_VERSION -@@ -722,6 +738,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC - } - #endif // ocsp - -+#ifndef LIBRESSL_VERSION_NUMBER - QSharedPointer cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); - if (cctx) { - q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -768,7 +785,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC - sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); - sslContext->errorCode = QSslError::UnspecifiedError; - } -- } else { -+ } else -+#endif // LIBRESSL_VERSION_NUMBER -+ { - sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); - sslContext->errorCode = QSslError::UnspecifiedError; - } diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h deleted file mode 100644 index 7b54761a70db..000000000000 --- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h +++ /dev/null @@ -1,16 +0,0 @@ ---- src/network/ssl/qsslcontext_openssl_p.h.orig 2022-06-22 10:58:13 UTC -+++ src/network/ssl/qsslcontext_openssl_p.h -@@ -61,6 +61,13 @@ - - QT_BEGIN_NAMESPACE - -+#ifndef DTLS_ANY_VERSION -+#define DTLS_ANY_VERSION 0x1FFFF -+#endif -+#ifndef TLS_ANY_VERSION -+#define TLS_ANY_VERSION 0x10000 -+#endif -+ - #ifndef QT_NO_SSL - - class QSslContextPrivate; diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp deleted file mode 100644 index dd0ac35fae83..000000000000 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp +++ /dev/null @@ -1,36 +0,0 @@ ---- src/network/ssl/qsslsocket_openssl.cpp.orig 2022-12-09 10:58:56 UTC -+++ src/network/ssl/qsslsocket_openssl.cpp -@@ -246,6 +246,12 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co - return 1; // need to return 1 or else "the connection setup fails." - } - -+#endif // TLS1_3_VERSION -+ -+#endif // !OPENSSL_NO_PSK -+ -+#if (!defined(OPENSSL_NO_PSK) || defined(LIBRESSL_VERSION_NUMBER)) \ -+ && defined(TLS1_3_VERSION) - int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session) - { - if (!ssl) { -@@ -261,10 +267,8 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi - QSslSocketBackendPrivate::s_indexForSSLExtraData)); - return socketPrivate->handleNewSessionTicket(ssl); - } --#endif // TLS1_3_VERSION -+#endif - --#endif // !OPENSSL_NO_PSK -- - #if QT_CONFIG(ocsp) - - int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) -@@ -660,7 +664,7 @@ bool QSslSocketBackendPrivate::initSslContext() - else if (mode == QSslSocket::SslServerMode) - q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); - --#if OPENSSL_VERSION_NUMBER >= 0x10101006L -+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) - // Set the client callback for TLSv1.3 PSK - if (mode == QSslSocket::SslClientMode - && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp deleted file mode 100644 index db1c14cb993f..000000000000 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp +++ /dev/null @@ -1,209 +0,0 @@ ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2022-12-09 10:58:56 UTC -+++ src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -142,14 +142,21 @@ DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts - DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) - DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) - DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) -+#endif - DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) - DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) -+#ifdef OPENSSL_NO_DEPRECATED_3_0 - DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) - DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) - DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) -+#endif // OPENSSL_NO_DEPRECATED_3_0 - DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) -+#endif -+#if !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) - DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) - DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) -@@ -158,8 +165,18 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, - DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) - DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) - DEFINEFUNC2(qssloptions, SSL_CTX_set_options, SSL_CTX *ctx, ctx, qssloptions op, op, return 0, return) -+#else -+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) -+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) -+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) -+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) -+#endif // LIBRESSL_VERSION_NUMBER -+#ifdef SSL_SECOP_PEER - DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) - DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) -+#endif //SSL_SECOP_PEER - #ifdef TLS1_3_VERSION - DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) - DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -169,7 +186,9 @@ DEFINEFUNC(int, SSL_SESSION_is_resumable, const SSL_SE - DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) - DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) - DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC2(unsigned long, SSL_set_options, SSL *ssl, ssl, unsigned long op, op, return 0, return) -+#endif - - DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return nullptr, return) - DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -@@ -185,7 +204,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE - DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) - DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) - DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) -+#else -+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) -+#endif - DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) - DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) - DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -@@ -225,7 +248,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING - ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, - return 0, return) - DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) -+#endif - DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) - DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, - int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -358,12 +383,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a - 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 nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, 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); - DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); - DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); - DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); -+#endif - DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) - DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) - DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -388,7 +415,11 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, B - DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) - DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) - DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return) -+#else -+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return) -+#endif - DEFINEFUNC(int, SSL_get_shutdown, const SSL *ssl, ssl, return 0, return) - DEFINEFUNC2(int, SSL_set_session, SSL* to, to, SSL_SESSION *session, session, return -1, return) - DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) -@@ -863,20 +894,35 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(EVP_CIPHER_CTX_reset) - RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) - RESOLVEFUNC(EVP_PKEY_up_ref) -+#ifdef OPENSSL_NO_DEPRECATED_3_0 - RESOLVEFUNC(EVP_PKEY_CTX_new) - RESOLVEFUNC(EVP_PKEY_param_check) - RESOLVEFUNC(EVP_PKEY_CTX_free) -+#endif // OPENSSL_NO_DEPRECATED_3_0 - RESOLVEFUNC(RSA_bits) -+#if !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(OPENSSL_sk_new_null) - RESOLVEFUNC(OPENSSL_sk_push) - RESOLVEFUNC(OPENSSL_sk_free) - RESOLVEFUNC(OPENSSL_sk_num) - RESOLVEFUNC(OPENSSL_sk_pop_free) - RESOLVEFUNC(OPENSSL_sk_value) -+#else -+ RESOLVEFUNC(sk_new_null) -+ RESOLVEFUNC(sk_push) -+ RESOLVEFUNC(sk_free) -+ RESOLVEFUNC(sk_num) -+ RESOLVEFUNC(sk_pop_free) -+ RESOLVEFUNC(sk_value) -+#endif - RESOLVEFUNC(DH_get0_pqg) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_CTX_set_options) -+#endif -+#ifdef SSL_SECOP_PEER - RESOLVEFUNC(SSL_CTX_get_security_level) - RESOLVEFUNC(SSL_CTX_set_security_level) -+#endif //SSL_SECOP_PEER - #ifdef TLS1_3_VERSION - RESOLVEFUNC(SSL_CTX_set_ciphersuites) - RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -886,9 +932,13 @@ bool q_resolveOpenSslSymbols() - - RESOLVEFUNC(SSL_get_client_random) - RESOLVEFUNC(SSL_SESSION_get_master_key) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_session_reused) -+#endif - RESOLVEFUNC(SSL_get_session) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_set_options) -+#endif - RESOLVEFUNC(CRYPTO_get_ex_new_index) - RESOLVEFUNC(TLS_method) - RESOLVEFUNC(TLS_client_method) -@@ -929,7 +979,9 @@ bool q_resolveOpenSslSymbols() - - RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) - RESOLVEFUNC(DH_bits) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - RESOLVEFUNC(DSA_bits) -+#endif - - #if QT_CONFIG(dtls) - RESOLVEFUNC(DTLSv1_listen) -@@ -959,7 +1011,9 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(OCSP_check_validity) - RESOLVEFUNC(OCSP_cert_to_id) - RESOLVEFUNC(OCSP_id_get0_info) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - RESOLVEFUNC(OCSP_resp_get0_certs) -+#endif - RESOLVEFUNC(OCSP_basic_sign) - RESOLVEFUNC(OCSP_response_create) - RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -996,7 +1050,9 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(EC_GROUP_get_degree) - #endif - RESOLVEFUNC(BN_num_bits) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - RESOLVEFUNC(BN_is_word) -+#endif - RESOLVEFUNC(BN_mod_word) - RESOLVEFUNC(DSA_new) - RESOLVEFUNC(DSA_free) -@@ -1089,12 +1145,14 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) - RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) - RESOLVEFUNC(SSL_CTX_get_cert_store); -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_CONF_CTX_new); - RESOLVEFUNC(SSL_CONF_CTX_free); - RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); - RESOLVEFUNC(SSL_CONF_CTX_set_flags); - RESOLVEFUNC(SSL_CONF_CTX_finish); - RESOLVEFUNC(SSL_CONF_cmd); -+#endif - RESOLVEFUNC(SSL_accept) - RESOLVEFUNC(SSL_clear) - RESOLVEFUNC(SSL_connect) -@@ -1122,7 +1180,11 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_set_bio) - RESOLVEFUNC(SSL_set_connect_state) - RESOLVEFUNC(SSL_shutdown) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_in_init) -+#else -+ RESOLVEFUNC(SSL_state) -+#endif - RESOLVEFUNC(SSL_get_shutdown) - RESOLVEFUNC(SSL_set_session) - RESOLVEFUNC(SSL_SESSION_free) diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h deleted file mode 100644 index f57d4847fa11..000000000000 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h +++ /dev/null @@ -1,177 +0,0 @@ ---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2023-10-06 09:42:49 UTC -+++ src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE - - #define DUMMYARG - -+#ifdef LIBRESSL_VERSION_NUMBER -+typedef _STACK STACK; -+typedef STACK OPENSSL_STACK; -+typedef void OPENSSL_INIT_SETTINGS; -+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); -+#endif -+ - #if !defined QT_LINKED_OPENSSL - // **************** Shared declarations ****************** - // ret func(arg) -@@ -230,21 +237,20 @@ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); - Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); - Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); - -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - int q_DSA_bits(DSA *a); -+#else -+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) -+#endif - void q_AUTHORITY_INFO_ACCESS_free(AUTHORITY_INFO_ACCESS *a); - int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); - Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); -+#ifdef OPENSSL_NO_DEPRECATED_3_0 - EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); - void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); - int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); -+#endif // OPENSSL_NO_DEPRECATED_3_0 - int q_RSA_bits(RSA *a); --Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); --Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); --Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); --Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); --Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); --Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); --int q_SSL_session_reused(SSL *a); - - #if OPENSSL_VERSION_MAJOR < 3 - using qssloptions = unsigned long; -@@ -252,7 +258,33 @@ using qssloptions = uint64_t; - using qssloptions = uint64_t; - #endif // OPENSSL_VERSION_MAJOR - -+#if !defined(LIBRESSL_VERSION_NUMBER) -+Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); -+Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); -+Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); -+Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); -+Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); -+Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); -+int q_SSL_session_reused(SSL *a); - qssloptions q_SSL_CTX_set_options(SSL_CTX *ctx, qssloptions op); -+#else // LIBRESSL_VERSION_NUMBER -+int q_sk_num(STACK *a); -+#define q_OPENSSL_sk_num(a) q_sk_num(a) -+void q_sk_pop_free(STACK *a, void (*b)(void *)); -+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) -+STACK *q_sk_new_null(); -+#define q_OPENSSL_sk_new_null() q_sk_new_null() -+void q_sk_push(STACK *st, void *data); -+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) -+void q_sk_free(STACK *a); -+#define q_OPENSSL_sk_free q_sk_free -+void *q_sk_value(STACK *a, int b); -+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) -+#define q_SSL_session_reused(ssl) \ -+ q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL) -+#define q_SSL_CTX_set_options(ctx, op) \ -+ q_SSL_CTX_ctrl((ctx), SSL_CTRL_OPTIONS, (op), NULL) -+#endif // LIBRESSL_VERSION_NUMBER - int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); - size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen); - size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen); -@@ -278,8 +310,13 @@ int q_DH_bits(DH *dh); - # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ - | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) - -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - #define q_SKM_sk_num(st) q_OPENSSL_sk_num((OPENSSL_STACK *)st) - #define q_SKM_sk_value(type, st,i) (type *)q_OPENSSL_sk_value((OPENSSL_STACK *)st, i) -+#else -+#define q_SKM_sk_num(st) q_sk_num((OPENSSL_STACK *)st) -+#define q_SKM_sk_value(type, st,i) (type *)q_sk_value((OPENSSL_STACK *)st, i) -+#endif // LIBRESSL_VERSION_NUMBER - - #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ - | OPENSSL_INIT_ADD_ALL_DIGESTS \ -@@ -292,7 +329,12 @@ unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(c - const char *q_OpenSSL_version(int type); - - unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *session); -+#ifndef LIBRESSL_VERSION_NUMBER - unsigned long q_SSL_set_options(SSL *s, unsigned long op); -+#else -+#define q_SSL_set_options(ssl, op) \ -+ q_SSL_ctrl((ssl), SSL_CTRL_OPTIONS, (op), NULL) -+#endif - - #ifdef TLS1_3_VERSION - int q_SSL_CTX_set_ciphersuites(SSL_CTX *ctx, const char *str); -@@ -381,7 +423,12 @@ int q_BN_num_bits(const BIGNUM *a); - int q_BIO_read(BIO *a, void *b, int c); - Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - int q_BN_is_word(BIGNUM *a, BN_ULONG w); -+#else -+#define q_BN_is_word(a, w) (((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) \ -+ || (((w) == 0) && ((a)->top == 0))) && (!(w) || !(a)->neg)) -+#endif - BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); - - #ifndef OPENSSL_NO_EC -@@ -515,12 +562,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a) - 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); -+#ifndef 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); - unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); - int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); - int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); -+#endif - void q_SSL_free(SSL *a); - STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); - const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); -@@ -536,7 +585,12 @@ int q_SSL_shutdown(SSL *a); - void q_SSL_set_accept_state(SSL *a); - void q_SSL_set_connect_state(SSL *a); - int q_SSL_shutdown(SSL *a); -+#ifndef LIBRESSL_VERSION_NUMBER - int q_SSL_in_init(const SSL *s); -+#else -+int q_SSL_state(const SSL *s); -+#define q_SSL_in_init(s) (q_SSL_state((s))&SSL_ST_INIT) -+#endif - int q_SSL_get_shutdown(const SSL *ssl); - int q_SSL_set_session(SSL *to, SSL_SESSION *session); - void q_SSL_SESSION_free(SSL_SESSION *ses); -@@ -742,7 +796,11 @@ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash - int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, - ASN1_INTEGER **pserial, OCSP_CERTID *cid); - -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL - const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); -+#else -+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) -+#endif - Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); - Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); - int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); -@@ -761,11 +819,18 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in - - void *q_CRYPTO_malloc(size_t num, const char *file, int line); - #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) -+#ifndef LIBRESSL_VERSION_NUMBER - void q_CRYPTO_free(void *str, const char *file, int line); - #define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0) -+#else -+void q_CRYPTO_free(void *a); -+#define q_OPENSSL_free(addr) q_CRYPTO_free(addr) -+#endif - -+#ifdef SSL_SECOP_PEER - int q_SSL_CTX_get_security_level(const SSL_CTX *ctx); - void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level); -+#endif //SSL_SECOP_PEER - - QT_END_NAMESPACE - diff --git a/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp b/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp deleted file mode 100644 index 6ab81c6a881b..000000000000 --- a/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp +++ /dev/null @@ -1,54 +0,0 @@ -Determine suitable bearer. This code is basically the same -as the Linux code, except out ioctl()s are named differently -and we need an AF_LOCAL socket (this detail cribbed from ifconfig.c). -If getting the HW address succeeds, assume it's Ethernet. Tested -with two Ethernet cards and a vlan (all of which have a MAC reported -by ifconfig). - ---- src/plugins/bearer/generic/qgenericengine.cpp.orig 2018-12-03 11:15:26 UTC -+++ src/plugins/bearer/generic/qgenericengine.cpp -@@ -82,7 +82,7 @@ using namespace ABI::Windows::Networking::Connectivity - // needed as interface is used as parameter name in qGetInterfaceType - #undef interface - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - #include - #include - #include -@@ -139,6 +139,23 @@ static QNetworkConfiguration::BearerType qGetInterface - - if (result >= 0 && request.ifr_hwaddr.sa_family == ARPHRD_ETHER) - return QNetworkConfiguration::BearerEthernet; -+ -+#elif defined(Q_OS_FREEBSD) -+ int sock = socket(AF_LOCAL, SOCK_DGRAM, 0); -+ -+ ifreq request; -+ memset(&request, 0, sizeof(struct ifreq)); -+ strncpy(request.ifr_name, interface.toLocal8Bit().data(), sizeof(request.ifr_name) - 1); -+ request.ifr_name[sizeof(request.ifr_name) - 1] = '\0'; -+ -+ if (sock >= 0) { -+ int result = ioctl(sock, SIOCGHWADDR, &request); -+ close(sock); -+ -+ if (result >= 0) -+ return QNetworkConfiguration::BearerEthernet; -+ } -+ - #elif defined(Q_OS_WINRT) - ComPtr networkInfoStatics; - HRESULT hr = GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Networking_Connectivity_NetworkInformation).Get(), &networkInfoStatics); -@@ -231,9 +248,11 @@ static QNetworkConfiguration::BearerType qGetInterface - QGenericEngine::QGenericEngine(QObject *parent) - : QBearerEngineImpl(parent) - { -+#ifndef QT_NO_NETWORKINTERFACE - //workaround for deadlock in __cxa_guard_acquire with webkit on macos x - //initialise the Q_GLOBAL_STATIC in same thread as the AtomicallyInitializedStatic - (void)QNetworkInterface::interfaceFromIndex(0); -+#endif - } - - QGenericEngine::~QGenericEngine() diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist deleted file mode 100644 index 26d208ad0ddc..000000000000 --- a/net/qt5-network/pkg-plist +++ /dev/null @@ -1,210 +0,0 @@ -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/bitstreams_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/hpack_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/hpacktable_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/http2frames_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/http2protocol_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/http2streams_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/huffman_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractnetworkcache_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractprotocolhandler_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocket_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocketengine_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qasn1element_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qauthenticator_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qbearerengine_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qbearerplugin_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qdnslookup_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qdtls_openssl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qdtls_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qftp_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostaddress_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostinfo_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhsts_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhstsstore_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2protocolhandler_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpmultipart_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkconnection_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkconnectionchannel_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkheader_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkreply_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkrequest_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpprotocolhandler_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpsocketengine_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpthreaddelegate_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qlocalserver_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qlocalsocket_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_winrt_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnet_unix_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetconmonitor_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessauthenticationmanager_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessbackend_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccesscache_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccesscachebackend_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessdebugpipebackend_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessfilebackend_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessftpbackend_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessmanager_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkconfigmanager_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkconfiguration_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkcookie_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkcookiejar_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdatagram_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdiskcache_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkfile_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_uikit_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_unix_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreply_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplydataimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplywasmimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocsp_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpserver_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpsocket_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qspdyprotocolhandler_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificateextension_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcipher_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslconfiguration_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_openssl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssldiffiehellmanparameters_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpserver_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtnetwork-config_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtnetworkglobal_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qurlinfo_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qwindowscarootfetcher_p.h -%%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache -%%QT_INCDIR%%/QtNetwork/QAbstractSocket -%%QT_INCDIR%%/QtNetwork/QAuthenticator -%%QT_INCDIR%%/QtNetwork/QDnsDomainNameRecord -%%QT_INCDIR%%/QtNetwork/QDnsHostAddressRecord -%%QT_INCDIR%%/QtNetwork/QDnsLookup -%%QT_INCDIR%%/QtNetwork/QDnsMailExchangeRecord -%%QT_INCDIR%%/QtNetwork/QDnsServiceRecord -%%QT_INCDIR%%/QtNetwork/QDnsTextRecord -%%QT_INCDIR%%/QtNetwork/QDtls -%%QT_INCDIR%%/QtNetwork/QDtlsClientVerifier -%%QT_INCDIR%%/QtNetwork/QHostAddress -%%QT_INCDIR%%/QtNetwork/QHostInfo -%%QT_INCDIR%%/QtNetwork/QHstsPolicy -%%QT_INCDIR%%/QtNetwork/QHttpMultiPart -%%QT_INCDIR%%/QtNetwork/QHttp2Configuration -%%QT_INCDIR%%/QtNetwork/QHttpPart -%%QT_INCDIR%%/QtNetwork/QIPv6Address -%%QT_INCDIR%%/QtNetwork/QLocalServer -%%QT_INCDIR%%/QtNetwork/QLocalSocket -%%QT_INCDIR%%/QtNetwork/QNetworkAccessManager -%%QT_INCDIR%%/QtNetwork/QNetworkAddressEntry -%%QT_INCDIR%%/QtNetwork/QNetworkCacheMetaData -%%QT_INCDIR%%/QtNetwork/QNetworkConfiguration -%%QT_INCDIR%%/QtNetwork/QNetworkConfigurationManager -%%QT_INCDIR%%/QtNetwork/QNetworkCookie -%%QT_INCDIR%%/QtNetwork/QNetworkCookieJar -%%QT_INCDIR%%/QtNetwork/QNetworkDatagram -%%QT_INCDIR%%/QtNetwork/QNetworkDiskCache -%%QT_INCDIR%%/QtNetwork/QNetworkInterface -%%QT_INCDIR%%/QtNetwork/QNetworkProxy -%%QT_INCDIR%%/QtNetwork/QNetworkProxyFactory -%%QT_INCDIR%%/QtNetwork/QNetworkProxyQuery -%%QT_INCDIR%%/QtNetwork/QNetworkReply -%%QT_INCDIR%%/QtNetwork/QNetworkRequest -%%QT_INCDIR%%/QtNetwork/QNetworkSession -%%QT_INCDIR%%/QtNetwork/QOcspResponse -%%QT_INCDIR%%/QtNetwork/QPasswordDigestor -%%QT_INCDIR%%/QtNetwork/QSctpServer -%%QT_INCDIR%%/QtNetwork/QSctpSocket -%%QT_INCDIR%%/QtNetwork/QSsl -%%QT_INCDIR%%/QtNetwork/QSslCertificate -%%QT_INCDIR%%/QtNetwork/QSslCertificateExtension -%%QT_INCDIR%%/QtNetwork/QSslCipher -%%QT_INCDIR%%/QtNetwork/QSslConfiguration -%%QT_INCDIR%%/QtNetwork/QSslDiffieHellmanParameters -%%QT_INCDIR%%/QtNetwork/QSslEllipticCurve -%%QT_INCDIR%%/QtNetwork/QSslError -%%QT_INCDIR%%/QtNetwork/QSslKey -%%QT_INCDIR%%/QtNetwork/QSslPreSharedKeyAuthenticator -%%QT_INCDIR%%/QtNetwork/QSslSocket -%%QT_INCDIR%%/QtNetwork/QTcpServer -%%QT_INCDIR%%/QtNetwork/QTcpSocket -%%QT_INCDIR%%/QtNetwork/QUdpSocket -%%QT_INCDIR%%/QtNetwork/Q_IPV6ADDR -%%QT_INCDIR%%/QtNetwork/QtNetwork -%%QT_INCDIR%%/QtNetwork/QtNetworkDepends -%%QT_INCDIR%%/QtNetwork/QtNetworkVersion -%%QT_INCDIR%%/QtNetwork/qabstractnetworkcache.h -%%QT_INCDIR%%/QtNetwork/qabstractsocket.h -%%QT_INCDIR%%/QtNetwork/qauthenticator.h -%%QT_INCDIR%%/QtNetwork/qdnslookup.h -%%QT_INCDIR%%/QtNetwork/qdtls.h -%%QT_INCDIR%%/QtNetwork/qhostaddress.h -%%QT_INCDIR%%/QtNetwork/qhostinfo.h -%%QT_INCDIR%%/QtNetwork/qhstspolicy.h -%%QT_INCDIR%%/QtNetwork/qhttp2configuration.h -%%QT_INCDIR%%/QtNetwork/qhttpmultipart.h -%%QT_INCDIR%%/QtNetwork/qlocalserver.h -%%QT_INCDIR%%/QtNetwork/qlocalsocket.h -%%QT_INCDIR%%/QtNetwork/qnetworkaccessmanager.h -%%QT_INCDIR%%/QtNetwork/qnetworkconfigmanager.h -%%QT_INCDIR%%/QtNetwork/qnetworkconfiguration.h -%%QT_INCDIR%%/QtNetwork/qnetworkcookie.h -%%QT_INCDIR%%/QtNetwork/qnetworkcookiejar.h -%%QT_INCDIR%%/QtNetwork/qnetworkdatagram.h -%%QT_INCDIR%%/QtNetwork/qnetworkdiskcache.h -%%QT_INCDIR%%/QtNetwork/qnetworkinterface.h -%%QT_INCDIR%%/QtNetwork/qnetworkproxy.h -%%QT_INCDIR%%/QtNetwork/qnetworkreply.h -%%QT_INCDIR%%/QtNetwork/qnetworkrequest.h -%%QT_INCDIR%%/QtNetwork/qnetworksession.h -%%QT_INCDIR%%/QtNetwork/qocspresponse.h -%%QT_INCDIR%%/QtNetwork/qpassworddigestor.h -%%QT_INCDIR%%/QtNetwork/qsctpserver.h -%%QT_INCDIR%%/QtNetwork/qsctpsocket.h -%%QT_INCDIR%%/QtNetwork/qssl.h -%%QT_INCDIR%%/QtNetwork/qsslcertificate.h -%%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h -%%QT_INCDIR%%/QtNetwork/qsslcipher.h -%%QT_INCDIR%%/QtNetwork/qsslconfiguration.h -%%QT_INCDIR%%/QtNetwork/qssldiffiehellmanparameters.h -%%QT_INCDIR%%/QtNetwork/qsslellipticcurve.h -%%QT_INCDIR%%/QtNetwork/qsslerror.h -%%QT_INCDIR%%/QtNetwork/qsslkey.h -%%QT_INCDIR%%/QtNetwork/qsslpresharedkeyauthenticator.h -%%QT_INCDIR%%/QtNetwork/qsslsocket.h -%%QT_INCDIR%%/QtNetwork/qtcpserver.h -%%QT_INCDIR%%/QtNetwork/qtcpsocket.h -%%QT_INCDIR%%/QtNetwork/qtnetwork-config.h -%%QT_INCDIR%%/QtNetwork/qtnetworkglobal.h -%%QT_INCDIR%%/QtNetwork/qtnetworkversion.h -%%QT_INCDIR%%/QtNetwork/qudpsocket.h -%%QT_CMAKEDIR%%/Qt5Network/Qt5NetworkConfig.cmake -%%QT_CMAKEDIR%%/Qt5Network/Qt5NetworkConfigVersion.cmake -%%QT_CMAKEDIR%%/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake -%%QT_LIBDIR%%/libQt5Network.prl -%%QT_LIBDIR%%/libQt5Network.so -%%QT_LIBDIR%%/libQt5Network.so.5 -%%QT_LIBDIR%%/libQt5Network.so.%%SHORTVER%% -%%QT_LIBDIR%%/libQt5Network.so.%%FULLVER%% -%%DEBUG%%%%QT_LIBDIR%%/libQt5Network.so.%%FULLVER%%.debug -%%QT_MKSPECDIR%%/modules/qt_lib_network.pri -%%QT_MKSPECDIR%%/modules/qt_lib_network_private.pri -%%QT_PLUGINDIR%%/bearer/libqgenericbearer.so -%%DEBUG%%%%QT_PLUGINDIR%%/bearer/libqgenericbearer.so.debug -libdata/pkgconfig/Qt5Network.pc