Received: by mail.netbsd.org (Postfix, from userid 605) id E014584DA1; Fri, 24 Apr 2020 09:35:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6718684D99 for ; Fri, 24 Apr 2020 09:35:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id NyDXpxujnSXi for ; Fri, 24 Apr 2020 09:35:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4AF2584C8B for ; Fri, 24 Apr 2020 09:35:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 44EA4FB27; Fri, 24 Apr 2020 09:35:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587720917160430" MIME-Version: 1.0 Date: Fri, 24 Apr 2020 09:35:17 +0000 From: "Emmanuel Dreyfus" Subject: CVS commit: pkgsrc/converters/wkhtmltopdf To: pkgsrc-changes@NetBSD.org Reply-To: manu@netbsd.org X-Mailer: log_accum Message-Id: <20200424093517.44EA4FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587720917160430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: manu Date: Fri Apr 24 09:35:17 UTC 2020 Modified Files: pkgsrc/converters/wkhtmltopdf: Makefile distinfo pkgsrc/converters/wkhtmltopdf/patches: patch-qt_configure patch-src_image_image.pro patch-src_pdf_pdf.pro Added Files: pkgsrc/converters/wkhtmltopdf/patches: patch-qt_src_network_ssl_qsslcertificate.cpp patch-qt_src_network_ssl_qsslcertificate_p.h patch-qt_src_network_ssl_qsslkey.cpp patch-qt_src_network_ssl_qsslkey_p.h patch-qt_src_network_ssl_qsslsocket_openssl.cpp patch-qt_src_network_ssl_qsslsocket_openssl_p.h patch-qt_src_network_ssl_qsslsocket_openssl_symbols.cpp patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h patch-qt_src_xmlpatterns_api_qcoloroutput_p.h Log Message: Fix the build on NetBSD-9.0 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/wkhtmltopdf/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/converters/wkhtmltopdf/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure \ pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro \ pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro cvs rdiff -u -r0 -r1.1 \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate.cpp \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate_p.h \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey.cpp \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey_p.h \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl.cpp \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_p.h \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols.cpp \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h \ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_xmlpatterns_api_qcoloroutput_p.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587720917160430 Content-Disposition: inline Content-Length: 36043 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/converters/wkhtmltopdf/Makefile diff -u pkgsrc/converters/wkhtmltopdf/Makefile:1.9 pkgsrc/converters/wkhtmltopdf/Makefile:1.10 --- pkgsrc/converters/wkhtmltopdf/Makefile:1.9 Sat Jan 18 21:48:55 2020 +++ pkgsrc/converters/wkhtmltopdf/Makefile Fri Apr 24 09:35:16 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2020/01/18 21:48:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2020/04/24 09:35:16 manu Exp $ DISTNAME= wkhtmltox-0.12.4 PKGNAME= wkhtmltopdf-0.12.4 -PKGREVISION= 5 +PKGREVISION= 6 MASTER_SITES= ${MASTER_SITE_GITHUB:=wkhtmltopdf/} GITHUB_PROJECT= wkhtmltopdf GITHUB_RELEASE= ${PKGVERSION_NOREV} @@ -16,9 +16,10 @@ LICENSE= gnu-lgpl-v3 USE_LANGUAGES+= c c++ gnu++98 USE_TOOLS+= perl -#USE_LIBTOOL= yes +PYTHON_VERSIONS_ACCEPTED= 27 BUILDLINK_TRANSFORM+= opt:-std=gnu++11:-std=gnu++98 +CXXFLAGS+= -std=gnu++98 SUBST_CLASSES+= x11 SUBST_MESSAGE.x11= Fixing x11 options. Index: pkgsrc/converters/wkhtmltopdf/distinfo diff -u pkgsrc/converters/wkhtmltopdf/distinfo:1.2 pkgsrc/converters/wkhtmltopdf/distinfo:1.3 --- pkgsrc/converters/wkhtmltopdf/distinfo:1.2 Sun Sep 10 19:58:36 2017 +++ pkgsrc/converters/wkhtmltopdf/distinfo Fri Apr 24 09:35:16 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2017/09/10 19:58:36 joerg Exp $ +$NetBSD: distinfo,v 1.3 2020/04/24 09:35:16 manu Exp $ SHA1 (wkhtmltox-0.12.4.tar.bz2) = 6a0ca9b01d5e37af3fb451bbd934afff43cf26ae RMD160 (wkhtmltox-0.12.4.tar.bz2) = 665abd76618cdfac27585e62caa52b33d09990fa @@ -10,7 +10,7 @@ SHA1 (patch-qt_config.tests_unix_libjpeg SHA1 (patch-qt_config.tests_unix_libpng_libpng.pro) = be0dead445dbbfeef9bc2a816ef5efd85aba0411 SHA1 (patch-qt_config.tests_x11_mitshm_mitshm.pro) = 5a411a67f6a99f87a9f22698a2a6e1e01b1a38e7 SHA1 (patch-qt_config.tests_x11_xrender_xrender.pro) = a1120252f1f6b289caafa3835e2f2d42be69446c -SHA1 (patch-qt_configure) = e13eb806e11a88a20650fc62d38d162145eaabae +SHA1 (patch-qt_configure) = 823e039d8fc8da6d2518301413dcf8195021c3e2 SHA1 (patch-qt_mkspecs_netbsd-g++_qmake.conf) = 508b1f25735d3a8f29a1da08a988f608186751bf SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp) = b8ef0623e9cd666d708295c006b5e72693ac715e SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = 79ad51f005e68156d2e339d0d925fc79ab79f059 @@ -27,7 +27,16 @@ SHA1 (patch-qt_src_3rdparty_webkit_Sourc SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 776c988688af27ebbcd43a75b40515a13b48b9d5 SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) = 1dfde3ad2e0d30026e0cd2c62f5f959aeace394c SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = d510329e032f0e7362802ea23b19528d5ecdcc81 +SHA1 (patch-qt_src_network_ssl_qsslcertificate.cpp) = c6caf40e63c6bb10444361f52401d55f397e85a4 +SHA1 (patch-qt_src_network_ssl_qsslcertificate_p.h) = 6ab163f9bae77176b38aa2bc2ea0ba1897751eb7 +SHA1 (patch-qt_src_network_ssl_qsslkey.cpp) = faff8d9970bed9a141e6eb7c341efa9ba8ed7c37 +SHA1 (patch-qt_src_network_ssl_qsslkey_p.h) = af3c29385073a24f4dae133c14d90d29a3205a79 +SHA1 (patch-qt_src_network_ssl_qsslsocket_openssl.cpp) = c6f20bfa60f5bdd53dc7764c053d51d69c8edbe8 +SHA1 (patch-qt_src_network_ssl_qsslsocket_openssl_p.h) = 3c26fd2196297dc5b6ae4f67232b2d5538dc25af +SHA1 (patch-qt_src_network_ssl_qsslsocket_openssl_symbols.cpp) = a1f73de1bb07d9e87296a1d52e5a8e3133c3b8da +SHA1 (patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h) = fb7c20333199a00cc233a4a7ccbc29894eb806c1 SHA1 (patch-qt_src_plugins_platforms_xlib_xlib.pro) = 18516ea36e61c57d2acc3f5fa06890ab7a88fbe6 -SHA1 (patch-src_image_image.pro) = d33d1676608ebe663bc7c0dd43a2b71b478da7a6 +SHA1 (patch-qt_src_xmlpatterns_api_qcoloroutput_p.h) = d196f51a8168d335a00d3663418cab27f6076ca9 +SHA1 (patch-src_image_image.pro) = 1684d98030a1f163a905f8216629f09f453771eb SHA1 (patch-src_lib_lib.pro) = a3b1958c2bc63b79a195325cb226de37eecc17a0 -SHA1 (patch-src_pdf_pdf.pro) = e46a2a14aa3540b3128182f9938c5e64f9b39b8c +SHA1 (patch-src_pdf_pdf.pro) = 54d60872137de6b7d6188a2ca1260bccd170c3a9 Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure diff -u pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure:1.1 pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure:1.2 --- pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure:1.1 Fri Jun 23 07:12:19 2017 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure Fri Apr 24 09:35:17 2020 @@ -1,9 +1,10 @@ -$NetBSD: patch-qt_configure,v 1.1 2017/06/23 07:12:19 manu Exp $ +$NetBSD: patch-qt_configure,v 1.2 2020/04/24 09:35:17 manu Exp $ Fix == operator in shell script +Allow building with recent GCC ---- qt/configure.orig 2017-06-20 10:22:29.000000000 +0200 -+++ qt/configure 2017-06-20 10:23:03.000000000 +0200 +--- qt/configure.orig 2016-08-23 06:13:28.000000000 +0000 ++++ qt/configure 2020-04-20 09:06:51.824967933 +0000 @@ -3570,9 +3570,9 @@ # with the default mkspec. The 10.4u SDK does not support gcc 4.2. if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then @@ -35,3 +36,14 @@ Fix == operator in shell script CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi +@@ -7733,9 +7733,9 @@ + ;; + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) ++ 9*|8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" + ;; Index: pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro diff -u pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro:1.1 pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro:1.2 --- pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro:1.1 Sun Sep 10 19:58:36 2017 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro Fri Apr 24 09:35:17 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_image_image.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $ +$NetBSD: patch-src_image_image.pro,v 1.2 2020/04/24 09:35:17 manu Exp $ --- src/image/image.pro.orig 2017-09-10 15:04:52.049437840 +0000 +++ src/image/image.pro @@ -11,3 +11,10 @@ $NetBSD: patch-src_image_image.pro,v 1.1 include(../../common.pri) TEMPLATE = app +@@ -47,4 +49,6 @@ + } + + # Input + SOURCES += wkhtmltoimage.cc imagearguments.cc imagecommandlineparser.cc imagedocparts.cc ++ ++LIBS += -lcrypto -lssl Index: pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro diff -u pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro:1.1 pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro:1.2 --- pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro:1.1 Sun Sep 10 19:58:36 2017 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro Fri Apr 24 09:35:17 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_pdf_pdf.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $ +$NetBSD: patch-src_pdf_pdf.pro,v 1.2 2020/04/24 09:35:17 manu Exp $ --- src/pdf/pdf.pro.orig 2017-09-10 12:26:34.883613832 +0000 +++ src/pdf/pdf.pro @@ -11,3 +11,10 @@ $NetBSD: patch-src_pdf_pdf.pro,v 1.1 201 unix { man.path=$$INSTALLBASE/share/man/man1 man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)$$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz +@@ -48,4 +50,6 @@ + + #Application part + SOURCES += wkhtmltopdf.cc pdfarguments.cc pdfcommandlineparser.cc \ + pdfdocparts.cc ++ ++LIBS += -lcrypto -lssl Added files: Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate.cpp diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate.cpp:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate.cpp Fri Apr 24 09:35:17 2020 @@ -0,0 +1,50 @@ +--- qt/src/network/ssl/qsslcertificate.cpp.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslcertificate.cpp 2020-04-23 17:34:53.378239752 +0200 +@@ -260,9 +260,9 @@ + { + QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); + if (d->versionString.isEmpty() && d->x509) + d->versionString = +- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1); ++ QByteArray::number(qlonglong(X509_get_version(d->x509)) + 1); + + return d->versionString; + } + +@@ -275,9 +275,9 @@ + QByteArray QSslCertificate::serialNumber() const + { + QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); + if (d->serialNumberString.isEmpty() && d->x509) { +- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber; ++ ASN1_INTEGER *serialNumber = X509_get_serialNumber(d->x509); + // if we cannot convert to a long, just output the hexadecimal number + if (serialNumber->length > 4) { + QByteArray hexString; + hexString.reserve(serialNumber->length * 3); +@@ -488,21 +488,21 @@ + + QSslKey key; + + key.d->type = QSsl::PublicKey; +- X509_PUBKEY *xkey = d->x509->cert_info->key; ++ X509_PUBKEY *xkey = X509_get_X509_PUBKEY(d->x509); + EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey); + Q_ASSERT(pkey); + +- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) { ++ if (q_EVP_PKEY_type(EVP_PKEY_id(pkey)) == 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 (q_EVP_PKEY_type(EVP_PKEY_id(pkey)) == 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 (q_EVP_PKEY_type(EVP_PKEY_id(pkey)) == EVP_PKEY_DH) { + // DH unsupported + } else { + // error? + } Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate_p.h diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate_p.h:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate_p.h Fri Apr 24 09:35:17 2020 @@ -0,0 +1,13 @@ +--- qt/src/network/ssl/qsslcertificate_p.h.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslcertificate_p.h 2020-04-23 17:34:53.413950571 +0200 +@@ -42,8 +42,10 @@ + + #ifndef QSSLCERTIFICATE_P_H + #define QSSLCERTIFICATE_P_H + ++#define OPENSSL_API_COMPAT 0x10000000L ++ + #include "qsslcertificate.h" + + // + // W A R N I N G Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey.cpp diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey.cpp:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey.cpp Fri Apr 24 09:35:17 2020 @@ -0,0 +1,13 @@ +--- qt/src/network/ssl/qsslkey.cpp.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslkey.cpp 2020-04-23 17:34:53.449790782 +0200 +@@ -321,9 +321,9 @@ + { + if (d->isNull) + return -1; + return (d->algorithm == QSsl::Rsa) +- ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p); ++ ? BN_num_bits(RSA_get0_n(d->rsa)) : BN_num_bits(DSA_get0_p(d->dsa)); + } + + /*! + Returns the type of the key (i.e., PublicKey or PrivateKey). Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey_p.h diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey_p.h:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey_p.h Fri Apr 24 09:35:17 2020 @@ -0,0 +1,13 @@ +--- qt/src/network/ssl/qsslkey_p.h.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslkey_p.h 2020-04-23 17:34:53.485308089 +0200 +@@ -42,8 +42,10 @@ + + #ifndef QSSLKEY_P_H + #define QSSLKEY_P_H + ++#define OPENSSL_API_COMPAT 0x10000000L ++ + #include "qsslkey.h" + + // + // W A R N I N G Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl.cpp diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl.cpp:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl.cpp Fri Apr 24 09:35:17 2020 @@ -0,0 +1,37 @@ +--- qt/src/network/ssl/qsslsocket_openssl.cpp.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslsocket_openssl.cpp 2020-04-23 17:34:53.522272791 +0200 +@@ -221,10 +221,10 @@ + if (descriptionList.at(4).startsWith(QLatin1String("Enc="))) + ciph.d->encryptionMethod = descriptionList.at(4).mid(4); + ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export")); + +- ciph.d->bits = cipher->strength_bits; +- ciph.d->supportedBits = cipher->alg_bits; ++ ciph.d->bits = SSL_CIPHER_get_bits(cipher, NULL); ++ ciph.d->supportedBits = SSL_CIPHER_get_bits(cipher, NULL); + + } + return ciph; + } +@@ -362,9 +362,9 @@ + // certificates mixed with valid ones. + // + // 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(SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle()); + } + } + + if (s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { +@@ -658,9 +658,9 @@ + + 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 (1 /* cipher->valid */) { + QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher); + if (!ciph.isNull()) { + if (!ciph.name().toLower().startsWith(QLatin1String("adh"))) + ciphers << ciph; Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_p.h diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_p.h:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_p.h Fri Apr 24 09:35:17 2020 @@ -0,0 +1,13 @@ +--- qt/src/network/ssl/qsslsocket_openssl_p.h.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslsocket_openssl_p.h 2020-04-23 17:34:53.558228832 +0200 +@@ -53,8 +53,10 @@ + // + // We mean it. + // + ++#define OPENSSL_API_COMPAT 0x10000000L ++ + #include "qsslsocket_p.h" + + #ifdef Q_OS_WIN + #include Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols.cpp diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols.cpp:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols.cpp Fri Apr 24 09:35:17 2020 @@ -0,0 +1,300 @@ +--- qt/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-04-24 02:04:11.900228983 +0200 +@@ -116,11 +116,13 @@ + DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) + DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) + 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) ++#if OPENSSL_VERSION_NUMBER < 0x10101000L + 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) ++#endif + DEFINEFUNC(void, CRYPTO_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) +@@ -156,14 +158,21 @@ + DEFINEFUNC2(int, PEM_write_bio_RSA_PUBKEY, BIO *a, a, RSA *b, b, return 0, return) + DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG) + DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) + DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++DEFINEFUNC(int, OPENSSL_sk_num, STACK *a, a, return -1, return) ++DEFINEFUNC2(void, OPENSSL_sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) ++DEFINEFUNC(void, OPENSSL_sk_free, _STACK *a, a, return, DUMMYARG) ++DEFINEFUNC2(void *, OPENSSL_sk_value, STACK *a, a, int b, b, return 0, return) ++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L + DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) + DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L + DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) + DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) + #else ++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) ++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) + DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) + DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) + #endif + DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) +@@ -212,10 +221,14 @@ + DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return) + #else + DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return) + #endif ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++DEFINEFUNC(int, OPENSSL_init_ssl, void, DUMMYARG, return -1, return) ++#else + DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) + DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) ++#endif + DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) + #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) + DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) + #endif +@@ -223,9 +236,14 @@ + DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG) + 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 >= 0x10101000L ++DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) + #endif + DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) +@@ -273,20 +291,32 @@ + DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return) + DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) + DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) + DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return) ++#else + DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) ++#endif + DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) + #ifdef SSLEAY_MACROS + DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) + DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) + DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) + DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) + #endif ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) ++#else + DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) + DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) ++#endif + DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++DEFINEFUNC(unsigned long, OpenSSL_version_num, void, DUMMYARG, return 0, return) ++#else + DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) ++#endif + + #ifdef Q_OS_SYMBIAN + #define RESOLVEFUNC(func, ordinal, lib) \ + if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal)))) \ +@@ -613,11 +643,13 @@ + RESOLVEFUNC(BIO_s_mem, 251, libs.second ) + RESOLVEFUNC(BIO_write, 269, libs.second ) + RESOLVEFUNC(BN_num_bits, 387, libs.second ) + RESOLVEFUNC(CRYPTO_free, 469, libs.second ) ++#if OPENSSL_VERSION_NUMBER < 0x10101000L + RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second ) + RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second ) + RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second ) ++#endif + RESOLVEFUNC(DSA_free, 594, libs.second ) + RESOLVEFUNC(ERR_error_string, 744, libs.second ) + RESOLVEFUNC(ERR_get_error, 749, libs.second ) + RESOLVEFUNC(EVP_des_ede3_cbc, 919, libs.second ) +@@ -645,12 +677,19 @@ + RESOLVEFUNC(PEM_write_bio_RSA_PUBKEY, 1273, libs.second ) + RESOLVEFUNC(RAND_seed, 1426, libs.second ) + RESOLVEFUNC(RAND_status, 1429, libs.second ) + RESOLVEFUNC(RSA_free, 1450, libs.second ) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(OPENSSL_sk_free, 2571, libs.second ) ++ RESOLVEFUNC(OPENSSL_sk_num, 2576, libs.second ) ++ RESOLVEFUNC(OPENSSL_sk_pop_free, 2578, libs.second ) ++ RESOLVEFUNC(OPENSSL_sk_value, 2585, libs.second ) ++#else + RESOLVEFUNC(sk_free, 2571, libs.second ) + RESOLVEFUNC(sk_num, 2576, libs.second ) + RESOLVEFUNC(sk_pop_free, 2578, libs.second ) + RESOLVEFUNC(sk_value, 2585, libs.second ) ++#endif + RESOLVEFUNC(SSL_CIPHER_description, 11, libs.first ) + RESOLVEFUNC(SSL_CTX_check_private_key, 21, libs.first ) + RESOLVEFUNC(SSL_CTX_ctrl, 22, libs.first ) + RESOLVEFUNC(SSL_CTX_free, 24, libs.first ) +@@ -673,10 +712,14 @@ + RESOLVEFUNC(SSL_get_error, 110, libs.first ) + RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first ) + RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first ) + RESOLVEFUNC(SSL_get_verify_result, 132, libs.first ) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(OPENSSL_init_ssl, 137, libs.first ) ++#else + RESOLVEFUNC(SSL_library_init, 137, libs.first ) + RESOLVEFUNC(SSL_load_error_strings, 139, libs.first ) ++#endif + RESOLVEFUNC(SSL_new, 140, libs.first ) + #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) + RESOLVEFUNC(SSL_ctrl, 95, libs.first ) + #endif +@@ -685,16 +728,23 @@ + RESOLVEFUNC(SSL_set_bio, 149, libs.first ) + RESOLVEFUNC(SSL_set_connect_state, 152, libs.first ) + RESOLVEFUNC(SSL_shutdown, 173, libs.first ) + RESOLVEFUNC(SSL_write, 188, libs.first ) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(TLS_client_method, 189, libs.first ) ++ RESOLVEFUNC(TLSv1_client_method, 198, libs.first ) ++ RESOLVEFUNC(TLS_server_method, 191, libs.first ) ++ RESOLVEFUNC(TLSv1_server_method, 200, libs.first ) ++#else + RESOLVEFUNC(SSLv2_client_method, 192, libs.first ) + RESOLVEFUNC(SSLv3_client_method, 195, libs.first ) + RESOLVEFUNC(SSLv23_client_method, 189, libs.first ) + RESOLVEFUNC(TLSv1_client_method, 198, libs.first ) + RESOLVEFUNC(SSLv2_server_method, 194, libs.first ) + RESOLVEFUNC(SSLv3_server_method, 197, libs.first ) + RESOLVEFUNC(SSLv23_server_method, 191, libs.first ) + RESOLVEFUNC(TLSv1_server_method, 200, libs.first ) ++#endif + RESOLVEFUNC(SSL_CTX_load_verify_locations, 34, libs.first ) + RESOLVEFUNC(X509_NAME_entry_count, 1821, libs.second ) + RESOLVEFUNC(X509_NAME_get_entry, 1823, libs.second ) + RESOLVEFUNC(X509_NAME_ENTRY_get_data, 1808, libs.second ) +@@ -726,11 +776,16 @@ + RESOLVEFUNC(i2d_RSAPrivateKey, 2476, libs.second ) + RESOLVEFUNC(d2i_DSAPrivateKey, 2220, libs.second ) + RESOLVEFUNC(d2i_RSAPrivateKey, 2296, libs.second ) + #endif ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(OPENSSL_init_crypto, 1153, libs.second ) ++ RESOLVEFUNC(OpenSSL_version_num, 1504, libs.second ) ++#else + RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf, 1153, libs.second ) + RESOLVEFUNC(OPENSSL_add_all_algorithms_conf, 1152, libs.second ) + RESOLVEFUNC(SSLeay, 1504, libs.second ) ++#endif + #else // Q_OS_SYMBIAN + #ifdef SSLEAY_MACROS + RESOLVEFUNC(ASN1_dup) + #endif +@@ -746,11 +801,13 @@ + RESOLVEFUNC(BIO_s_mem) + RESOLVEFUNC(BIO_write) + RESOLVEFUNC(BN_num_bits) + RESOLVEFUNC(CRYPTO_free) ++#if OPENSSL_VERSION_NUMBER < 0x10101000L + RESOLVEFUNC(CRYPTO_num_locks) + RESOLVEFUNC(CRYPTO_set_id_callback) + RESOLVEFUNC(CRYPTO_set_locking_callback) ++#endif + RESOLVEFUNC(DSA_free) + RESOLVEFUNC(ERR_error_string) + RESOLVEFUNC(ERR_get_error) + RESOLVEFUNC(EVP_des_ede3_cbc) +@@ -778,12 +835,19 @@ + RESOLVEFUNC(PEM_write_bio_RSA_PUBKEY) + RESOLVEFUNC(RAND_seed) + RESOLVEFUNC(RAND_status) + RESOLVEFUNC(RSA_free) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(OPENSSL_sk_free) ++ RESOLVEFUNC(OPENSSL_sk_num) ++ RESOLVEFUNC(OPENSSL_sk_pop_free) ++ RESOLVEFUNC(OPENSSL_sk_value) ++#else + RESOLVEFUNC(sk_free) + RESOLVEFUNC(sk_num) + RESOLVEFUNC(sk_pop_free) + RESOLVEFUNC(sk_value) ++#endif + RESOLVEFUNC(SSL_CIPHER_description) + RESOLVEFUNC(SSL_CTX_check_private_key) + RESOLVEFUNC(SSL_CTX_ctrl) + RESOLVEFUNC(SSL_CTX_free) +@@ -806,10 +870,14 @@ + RESOLVEFUNC(SSL_get_error) + RESOLVEFUNC(SSL_get_peer_cert_chain) + RESOLVEFUNC(SSL_get_peer_certificate) + RESOLVEFUNC(SSL_get_verify_result) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(OPENSSL_init_ssl) ++#else + RESOLVEFUNC(SSL_library_init) + RESOLVEFUNC(SSL_load_error_strings) ++#endif + RESOLVEFUNC(SSL_new) + #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) + RESOLVEFUNC(SSL_ctrl) + #endif +@@ -818,8 +886,14 @@ + RESOLVEFUNC(SSL_set_bio) + RESOLVEFUNC(SSL_set_connect_state) + RESOLVEFUNC(SSL_shutdown) + RESOLVEFUNC(SSL_write) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(TLS_client_method) ++ RESOLVEFUNC(TLSv1_client_method) ++ RESOLVEFUNC(TLS_server_method) ++ RESOLVEFUNC(TLSv1_server_method) ++#else + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_client_method) + #endif + RESOLVEFUNC(SSLv3_client_method) +@@ -830,8 +904,9 @@ + #endif + RESOLVEFUNC(SSLv3_server_method) + RESOLVEFUNC(SSLv23_server_method) + RESOLVEFUNC(TLSv1_server_method) ++#endif + RESOLVEFUNC(X509_NAME_entry_count) + RESOLVEFUNC(X509_NAME_get_entry) + RESOLVEFUNC(X509_NAME_ENTRY_get_data) + RESOLVEFUNC(X509_NAME_ENTRY_get_object) +@@ -845,9 +920,13 @@ + RESOLVEFUNC(X509_STORE_CTX_set_purpose) + RESOLVEFUNC(X509_STORE_CTX_get_error) + RESOLVEFUNC(X509_STORE_CTX_get_error_depth) + RESOLVEFUNC(X509_STORE_CTX_get_current_cert) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(X509_STORE_CTX_get0_chain) ++#else + RESOLVEFUNC(X509_STORE_CTX_get_chain) ++#endif + RESOLVEFUNC(X509_cmp) + #ifndef SSLEAY_MACROS + RESOLVEFUNC(X509_dup) + #endif +@@ -866,12 +945,17 @@ + RESOLVEFUNC(i2d_RSAPrivateKey) + RESOLVEFUNC(d2i_DSAPrivateKey) + RESOLVEFUNC(d2i_RSAPrivateKey) + #endif ++ RESOLVEFUNC(SSL_CTX_load_verify_locations) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++ RESOLVEFUNC(OPENSSL_init_crypto) ++ RESOLVEFUNC(OpenSSL_version_num) ++#else + RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) + RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) +- RESOLVEFUNC(SSL_CTX_load_verify_locations) + RESOLVEFUNC(SSLeay) ++#endif + #endif // Q_OS_SYMBIAN + symbolsResolved = true; + delete libs.first; + delete libs.second; Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h Fri Apr 24 09:35:17 2020 @@ -0,0 +1,136 @@ +--- qt/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2016-08-23 08:13:31.000000000 +0200 ++++ qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-04-24 02:00:16.877762168 +0200 +@@ -212,11 +212,17 @@ + int q_BIO_read(BIO *a, void *b, int c); + BIO_METHOD *q_BIO_s_mem(); + int q_BIO_write(BIO *a, const void *b, int c); + int q_BN_num_bits(const BIGNUM *a); ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#define q_CRYPTO_num_locks() 0 ++#define q_CRYPTO_set_locking_callback(x) ++#define q_CRYPTO_set_id_callback(x) ++#else + 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)()); ++#endif + void q_CRYPTO_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. +@@ -257,14 +263,25 @@ + int q_PEM_write_bio_RSA_PUBKEY(BIO *a, RSA *b); + void q_RAND_seed(const void *a, int b); + int q_RAND_status(); + void q_RSA_free(RSA *a); ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++int q_OPENSSL_sk_num(STACK *a); ++void q_OPENSSL_sk_pop_free(STACK *a, void (*b)(void *)); ++void q_OPENSSL_sk_free(_STACK *a); ++void * q_OPENSSL_sk_value(STACK *a, int b); ++#define q_sk_num q_OPENSSL_sk_num ++#define q_sk_pop_free q_OPENSSL_sk_pop_free ++#define q_sk_free q_OPENSSL_sk_free ++#define q_sk_value q_OPENSSL_sk_value ++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L + int q_sk_num(STACK *a); + void q_sk_pop_free(STACK *a, void (*b)(void *)); +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L + void q_sk_free(_STACK *a); + void * q_sk_value(STACK *a, int b); + #else ++int q_sk_num(STACK *a); ++void q_sk_pop_free(STACK *a, void (*b)(void *)); + void q_sk_free(STACK *a); + char * q_sk_value(STACK *a, int b); + #endif + int q_SSL_accept(SSL *a); +@@ -313,10 +330,16 @@ + long q_SSL_get_verify_result(const SSL *a); + #else + long q_SSL_get_verify_result(SSL *a); + #endif ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++int q_OPENSSL_init_ssl(); ++#define q_SSL_library_init q_OPENSSL_init_ssl ++#define q_SSL_load_error_strings() ++#else + int q_SSL_library_init(); + void q_SSL_load_error_strings(); ++#endif + SSL *q_SSL_new(SSL_CTX *a); + #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) + long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); + #endif +@@ -324,9 +347,20 @@ + void q_SSL_set_bio(SSL *a, BIO *b, BIO *c); + 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 ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++const SSL_METHOD *q_TLS_client_method(); ++const SSL_METHOD *q_TLSv1_client_method(); ++const SSL_METHOD *q_TLS_server_method(); ++const SSL_METHOD *q_TLSv1_server_method(); ++#define q_SSLv2_client_method q_TLS_client_method ++#define q_SSLv3_client_method q_TLS_client_method ++#define q_SSLv23_client_method q_TLS_client_method ++#define q_SSLv2_server_method q_TLS_server_method ++#define q_SSLv3_server_method q_TLS_server_method ++#define q_SSLv23_server_method q_TLS_server_method ++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L + 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(); +@@ -398,8 +432,11 @@ + #define q_PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ + PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ + bp,(char *)x,enc,kstr,klen,cb,u) + #endif ++#ifndef SSL_CTRL_OPTIONS ++#define SSL_CTRL_OPTIONS 32 ++#endif + #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) + #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)) +@@ -415,17 +452,37 @@ + #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,\ + (char *)(dsa)) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); ++#ifdef OPENSSL_LOAD_CONF ++#define q_OpenSSL_add_all_algorithms() \ ++ q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | \ ++ OPENSSL_INIT_ADD_ALL_DIGESTS | \ ++ OPENSSL_INIT_LOAD_CONFIG, NULL); ++#else ++#define q_OpenSSL_add_all_algorithms() \ ++ q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | \ ++ OPENSSL_INIT_ADD_ALL_DIGESTS, \ ++ NULL); ++#endif ++#else /* OPENSSL_VERSION_NUMBER < 0x10101000L */ + #ifdef OPENSSL_LOAD_CONF + #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_conf() + #else + #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf() + #endif + void q_OPENSSL_add_all_algorithms_noconf(); + void q_OPENSSL_add_all_algorithms_conf(); ++#endif /* OPENSSL_VERSION_NUMBER */ + int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++unsigned long q_OpenSSL_version_num(); ++#define q_SSLeay() q_OpenSSL_version_num() ++#else + long q_SSLeay(); ++#endif + + // Helper function + class QDateTime; + QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime); Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_xmlpatterns_api_qcoloroutput_p.h diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_xmlpatterns_api_qcoloroutput_p.h:1.1 --- /dev/null Fri Apr 24 09:35:17 2020 +++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_src_xmlpatterns_api_qcoloroutput_p.h Fri Apr 24 09:35:17 2020 @@ -0,0 +1,15 @@ +--- qt/src/xmlpatterns/api/qcoloroutput_p.h.orig 2020-04-11 03:48:03.891503085 +0200 ++++ qt/src/xmlpatterns/api/qcoloroutput_p.h 2020-04-11 03:56:49.652502308 +0200 +@@ -69,10 +69,10 @@ + { + ForegroundShift = 10, + BackgroundShift = 20, + SpecialShift = 20, +- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, +- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ++ ForegroundMask = 0x000ffc00, ++ BackgroundMask = 0x3ff00000 + }; + + public: + enum ColorCodeComponent --_----------=_1587720917160430--