From owner-svn-ports-head@freebsd.org Sat May 12 18:04:47 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8560FC897E; Sat, 12 May 2018 18:04:46 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 851667FF24; Sat, 12 May 2018 18:04:46 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C8F621BF6; Sat, 12 May 2018 18:04:46 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4CI4kRs009155; Sat, 12 May 2018 18:04:46 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4CI4jde009153; Sat, 12 May 2018 18:04:46 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201805121804.w4CI4jde009153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 12 May 2018 18:04:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469748 - in head/net/qt5-network: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/net/qt5-network: . files X-SVN-Commit-Revision: 469748 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2018 18:04:47 -0000 Author: rakuco Date: Sat May 12 18:04:45 2018 New Revision: 469748 URL: https://svnweb.freebsd.org/changeset/ports/469748 Log: Drop some patches for old LibreSSL versions. The ports tree currently has LibreSSL 2.7.3, so remove some patches added to support LibreSSL < 2.5 (also, according to brnrd@, they are currently broken). Cleaning up our existing patches also helps us move to Qt 5.10. Reviewed by: tcberner Differential Revision: https://reviews.freebsd.org/D15338 Deleted: head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp Modified: head/net/qt5-network/Makefile head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h Modified: head/net/qt5-network/Makefile ============================================================================== --- head/net/qt5-network/Makefile Sat May 12 18:04:12 2018 (r469747) +++ head/net/qt5-network/Makefile Sat May 12 18:04:45 2018 (r469748) @@ -2,7 +2,7 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- Modified: 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 Sat May 12 18:04:12 2018 (r469747) +++ head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h Sat May 12 18:04:45 2018 (r469748) @@ -1,7 +1,4 @@ -* 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); @@ -13,7 +10,7 @@ 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); @@ -22,11 +19,4 @@ +#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