Update Qt5 to 5.13.2

Announcement:
        https://www.qt.io/blog/qt-5.13.2-released

Thanks to kai@ for updating webengine.

PR:		241649
Exp-run by:	antoine

3 files changed, 26 insertions, 48 deletions

diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index d7d5430b1579..ea465f36e48e 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	network
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMEPREFIX=	qt5-
 
diff --git a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
index 732fc793d947..b2d7469257b1 100644
--- a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
+++ b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
@@ -9,9 +9,9 @@ Clean up interface type and MTU detection.
    place them on top of each other, that would be ok).
  - IFM_FDDI (still) exists in 11.2, not in 12.0
 
---- src/network/kernel/qnetworkinterface_unix.cpp.orig	2019-02-09 11:35:25.320227000 +0100
-+++ src/network/kernel/qnetworkinterface_unix.cpp	2019-02-09 11:43:51.515736000 +0100
-@@ -420,13 +420,25 @@
+--- src/network/kernel/qnetworkinterface_unix.cpp.orig	2019-10-25 07:16:48 UTC
++++ src/network/kernel/qnetworkinterface_unix.cpp
+@@ -420,13 +420,24 @@ QT_BEGIN_INCLUDE_NAMESPACE
  #endif // QT_PLATFORM_UIKIT
  QT_END_INCLUDE_NAMESPACE
  
@@ -22,10 +22,9 @@ Clean up interface type and MTU detection.
 -        socket = qt_safe_socket(AF_INET, SOCK_DGRAM, 0);
 -    return socket;
 -}
- 
 +    int socket{-1};
-+
-+    int open() 
+ 
++    int open()
 +    {
 +        if (socket == -1)
 +            socket = qt_safe_socket(address_family, SOCK_DGRAM, 0);
@@ -42,7 +41,7 @@ Clean up interface type and MTU detection.
  static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, struct ifmediareq *req)
  {
      // Determine the interface type.
-@@ -480,16 +492,9 @@
+@@ -480,16 +491,9 @@ static QNetworkInterface::InterfaceType probeIfType(in
  static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
  {
      QList<QNetworkInterfacePrivate *> interfaces;
@@ -51,23 +50,20 @@ Clean up interface type and MTU detection.
 -        struct ifreq req;
 -    };
 -    int socket = -1;
-+    SockPuppet<AF_INET> socket;
-+    SockPuppet<AF_LOCAL> localSocket;
+-    memset(&mediareq, 0, sizeof(mediareq));
  
 -    // ensure both structs start with the name field, of size IFNAMESIZ
 -    Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name));
 -    Q_ASSERT(&mediareq.ifm_name == &req.ifr_name);
--
++    SockPuppet<AF_INET> socket;
++    SockPuppet<AF_LOCAL> localSocket;
+ 
      // on NetBSD we use AF_LINK and sockaddr_dl
      // scan the list for that family
-     for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next)
-@@ -503,13 +508,22 @@
+@@ -503,14 +507,22 @@ static QList<QNetworkInterfacePrivate *> createInterfa
+             iface->name = QString::fromLatin1(ptr->ifa_name);
              iface->flags = convertFlags(ptr->ifa_flags);
              iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl));
- 
--            qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name));
--            iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq);
--            iface->mtu = getMtu(socket, &req);
 +            {
 +                ifmediareq req;
 +                memset(&req, 0, sizeof(req));
@@ -81,7 +77,10 @@ Clean up interface type and MTU detection.
 +                req.ifr_addr.sa_family = AF_LOCAL;
 +                iface->mtu = getMtu(localSocket.open(), &req);
 +            }
-+
+ 
+-            qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name));
+-            iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq);
+-            iface->mtu = getMtu(socket, &req);
          }
  
 -    if (socket != -1)
@@ -89,7 +88,7 @@ Clean up interface type and MTU detection.
      return interfaces;
  }
  
-@@ -608,7 +622,7 @@
+@@ -609,7 +621,7 @@ static QList<QNetworkInterfacePrivate *> interfaceList
  {
      QList<QNetworkInterfacePrivate *> interfaces;
  
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp
index c09b2b96c983..390855e9df06 100644
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp
@@ -1,15 +1,6 @@
-Redefine SSL stack functions to their proper symbols in LibreSSL.
-Also reference a redefined DSA_bits() that does not natively exist
-in LibreSSL.
-
-Ensure that we link to the correct ssl library selected in
-DEFAULT_VERSIONS.
-
-Do not define SSL_CONF_CTX symbols absent from LibreSSL.
-
---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2018-12-03 11:15:26 UTC
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -152,6 +152,14 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w,
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2019-10-25 09:16:48.000000000 +0200
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2019-11-01 20:03:08.715014000 +0100
+@@ -152,6 +152,14 @@
  DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
  DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
  DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
@@ -24,7 +15,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL.
  DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
  DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
  DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -159,6 +167,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
+@@ -159,6 +167,7 @@
  DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
  DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
  DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
@@ -32,7 +23,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL.
  DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
  DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
  #ifdef TLS1_3_VERSION
-@@ -443,7 +452,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
+@@ -443,7 +452,7 @@
  DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
  DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
  DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
@@ -41,7 +32,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL.
  DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
  DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
  DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
-@@ -846,8 +855,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
+@@ -839,8 +848,8 @@
  #endif
  #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@@ -52,18 +43,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL.
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
          return pair;
-@@ -876,8 +885,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
-     //  macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
-     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
-     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
-@@ -961,12 +970,21 @@ bool q_resolveOpenSslSymbols()
+@@ -980,12 +989,21 @@
      RESOLVEFUNC(EVP_CIPHER_CTX_reset)
      RESOLVEFUNC(EVP_PKEY_base_id)
      RESOLVEFUNC(RSA_bits)
@@ -85,7 +65,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL.
      RESOLVEFUNC(DH_get0_pqg)
      RESOLVEFUNC(SSL_CTX_set_options)
  #ifdef TLS1_3_VERSION
-@@ -1001,7 +1019,9 @@ bool q_resolveOpenSslSymbols()
+@@ -1024,7 +1042,9 @@
  
      RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
      RESOLVEFUNC(DH_bits)
@@ -95,7 +75,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL.
  
  #if QT_CONFIG(dtls)
      RESOLVEFUNC(DTLSv1_listen)
-@@ -1237,7 +1257,7 @@ bool q_resolveOpenSslSymbols()
+@@ -1280,7 +1300,7 @@
      RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
      RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
      RESOLVEFUNC(SSL_CTX_get_cert_store);