pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/qt4-libs
Module Name: pkgsrc
Committed By: markd
Date: Wed Jan 17 18:37:34 UTC 2018
Modified Files:
pkgsrc/x11/qt4-libs: Makefile distinfo
pkgsrc/x11/qt4-libs/patches: patch-aq
patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
Added Files:
pkgsrc/x11/qt4-libs/patches:
patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h
patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp
patch-src_network_ssl_qsslcertificate.cpp
patch-src_network_ssl_qsslkey.cpp
patch-src_network_ssl_qsslsocket__openssl.cpp
patch-src_tools_moc_main.cpp
Log Message:
qt4-libs: Compile with openssl-1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/x11/qt4-libs/Makefile
cvs rdiff -u -r1.113 -r1.114 pkgsrc/x11/qt4-libs/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/qt4-libs/patches/patch-aq
cvs rdiff -u -r0 -r1.4 \
pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp \
pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslkey.cpp \
pkgsrc/x11/qt4-libs/patches/patch-src_tools_moc_main.cpp
cvs rdiff -u -r0 -r1.3 \
pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp \
pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/qt4-libs/Makefile
diff -u pkgsrc/x11/qt4-libs/Makefile:1.121 pkgsrc/x11/qt4-libs/Makefile:1.122
--- pkgsrc/x11/qt4-libs/Makefile:1.121 Thu Nov 23 17:20:20 2017
+++ pkgsrc/x11/qt4-libs/Makefile Wed Jan 17 18:37:34 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2017/11/23 17:20:20 wiz Exp $
+# $NetBSD: Makefile,v 1.122 2018/01/17 18:37:34 markd Exp $
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 9
+PKGREVISION= 10
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
Index: pkgsrc/x11/qt4-libs/distinfo
diff -u pkgsrc/x11/qt4-libs/distinfo:1.113 pkgsrc/x11/qt4-libs/distinfo:1.114
--- pkgsrc/x11/qt4-libs/distinfo:1.113 Fri May 26 12:09:11 2017
+++ pkgsrc/x11/qt4-libs/distinfo Wed Jan 17 18:37:34 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2017/05/26 12:09:11 jperkin Exp $
+$NetBSD: distinfo,v 1.114 2018/01/17 18:37:34 markd Exp $
SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -20,7 +20,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb64
SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = b861cbfacc5f91339fc5f56cd7eeaad90d25c5d9
+SHA1 (patch-aq) = 7533741c81086cd1992d3e96a47c28d9ade27cbc
SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
@@ -44,8 +44,10 @@ SHA1 (patch-src_3rdparty_clucene_src_CLu
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) = 93d5de2e9aff4dcc2e8317296801fac7e16ec613
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = a6c8fec7d1919a1fed3cb77b7b4ce9a0f496153f
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp) = f02b0174b6cf4093b210bcd32ef21d06a369b61f
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h) = b625c9edd3b3febc1338240549c32fb50ed0a5f4
SHA1 (patch-src_3rdparty_sqlite_sqlite3.c) = 29685d814c8b2b0514987340a09871c719fc4a3f
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
@@ -75,8 +77,12 @@ SHA1 (patch-src_corelib_io_io.pri) = cde
SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 67fbdc29d6da0aa7309a7aeb653a5abf10bd4d78
SHA1 (patch-src_gui_painting_qpaintengine__mac.cpp) = dc44116d5d138020e5d525ec5b7fd0f1b44ebeca
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
+SHA1 (patch-src_network_ssl_qsslcertificate.cpp) = 92d6a3cd5deacd75ada210bed56f4d4ba749d2ba
+SHA1 (patch-src_network_ssl_qsslkey.cpp) = f17f52ba3aa37c9b2211dfcf1c7c2c12aa5d6473
+SHA1 (patch-src_network_ssl_qsslsocket__openssl.cpp) = 145fb594ba1e5153b0811ff37eb2a4bb1c41b4ba
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = f990be585d06082c5febc26f954901801fbd39f8
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = da87bd6f685f19d50e239787309bf73ce6ad08df
SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = ba6f4facabb621388f38ee95f31e8d6f797ae12a
+SHA1 (patch-src_tools_moc_main.cpp) = 66d6f58944e8c504a02ab91623700a852f930704
SHA1 (patch-tools_linguist_linguist_messagemodel.cpp) = 7bb6982389a65724fd18dff0c56d72e792e13c11
Index: pkgsrc/x11/qt4-libs/patches/patch-aq
diff -u pkgsrc/x11/qt4-libs/patches/patch-aq:1.18 pkgsrc/x11/qt4-libs/patches/patch-aq:1.19
--- pkgsrc/x11/qt4-libs/patches/patch-aq:1.18 Fri May 26 12:09:11 2017
+++ pkgsrc/x11/qt4-libs/patches/patch-aq Wed Jan 17 18:37:34 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.18 2017/05/26 12:09:11 jperkin Exp $
+$NetBSD: patch-aq,v 1.19 2018/01/17 18:37:34 markd Exp $
--- configure.orig 2015-05-07 14:14:56.000000000 +0000
+++ configure
@@ -88,7 +88,7 @@ $NetBSD: patch-aq,v 1.18 2017/05/26 12:0
# Check gcc's version
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 4*)
-+ 5*|4*)
++ 6*|5*|4*)
;;
3.4*)
canBuildQtXmlPatterns="no"
@@ -110,6 +110,15 @@ $NetBSD: patch-aq,v 1.18 2017/05/26 12:0
# Avoid overriding the default settings when building clang/libc++.
;;
*)
+@@ -8050,7 +8063,7 @@ g++*)
+ 3.*)
+ COMPILER_VERSION="3.*"
+ ;;
+- 5*|4.*)
++ 6*|5*|4.*)
+ COMPILER_VERSION="4"
+ ;;
+ *)
@@ -8485,7 +8498,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
Index: pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
diff -u pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp:1.5 pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp:1.6
--- pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp:1.5 Fri Dec 7 10:06:13 2012
+++ pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp Wed Jan 17 18:37:34 2018
@@ -1,12 +1,40 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.5 2012/12/07 10:06:13 adam Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.6 2018/01/17 18:37:34 markd 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 2012-03-14 14:01:30.000000000 +0000
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-05-07 14:14:44.000000000 +0000
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -174,7 +174,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke
+@@ -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)
@@ -15,7 +43,7 @@ $NetBSD: patch-src_network_ssl_qsslsocke
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)
-@@ -220,7 +220,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
+@@ -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)
@@ -24,3 +52,86 @@ $NetBSD: patch-src_network_ssl_qsslsocke
#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)
Index: pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
diff -u pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h:1.4 pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h:1.5
--- pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h:1.4 Mon Apr 9 09:12:49 2012
+++ pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h Wed Jan 17 18:37:34 2018
@@ -1,12 +1,49 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.4 2012/04/09 09:12:49 adam Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.5 2018/01/17 18:37:34 markd 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
+* Compile with openssl-1.1.0 http://bugs.debian.org/828522 via archlinux
---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2012-03-14 14:01:30.000000000 +0000
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2015-05-07 14:14:44.000000000 +0000
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -279,7 +279,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX
+@@ -59,6 +59,9 @@
+ QT_BEGIN_NAMESPACE
+
+ #define DUMMYARG
++#ifndef OPENSSL_NO_SSL2
++#define OPENSSL_NO_SSL2 1
++#endif
+
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+@@ -207,16 +210,24 @@ int q_ASN1_STRING_length(ASN1_STRING *a)
+ int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
+ long q_BIO_ctrl(BIO *a, int b, long c, void *d);
+ int q_BIO_free(BIO *a);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++BIO *q_BIO_new(const BIO_METHOD *a);
++#else
+ BIO *q_BIO_new(BIO_METHOD *a);
++#endif
+ BIO *q_BIO_new_mem_buf(void *a, int b);
+ int q_BIO_read(BIO *a, void *b, int c);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++const BIO_METHOD *q_BIO_s_mem();
++#else
+ BIO_METHOD *q_BIO_s_mem();
++#endif
+ int q_BIO_write(BIO *a, const void *b, int c);
+ int q_BN_num_bits(const BIGNUM *a);
+ int q_CRYPTO_num_locks();
+ void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
+ void q_CRYPTO_set_id_callback(unsigned long (*a)());
+-void q_CRYPTO_free(void *a);
++void q_OPENSSL_free(void *a);
+ void q_DSA_free(DSA *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ // 0.9.8 broke SC and BC by changing this function's signature.
+@@ -279,7 +290,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX
#endif
long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d);
void q_SSL_CTX_free(SSL_CTX *a);
@@ -15,12 +52,63 @@ $NetBSD: patch-src_network_ssl_qsslsocke
SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
#else
SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a);
-@@ -325,7 +325,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
+@@ -325,8 +336,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
void q_SSL_set_accept_state(SSL *a);
void q_SSL_set_connect_state(SSL *a);
int q_SSL_shutdown(SSL *a);
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-const SSL_METHOD *q_SSLv2_client_method();
+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
- const SSL_METHOD *q_SSLv2_client_method();
const SSL_METHOD *q_SSLv3_client_method();
const SSL_METHOD *q_SSLv23_client_method();
+ const SSL_METHOD *q_TLSv1_client_method();
+@@ -335,7 +345,6 @@ const SSL_METHOD *q_SSLv3_server_method(
+ const SSL_METHOD *q_SSLv23_server_method();
+ const SSL_METHOD *q_TLSv1_server_method();
+ #else
+-SSL_METHOD *q_SSLv2_client_method();
+ SSL_METHOD *q_SSLv3_client_method();
+ SSL_METHOD *q_SSLv23_client_method();
+ SSL_METHOD *q_TLSv1_client_method();
+@@ -399,7 +408,25 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsign
+ PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
+ bp,(char *)x,enc,kstr,klen,cb,u)
+ #endif
++
++X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx);
++ASN1_INTEGER * q_X509_get_serialNumber(X509 *x);
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
++#define q_X509_get_version(x) X509_get_version(x)
++#else
++int q_EVP_PKEY_id(const EVP_PKEY *pkey);
++int q_EVP_PKEY_base_id(const EVP_PKEY *pkey);
++int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
++long q_SSL_CTX_set_options(SSL_CTX *ctx, long options);
++long q_X509_get_version(X509 *x);
++X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
++int q_RSA_bits(const RSA *rsa);
++int q_DSA_security_bits(const DSA *dsa);
++void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
++#endif
++
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+ #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
+@@ -410,8 +437,15 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsign
+ #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
+ #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
+ q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define q_X509_get_notAfter(x) X509_get_notAfter(x)
+ #define q_X509_get_notBefore(x) X509_get_notBefore(x)
++#else
++ASN1_TIME *q_X509_get_notAfter(X509 *x);
++ASN1_TIME *q_X509_get_notBefore(X509 *x);
++#endif
++
+ #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
+ (char *)(rsa))
+ #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
Added files:
Index: pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h:1.4
--- /dev/null Wed Jan 17 18:37:35 2018
+++ pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h Wed Jan 17 18:37:34 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h,v 1.4 2018/01/17 18:37:34 markd Exp $
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h.orig 2015-05-07 14:14:48.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h
+@@ -257,7 +257,8 @@ namespace WTF {
+
+ using std::swap;
+
+-#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION)
++#if 0
++ !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION)
+ // The Dinkumware C++ library (used by MSVC and QNX) and clang's libc++ have a swap for pairs defined.
+
+ // swap pairs by component, in case of pair members that specialize swap
Index: pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp:1.1
--- /dev/null Wed Jan 17 18:37:35 2018
+++ pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp Wed Jan 17 18:37:34 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexCompiler.cpp,v 1.1 2018/01/17 18:37:34 markd Exp $
+
+function doesnt return a boolean
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp.orig 2015-05-07 14:14:47.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp
+@@ -719,7 +719,7 @@ const char* compileRegex(const UString&
+
+ constructor.setupOffsets();
+
+- return false;
++ return 0;
+ };
+
+
Index: pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslkey.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslkey.cpp:1.1
--- /dev/null Wed Jan 17 18:37:35 2018
+++ pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslkey.cpp Wed Jan 17 18:37:34 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_network_ssl_qsslkey.cpp,v 1.1 2018/01/17 18:37:34 markd Exp $
+
+Compile with openssl-1.1.0 http://bugs.debian.org/828522 via archlinux
+
+--- src/network/ssl/qsslkey.cpp.orig 2015-05-07 14:14:44.000000000 +0000
++++ src/network/ssl/qsslkey.cpp
+@@ -321,8 +321,19 @@ int QSslKey::length() const
+ {
+ if (d->isNull)
+ return -1;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ return (d->algorithm == QSsl::Rsa)
+ ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p);
++#else
++ if (d->algorithm == QSsl::Rsa) {
++ return q_RSA_bits(d->rsa);
++ }else{
++ const BIGNUM *p = NULL;
++ q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
++ return q_BN_num_bits(p);
++ }
++#endif
++
+ }
+
+ /*!
Index: pkgsrc/x11/qt4-libs/patches/patch-src_tools_moc_main.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_tools_moc_main.cpp:1.1
--- /dev/null Wed Jan 17 18:37:35 2018
+++ pkgsrc/x11/qt4-libs/patches/patch-src_tools_moc_main.cpp Wed Jan 17 18:37:34 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tools_moc_main.cpp,v 1.1 2018/01/17 18:37:34 markd Exp $
+
+--- src/tools/moc/main.cpp.orig 2015-05-07 14:14:44.000000000 +0000
++++ src/tools/moc/main.cpp
+@@ -190,6 +190,10 @@ int runMoc(int _argc, char **_argv)
+
+ // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++ pp.macros["BOOST_TYPE_TRAITS_HPP"];
++ pp.macros["_SYS_SYSMACROS_H_OUTER"];
+
+ QByteArray filename;
+ QByteArray output;
Index: pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp:1.3
--- /dev/null Wed Jan 17 18:37:35 2018
+++ pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp Wed Jan 17 18:37:34 2018
@@ -0,0 +1,76 @@
+$NetBSD: patch-src_network_ssl_qsslcertificate.cpp,v 1.3 2018/01/17 18:37:34 markd Exp $
+
+Compile with openssl-1.1.0 http://bugs.debian.org/828522 via archlinux
+
+--- src/network/ssl/qsslcertificate.cpp.orig 2015-05-07 14:14:44.000000000 +0000
++++ src/network/ssl/qsslcertificate.cpp
+@@ -259,10 +259,10 @@ void QSslCertificate::clear()
+ QByteArray QSslCertificate::version() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+- if (d->versionString.isEmpty() && d->x509)
++ if (d->versionString.isEmpty() && d->x509) {
+ d->versionString =
+- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
+-
++ QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
++ }
+ return d->versionString;
+ }
+
+@@ -276,7 +276,7 @@ QByteArray QSslCertificate::serialNumber
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+ if (d->serialNumberString.isEmpty() && d->x509) {
+- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
++ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
+ // if we cannot convert to a long, just output the hexadecimal number
+ if (serialNumber->length > 4) {
+ QByteArray hexString;
+@@ -489,24 +489,33 @@ QSslKey QSslCertificate::publicKey() con
+ QSslKey key;
+
+ key.d->type = QSsl::PublicKey;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ X509_PUBKEY *xkey = d->x509->cert_info->key;
++#else
++ X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509);
++#endif
+ EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
+ Q_ASSERT(pkey);
+
+- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
++ int key_id;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ key_id = q_EVP_PKEY_type(pkey->type);
++#else
++ key_id = q_EVP_PKEY_base_id(pkey);
++#endif
++ if (key_id == EVP_PKEY_RSA) {
+ key.d->rsa = q_EVP_PKEY_get1_RSA(pkey);
+ key.d->algorithm = QSsl::Rsa;
+ key.d->isNull = false;
+- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) {
++ } else if (key_id == EVP_PKEY_DSA) {
+ key.d->dsa = q_EVP_PKEY_get1_DSA(pkey);
+ key.d->algorithm = QSsl::Dsa;
+ key.d->isNull = false;
+- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) {
++ } else if (key_id == EVP_PKEY_DH) {
+ // DH unsupported
+ } else {
+ // error?
+ }
+-
+ q_EVP_PKEY_free(pkey);
+ return key;
+ }
+@@ -687,7 +696,7 @@ static QMap<QString, QString> _q_mapFrom
+ unsigned char *data = 0;
+ int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+ info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
+- q_CRYPTO_free(data);
++ q_OPENSSL_free(data);
+ }
+ return info;
+ }
Index: pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp:1.3
--- /dev/null Wed Jan 17 18:37:35 2018
+++ pkgsrc/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp Wed Jan 17 18:37:34 2018
@@ -0,0 +1,119 @@
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl.cpp,v 1.3 2018/01/17 18:37:34 markd Exp $
+
+react to OPENSSL_NO_SSL3
+Compile with openssl-1.1.0 http://bugs.debian.org/828522 via archlinux
+
+--- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-05-07 14:14:44.000000000 +0000
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -93,6 +93,7 @@ bool QSslSocketPrivate::s_libraryLoaded
+ bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
+ bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ /* \internal
+
+ From OpenSSL's thread(3) manual page:
+@@ -174,6 +175,8 @@ static unsigned long id_function()
+ }
+ } // extern "C"
+
++#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L
++
+ QSslSocketBackendPrivate::QSslSocketBackendPrivate()
+ : ssl(0),
+ ctx(0),
+@@ -222,9 +225,12 @@ QSslCipher QSslSocketBackendPrivate::QSs
+ ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
+ ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ ciph.d->bits = cipher->strength_bits;
+ ciph.d->supportedBits = cipher->alg_bits;
+-
++#else
++ ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
++#endif
+ }
+ return ciph;
+ }
+@@ -267,7 +273,11 @@ init_context:
+ #endif
+ break;
+ case QSsl::SslV3:
++#ifndef OPENSSL_NO_SSL3
+ ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
++#else
++ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
++#endif
+ break;
+ case QSsl::SecureProtocols: // SslV2 will be disabled below
+ case QSsl::TlsV1SslV3: // SslV2 will be disabled below
+@@ -363,7 +373,7 @@ init_context:
+ //
+ // See also: QSslContext::fromConfiguration()
+ if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
+- q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
++ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
+ }
+ }
+
+@@ -500,8 +510,10 @@ void QSslSocketBackendPrivate::destroySs
+ */
+ void QSslSocketPrivate::deinitialize()
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ q_CRYPTO_set_id_callback(0);
+ q_CRYPTO_set_locking_callback(0);
++#endif
+ }
+
+ /*!
+@@ -522,13 +534,17 @@ bool QSslSocketPrivate::ensureLibraryLoa
+ return false;
+
+ // Check if the library itself needs to be initialized.
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ QMutexLocker locker(openssl_locks()->initLock());
++#endif
+ if (!s_libraryLoaded) {
+ s_libraryLoaded = true;
+
+ // Initialize OpenSSL.
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ q_CRYPTO_set_id_callback(id_function);
+ q_CRYPTO_set_locking_callback(locking_function);
++#endif
+ if (q_SSL_library_init() != 1)
+ return false;
+ q_SSL_load_error_strings();
+@@ -567,7 +583,9 @@ bool QSslSocketPrivate::ensureLibraryLoa
+
+ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
+ {
+- QMutexLocker locker(openssl_locks()->initLock());
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ QMutexLocker locker(openssl_locks()->initLock());
++#endif
+ if (s_loadedCiphersAndCerts)
+ return;
+ s_loadedCiphersAndCerts = true;
+@@ -659,13 +677,18 @@ void QSslSocketPrivate::resetDefaultCiph
+ STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
+ for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
+ if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
+- if (cipher->valid) {
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ if (cipher->valid) {
++#endif
+ QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
+ if (!ciph.isNull()) {
+ if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
+ ciphers << ciph;
+ }
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ }
++#endif
+ }
+ }
+
Home |
Main Index |
Thread Index |
Old Index