Attachment #189924 for bug #225332

View | Details | Raw Unified | Return to bug 225332
Collapse All | Expand All

Lines 2-7 Link Here

(-)net/qt5-network/Makefile (+1 lines)
2		2
3	PORTNAME= network	3	PORTNAME= network
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
		5	PORTREVISION= 1
5	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
6	PKGNAMEPREFIX= qt5-	7	PKGNAMEPREFIX= qt5-
7		8

Lines 3-11 Link Here

(-)net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (-3 / +33 lines)
3	* Prepend the path of the SSL libraries used for building so the same libraries are	3	* Prepend the path of the SSL libraries used for building so the same libraries are
4	* found and loaded at runtime. Normal search finds base SSL libraries before ports.	4	* found and loaded at runtime. Normal search finds base SSL libraries before ports.
5	*	5	*
6	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2016-12-01 08:17:04 UTC	6	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2017-11-16 05:15:28 UTC
7	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	7	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
8	@@ -430,6 +430,7 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec	8	@@ -151,7 +151,7 @@ DEFINEFUNC3(int, BIO_read, BIO a, a, void b, b, int
		9	DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
		10	DEFINEFUNC3(int, BIO_write, BIO a, a, const void b, b, int c, c, return -1, return)
		11	DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
		12	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
		13	+#if !defined(BN_is_word)
		14	DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
		15	#endif
		16	DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return static_cast<BN_ULONG>(-1), return)
		17	@@ -453,6 +453,7 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ecdh, ecdh, retu
9	DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)	18	DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
10	#if OPENSSL_VERSION_NUMBER >= 0x10002000L	19	#if OPENSSL_VERSION_NUMBER >= 0x10002000L
11	DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)	20	DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
Lines 35-41 Link Here
35	if (libcrypto->load() && libssl->load()) {	44	if (libcrypto->load() && libssl->load()) {
36	// libssl.so.0 and libcrypto.so.0 found	45	// libssl.so.0 and libcrypto.so.0 found
37	return pair;	46	return pair;
38	@@ -982,8 +983,10 @@ bool q_resolveOpenSslSymbols()	47	@@ -790,7 +791,7 @@ bool q_resolveOpenSslSymbols()
		48	RESOLVEFUNC(EC_GROUP_get_degree)
		49	#endif
		50	RESOLVEFUNC(BN_num_bits)
		51	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
		52	+#if !defined(BN_is_word)
		53	RESOLVEFUNC(BN_is_word)
		54	#endif
		55	RESOLVEFUNC(BN_mod_word)
		56	@@ -1020,8 +1021,10 @@ bool q_resolveOpenSslSymbols()
39	RESOLVEFUNC(EC_KEY_free)	57	RESOLVEFUNC(EC_KEY_free)
40	RESOLVEFUNC(EC_get_builtin_curves)	58	RESOLVEFUNC(EC_get_builtin_curves)
41	#if OPENSSL_VERSION_NUMBER >= 0x10002000L	59	#if OPENSSL_VERSION_NUMBER >= 0x10002000L
Lines 47-49 Link Here
47	#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L	65	#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
48	#endif // OPENSSL_NO_EC	66	#endif // OPENSSL_NO_EC
49	RESOLVEFUNC(PKCS12_parse)	67	RESOLVEFUNC(PKCS12_parse)
		68	@@ -1030,10 +1033,9 @@ bool q_resolveOpenSslSymbols()
		69
		70	delete libs.first;
		71	delete libs.second;
		72	- if (!_q_SSLeay \|\| q_SSLeay() >= 0x10100000L) {
		73	+ if (!_q_SSLeay) {
		74	// OpenSSL 1.1 deprecated and removed SSLeay. We consider a failure to
		75	// resolve this symbol as a failure to resolve symbols.
		76	- // The right operand of '\|\|' above ... a bit of paranoia.
		77	qCWarning(lcSsl, "Incompatible version of OpenSSL");
		78	return false;
		79	}




*
* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY
*
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2017-11-16 05:15:28 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,12 @@ 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);

Return to bug 225332

Lines 2-10 Link Here

(-)net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (-2 / +11 lines)
2	*	2	*
3	* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY	3	* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY
4	*	4	*
5	--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2016-12-01 08:17:04 UTC	5	--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2017-11-16 05:15:28 UTC
6	+++ src/network/ssl/qsslsocket_openssl_symbols_p.h	6	+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
7	@@ -487,11 +487,12 @@ void q_EC_KEY_free(EC_KEY *ecdh);	7	@@ -228,7 +228,7 @@ int q_BIO_read(BIO a, void b, int c);
		8	Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem();
		9	Q_AUTOTEST_EXPORT int q_BIO_write(BIO a, const void b, int c);
		10	int q_BN_num_bits(const BIGNUM *a);
		11	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
		12	+#if !defined(BN_is_word)
		13	int q_BN_is_word(BIGNUM *a, BN_ULONG w);
		14	#else
		15	// BN_is_word is implemented purely as a
		16	@@ -511,11 +511,12 @@ void q_EC_KEY_free(EC_KEY *ecdh);
8	size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);	17	size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
9	#if OPENSSL_VERSION_NUMBER >= 0x10002000L	18	#if OPENSSL_VERSION_NUMBER >= 0x10002000L
10	int q_EC_curve_nist2nid(const char *name);	19	int q_EC_curve_nist2nid(const char *name);