Changes 4.7.3:

QtNetwork
- SSL
* [QTBUG-18338] blacklist fraudulent SSL certificates

Qt for Symbian
- Bearer Management
* [QTBUG-15108] Deadlock between SymbianEngine mutex and
QNetworkConfigurationPrivate mutex in the symbian bearer code
* [QTBUG-17627] qnetworksession.h Q_DECLARE_METATYPE breaks building
QtMobility QtBearer depending applications

- GraphicsView
* [QTBUG-17966] Major regression in QGraphicsView OpenVG backend
- Declarative
* [QTBUG-17503] Export qml debugging symbols on Symbian
- Widgets
* [QTBUG-17786] BC between Qt 4.7.3 and 4.6.3 QTreeView::indexRowSizeHint
doesn't return correct value on Symbian for row when QPushButton widget is
inserted in the treeview
* [QTBUG-4953] QMessageBox can not be closed/dismissed on touch phones if any
widget is fullscreen
- Painting
* [QTBUG-17907] tst_QGraphicsTransform::rotation3d test case from
tests/auto/qgraphicstransfor is failed for some rotation angle on
Symbian^3 devices
* [QTBUG-18154] Symbian's QPixmap::logicalDpi[X\Y]() incorrectly
returns MAXINT

14 files changed, 15 insertions, 160 deletions

diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile
index 10f36e5119d..5c665223623 100644
--- a/x11/qt4-docs/Makefile
+++ b/x11/qt4-docs/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2011/04/22 13:45:14 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/05/05 12:37:07 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-docs-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 NO_CONFIGURE=		yes
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 5a2de0455de..16253ad88db 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2011/04/22 14:40:46 obache Exp $
+# $NetBSD: Makefile,v 1.60 2011/05/05 12:37:07 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	2
 COMMENT=	C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 0dec80acfc1..aed25b5bd9b 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2011/04/07 05:23:52 obache Exp $
