Index: head/net/qt5-network/Makefile =================================================================== --- head/net/qt5-network/Makefile (revision 469747) +++ head/net/qt5-network/Makefile (revision 469748) @@ -1,52 +1,52 @@ # $FreeBSD$ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt network module BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= error: member access into incomplete type 'X509' (aka 'x509_st') RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= ssl USE_QT5= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= OPENSSL SSL QT_CONFIG= openssl 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 Index: head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp =================================================================== --- head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (revision 469747) +++ head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (nonexistent) @@ -1,20 +0,0 @@ -* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY -* ---- src/network/ssl/qsslsocket_openssl.cpp.orig 2016-12-01 08:17:04 UTC -+++ src/network/ssl/qsslsocket_openssl.cpp -@@ -1587,13 +1587,13 @@ void QSslSocketBackendPrivate::continueH - } - #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if defined(SSL_CTRL_GET_SERVER_TMP_KEY) - if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { - EVP_PKEY *key; - if (q_SSL_get_server_tmp_key(ssl, &key)) - configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); - } --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... -+#endif // defined(SSL_CTRL_GET_SERVER_TMP_KEY) - - connectionEncrypted = true; - emit q->encrypted(); Property changes on: head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp ___________________________________________________________________ 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: head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h =================================================================== --- head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (revision 469747) +++ head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (revision 469748) @@ -1,32 +1,22 @@ -* Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp -* -* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY -* +Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp. --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2018-01-16 06:53:43 UTC +++ src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -228,7 +228,7 @@ int q_BIO_read(BIO *a, void *b, int c); Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); int q_BN_num_bits(const BIGNUM *a); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if !defined(BN_is_word) int q_BN_is_word(BIGNUM *a, BN_ULONG w); #else // BN_is_word is implemented purely as a -@@ -511,11 +511,14 @@ void q_EC_KEY_free(EC_KEY *ecdh); +@@ -511,6 +511,9 @@ void q_EC_KEY_free(EC_KEY *ecdh); size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems); #if OPENSSL_VERSION_NUMBER >= 0x10002000L int q_EC_curve_nist2nid(const char *name); +#if defined(LIBRESSL_VERSION_NUMBER) +int q_SSL_CTX_set1_groups(SSL_CTX *a, int *b, int c); +#endif // defined(LIBRESSL_VERSION_NUMBER) #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L #endif // OPENSSL_NO_EC --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if defined(SSL_CTRL_GET_SERVER_TMP_KEY) - #define q_SSL_get_server_tmp_key(ssl, key) q_SSL_ctrl((ssl), SSL_CTRL_GET_SERVER_TMP_KEY, 0, (char *)key) --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L -+#endif // defined(SSL_CTRL_GET_SERVER_TMP_KEY) - - // PKCS#12 support - int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca); + #if OPENSSL_VERSION_NUMBER >= 0x10002000L