[pkgsrc/trunk]: pkgsrc/x11/qt4-libs add patch from upstream to fix certificat...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7ef17415d90
branches:  trunk
changeset: 399775:e7ef17415d90
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 01 13:30:42 2009 +0000

description:
add patch from upstream to fix certificate check flaw (CVE-2009-2700),
bump PKGREVISION

diffstat:

 x11/qt4-libs/Makefile         |   4 ++--
 x11/qt4-libs/distinfo         |   4 ++--
 x11/qt4-libs/patches/patch-ba |  11 ++++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r e21896b08b16 -r e7ef17415d90 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Thu Oct 01 12:30:32 2009 +0000
+++ b/x11/qt4-libs/Makefile     Thu Oct 01 13:30:42 2009 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2009/09/29 06:39:29 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/10/01 13:30:42 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-libs-${QTVERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       C++ X GUI toolkit
 
 BUILD_TARGET=          sub-src
diff -r e21896b08b16 -r e7ef17415d90 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Thu Oct 01 12:30:32 2009 +0000
+++ b/x11/qt4-libs/distinfo     Thu Oct 01 13:30:42 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2009/09/29 06:39:30 wiz Exp $
+$NetBSD: distinfo,v 1.34 2009/10/01 13:30:42 drochner Exp $
 
 SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b
 RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7
@@ -25,6 +25,6 @@
 SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
-SHA1 (patch-ba) = 669bd9b71edfe861b2945d696cf5fa151d0d48af
+SHA1 (patch-ba) = 2538ab3200e47e072a9c1868d5d09f966435f43d
 SHA1 (patch-bb) = 00b1c40fa1c1874cc61dcbb5f80eedcc8863dbc9
 SHA1 (patch-bc) = 6376bdd6789567725fbb183518f06c55bb57864d
diff -r e21896b08b16 -r e7ef17415d90 x11/qt4-libs/patches/patch-ba
--- a/x11/qt4-libs/patches/patch-ba     Thu Oct 01 12:30:32 2009 +0000
+++ b/x11/qt4-libs/patches/patch-ba     Thu Oct 01 13:30:42 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2009/07/24 10:56:46 drochner Exp $
+$NetBSD: patch-ba,v 1.2 2009/10/01 13:30:42 drochner Exp $
 
 --- src/network/ssl/qsslcertificate.cpp.orig   2009-06-20 06:57:57.000000000 +0200
 +++ src/network/ssl/qsslcertificate.cpp
@@ -11,3 +11,12 @@
  
      if (altNames) {
          for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) {
+@@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
+             }
+ 
+             const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
+-            const QString altName = QLatin1String(QByteArray(altNameStr, len));
++            const QString altName = QString::fromLatin1(altNameStr, len);
+             if (genName->type == GEN_DNS)
+                 result.insert(QSsl::DnsEntry, altName);
+             else if (genName->type == GEN_EMAIL)