diff options
| author | drochner <drochner> | 2009-10-01 13:30:42 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-10-01 13:30:42 +0000 |
| commit | f82ae5d461a331045c17e697d8c790d78ef75e78 (patch) | |
| tree | 4139f976a2b78e134fd7c99f41f845f22c92daa3 | |
| parent | eba8907d28f020750f2c01fa073be43587efeaa2 (diff) | |
| download | pkgsrc-f82ae5d461a331045c17e697d8c790d78ef75e78.tar.gz | |
add patch from upstream to fix certificate check flaw (CVE-2009-2700),
bump PKGREVISION
| -rw-r--r-- | x11/qt4-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-ba | 11 |
3 files changed, 14 insertions, 5 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index c06aa04293e..9268d211f33 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -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 --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index ef9ea72d3f4..e3e8f4a59f8 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -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-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b 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 --git a/x11/qt4-libs/patches/patch-ba b/x11/qt4-libs/patches/patch-ba index 94c6c6563c4..dce0d35f9e5 100644 --- a/x11/qt4-libs/patches/patch-ba +++ b/x11/qt4-libs/patches/patch-ba @@ -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 @@ $NetBSD: patch-ba,v 1.1 2009/07/24 10:56:46 drochner Exp $ 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) |