head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.66 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.64 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.62 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.60 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.58 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.56 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.54 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.52 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.50 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.48 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.46 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.44 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.42 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.40 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.38 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.36 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.34 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.32 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.30 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.28 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.26 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.24 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.22 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.20 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.16 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.18 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.14 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.12 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.10 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.8 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.6 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.4 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.2 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.5.0.44 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.42 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.38 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.36 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.34 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.32 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.30 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.28 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.26 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.24 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.22 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.20 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.18 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.16 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.14 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.12 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.10 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.8 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.6 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.4 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.2 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @// @; 1.6 date 2018.01.17.18.37.34; author markd; state Exp; branches; next 1.5; commitid q0VUPpiP65EQ7gnA; 1.5 date 2012.12.07.10.06.13; author adam; state Exp; branches; next 1.4; 1.4 date 2012.04.09.09.12.49; author adam; state Exp; branches; next 1.3; 1.3 date 2012.01.14.10.23.18; author obache; state Exp; branches; next 1.2; 1.2 date 2012.01.12.22.59.58; author adam; state Exp; branches; next 1.1; 1.1 date 2011.08.19.14.55.15; author obache; state Exp; branches; next ; desc @@ 1.6 log @qt4-libs: Compile with openssl-1.1.0 @ text @$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.5 2012/12/07 10:06:13 adam Exp $ * fixes build with OpenSSL 0.9.9-dev * fix build with -openssl-linked for OpenSSL 0.9.8* http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a * react to OPENSSL_NO_SSL3 * Compile with openssl-1.1.0 http://bugs.debian.org/828522 via archlinux --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-05-07 14:14:44.000000000 +0000 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp @@@@ -111,16 +111,24 @@@@ DEFINEFUNC(int, ASN1_STRING_length, ASN1 DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L +DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) +#else DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) +#endif DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L +DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) +#else DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) +#endif DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) -DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) +DEFINEFUNC(void, OPENSSL_free, void *a, a, return, DUMMYARG) DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) #if OPENSSL_VERSION_NUMBER < 0x00908000L DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return) @@@@ -178,7 +186,7 @@@@ DEFINEFUNC(int, SSL_CTX_check_private_ke #endif DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L +#if OPENSSL_VERSION_NUMBER >= 0x00909000L DEFINEFUNC(SSL_CTX *, SSL_CTX_new, const SSL_METHOD *a, a, return 0, return) #else DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return 0, return) @@@@ -224,17 +232,21 @@@@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a 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) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L +#if OPENSSL_VERSION_NUMBER >= 0x00909000L #ifndef OPENSSL_NO_SSL2 DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) #endif +#ifndef OPENSSL_NO_SSL3 DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) +#endif DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) #ifndef OPENSSL_NO_SSL2 DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) #endif +#ifndef OPENSSL_NO_SSL3 DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) +#endif DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) #else @@@@ -286,6 +298,22 @@@@ DEFINEFUNC(void, OPENSSL_add_all_algorit DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) +DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return) + +DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L +DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return) +DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return) +DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return) +DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return) +DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return) +DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return) +DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return) +DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) +DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) +DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) +DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return) +#endif #ifdef Q_OS_SYMBIAN #define RESOLVEFUNC(func, ordinal, lib) \ @@@@ -797,6 +825,7 @@@@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) + RESOLVEFUNC(SSL_CTX_get_cert_store) RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) @@@@ -819,16 +848,37 @@@@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_set_connect_state) RESOLVEFUNC(SSL_shutdown) RESOLVEFUNC(SSL_write) + + RESOLVEFUNC(X509_get_serialNumber) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + RESOLVEFUNC(SSL_CTX_ctrl) + RESOLVEFUNC(EVP_PKEY_id) + RESOLVEFUNC(EVP_PKEY_base_id) + RESOLVEFUNC(SSL_CIPHER_get_bits) + RESOLVEFUNC(SSL_CTX_set_options) + RESOLVEFUNC(X509_get_version) + RESOLVEFUNC(X509_get_X509_PUBKEY) + RESOLVEFUNC(RSA_bits) + RESOLVEFUNC(DSA_security_bits) + RESOLVEFUNC(DSA_get0_pqg) + RESOLVEFUNC(X509_get_notAfter) + RESOLVEFUNC(X509_get_notBefore) +#endif + #ifndef OPENSSL_NO_SSL2 RESOLVEFUNC(SSLv2_client_method) #endif +#ifndef OPENSSL_NO_SSL3 RESOLVEFUNC(SSLv3_client_method) +#endif RESOLVEFUNC(SSLv23_client_method) RESOLVEFUNC(TLSv1_client_method) #ifndef OPENSSL_NO_SSL2 RESOLVEFUNC(SSLv2_server_method) #endif +#ifndef OPENSSL_NO_SSL3 RESOLVEFUNC(SSLv3_server_method) +#endif RESOLVEFUNC(SSLv23_server_method) RESOLVEFUNC(TLSv1_server_method) RESOLVEFUNC(X509_NAME_entry_count) @ 1.5 log @Qt 4.8.4 is a bug-fix release. It maintains both forward and backward compatibility (source and binary) with Qt 4.8.0, 4.8.1, 4.8.2 and 4.8.3. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt-project.org/doc/4.8 The Qt version 4.8 series is binary compatible with the 4.7.x series. Applications compiled for 4.7 will continue to run with 4.8. Some of the changes listed in this file include issue tracking numbers corresponding to tasks in the Qt Bug Tracker or the Merge Request queue of the public source repository. @ text @d1 1 a1 1 $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.4 2012/04/09 09:12:49 adam Exp $ d6 2 d9 1 a9 1 --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2012-03-14 14:01:30.000000000 +0000 d11 27 a37 1 @@@@ -174,7 +174,7 @@@@ DEFINEFUNC(int, SSL_CTX_check_private_ke d46 1 a46 1 @@@@ -220,7 +220,7 @@@@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a d55 83 @ 1.4 log @Changes 4.8.1: Qt 4.8.1 is the first patch release to the 4.8 series with over 200 functional improvements to the desktop and embedded platforms. The majority of the error corrections, made primarily by Digia, have been on desktop and embedded platforms with a large number of fixes with focus on QtCore, QtGUI and QtNetwork. These fixes benefit all desktop platforms. Qt 4.8.1 also includes Mac App Store support. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 @@@@ -171,7 +171,7 @@@@ DEFINEFUNC(int, SSL_CTX_check_private_ke d18 1 a18 1 @@@@ -217,7 +217,7 @@@@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a @ 1.3 log @Fixes build with openssl<1.0.0. taken from upstream: http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a resolve PR#45832. @ text @d1 1 a1 1 $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.2 2012/01/12 22:59:58 adam Exp $ d7 1 a7 1 --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2011-12-08 05:06:02.000000000 +0000 d18 1 a18 12 @@@@ -210,18 +210,14 @@@@ DEFINEFUNC(int, SSL_library_init, void, DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) -#else -DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, const void *parg, parg, return -1, return) -#endif #endif DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG) @ 1.2 log @Changes 4.8.0: Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP and optimized file system access. @ text @d1 5 a5 1 $NetBSD$ d18 5 a22 2 @@@@ -213,7 +213,7 @@@@ DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a #if OPENSSL_VERSION_NUMBER >= 0x10000000L d24 1 a24 1 #else d26 1 a26 2 +DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) #endif d29 1 a29 1 @@@@ -221,7 +221,7 @@@@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a @ 1.1 log @Fixes build on NetBSD-5.1 (OpenSSL 0.9.9-dev). @ text @d3 1 a3 3 * fixes build with OpenSSL 0.9.9-dev --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2011-03-30 05:19:09.000000000 +0000 d5 1 a5 1 @@@@ -170,7 +170,7 @@@@ DEFINEFUNC(int, SSL_CTX_check_private_ke d14 10 a23 1 @@@@ -213,7 +213,7 @@@@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a d29 1 d31 1 a31 2 DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) @