+$NetBSD: distinfo,v 1.54 2011/05/05 12:37:07 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.7.2.tar.gz) = 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e
-RMD160 (qt-everywhere-opensource-src-4.7.2.tar.gz) = de3d1c172c23c33681a0945c331db179c84cb7b5
-Size (qt-everywhere-opensource-src-4.7.2.tar.gz) = 213663032 bytes
+SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e
+RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645
+Size (qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173 bytes
 SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
 SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp
deleted file mode 100644
index a171f4f764d..00000000000
--- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_network_ssl_qsslcertificate.cpp,v 1.1 2011/04/01 20:53:55 markd Exp $
-
-From 04e074e8d7c097295505e63565abdc7ca2b49f7b Mon Sep 17 00:00:00 2001
-From: Peter Hartmann <peter.hartmann@nokia.com>
-Date: Thu, 24 Mar 2011 14:42:22 +0100
-Subject: [PATCH] QSslCertificate: report fraudulent certificates as invalid
-
-There are some fraudulent certificates in the wild that are not valid;
-this patch introduces a blacklist of serial numbers of those
-certificates.
-
-Reviewed-by: Richard J. Moore
-Reviewed-by: Markus Goetz
-Task-number: QTBUG-18338
----
-
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 618ac79..a5cdf01 100644
---- src/network/ssl/qsslcertificate.cpp
-+++ src/network/ssl/qsslcertificate.cpp
-@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
-     Returns true if this certificate is valid; otherwise returns
-     false.
- 
--    Note: Currently, this function only checks that the current
-+    Note: Currently, this function checks that the current
-     data-time is within the date-time range during which the
--    certificate is considered valid. No other checks are
--    currently performed.
-+    certificate is considered valid, and checks that the
-+    certificate is not in a blacklist of fraudulent certificates.
- 
-     \sa isNull()
- */
- bool QSslCertificate::isValid() const
- {
-     const QDateTime currentTime = QDateTime::currentDateTime();
--    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
-+    return currentTime >= d->notValidBefore &&
-+            currentTime <= d->notValidAfter &&
-+            ! QSslCertificatePrivate::isBlacklisted(*this);
- }
- 
- /*!
-@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
-     return certificates;
- }
- 
-+// These certificates are known to be fraudulent and were created during the comodo
-+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
-+static const char *certificate_blacklist[] = {
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    0
-+};
-+
-+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
-+{
-+    for (int a = 0; certificate_blacklist[a] != 0; a++) {
-+        if (certificate.serialNumber() == certificate_blacklist[a])
-+            return true;
-+    }
-+    return false;
-+}
-+
- #ifndef QT_NO_DEBUG_STREAM
- QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
- {
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate_p.h b/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate_p.h
deleted file mode 100644
index 336c86ab510..00000000000
--- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslcertificate_p.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_network_ssl_qsslcertificate_p.h,v 1.1 2011/04/01 20:53:55 markd Exp $
-
-From 04e074e8d7c097295505e63565abdc7ca2b49f7b Mon Sep 17 00:00:00 2001
-From: Peter Hartmann <peter.hartmann@nokia.com>
-Date: Thu, 24 Mar 2011 14:42:22 +0100
-Subject: [PATCH] QSslCertificate: report fraudulent certificates as invalid
-
-There are some fraudulent certificates in the wild that are not valid;
-this patch introduces a blacklist of serial numbers of those
-certificates.
-
-Reviewed-by: Richard J. Moore
-Reviewed-by: Markus Goetz
-Task-number: QTBUG-18338
-
-diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
-index cdceb0f..1ce33d3 100644
---- src/network/ssl/qsslcertificate_p.h
-+++ src/network/ssl/qsslcertificate_p.h
-@@ -96,6 +96,7 @@ public:
-     static QSslCertificate QSslCertificate_from_X509(X509 *x509);
-     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
-     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
-+    static bool isBlacklisted(const QSslCertificate &certificate);
- 
-     friend class QSslSocketBackendPrivate;
- 
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket_openssl.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket_openssl.cpp
deleted file mode 100644
index 69a3d79cb3c..00000000000
--- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket_openssl.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_network_ssl_qsslsocket_openssl.cpp,v 1.2 2011/04/07 05:23:52 obache Exp $
-
-From b87528a71b66e786c11804d7b79e408aae612748 Mon Sep 17 00:00:00 2001
-From: Peter Hartmann <peter.hartmann@nokia.com>
-Date: Fri, 25 Mar 2011 13:45:24 +0100
-Subject: [PATCH] QSslSocket internals: abort on encountering blacklisted certificates
-
-tested manually with "openssl s_server -cert blacklisted.pem -key
-key.pem" and connecting a QSslSocket.
-
-Reviewed-by: Markus Goetz
-Task-number: QTBUG-18338
----
- src/network/ssl/qsslsocket_openssl.cpp |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 0866534..2427193 100644
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
-+    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-+        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+        emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+        plainSocket->disconnectFromHost();
-+        return false;
-+    }
- 
-     // Start translating errors.
-     QList<QSslError> errors;
diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile
index 1ca222a64ac..f674e3d2642 100644
--- a/x11/qt4-mng/Makefile
+++ b/x11/qt4-mng/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2011/04/22 13:45:14 obache Exp $
+# $NetBSD: Makefile,v 1.10 2011/05/05 12:37:07 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-mng-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT MNG image format plugin
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile
index 46e2743ae05..fc7dcec21ac 100644
--- a/x11/qt4-mysql/Makefile
+++ b/x11/qt4-mysql/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:14 obache Exp $
+# $NetBSD: Makefile,v 1.18 2011/05/05 12:37:07 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-mysql-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index 25c2a7865c0..9f2ebdca92b 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2011/04/22 13:45:14 obache Exp $
+# $NetBSD: Makefile,v 1.24 2011/05/05 12:37:07 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-pgsql-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile
index f9f4dcb2e62..64dbad337d8 100644
--- a/x11/qt4-qdbus/Makefile
+++ b/x11/qt4-qdbus/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2011/04/22 13:42:36 obache Exp $
+# $NetBSD: Makefile,v 1.20 2011/05/05 12:37:08 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-qdbus-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT DBus support
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile
index 9470f89ec9b..9e8983bfb01 100644
--- a/x11/qt4-sqlite3/Makefile
+++ b/x11/qt4-sqlite3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:14 obache Exp $
+# $NetBSD: Makefile,v 1.18 2011/05/05 12:37:08 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-sqlite3-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT sqlite3 driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile
index 36522a3d21b..047aef05148 100644
--- a/x11/qt4-tiff/Makefile
+++ b/x11/qt4-tiff/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2011/04/22 13:45:14 obache Exp $
+# $NetBSD: Makefile,v 1.17 2011/05/05 12:37:08 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tiff-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT TIFF image format plugin
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index a3c0e97a3cb..53cb942e563 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2011/04/22 13:42:36 obache Exp $
+# $NetBSD: Makefile,v 1.42 2011/05/05 12:37:08 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index 1a97fdd6bdd..de917fd8b53 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2011/03/03 05:50:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2011/05/05 12:37:07 adam Exp $
 # used by x11/qt4-libs/Makefile.common
 # used by x11/qt4-tools/Makefile
 
-QTVERSION=	4.7.2
+QTVERSION=	4.7.3
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://qt.nokia.com/