From e6b7260591578ce9416052904f11052488b53a28 Mon Sep 17 00:00:00 2001 From: ghen Date: Thu, 2 Aug 2007 07:29:26 +0000 Subject: Pullup ticket 2155 - requested by tron security fix for qt3-libs - pkgsrc/x11/qt3-libs/Makefile 1.64 - pkgsrc/x11/qt3-libs/distinfo 1.45 - pkgsrc/x11/qt3-libs/patches/patch-ca 1.1 - pkgsrc/x11/qt3-libs/patches/patch-cb 1.1 - pkgsrc/x11/qt3-libs/patches/patch-cc 1.1 - pkgsrc/x11/qt3-libs/patches/patch-cd 1.1 - pkgsrc/x11/qt3-libs/patches/patch-ce 1.1 - pkgsrc/x11/qt3-libs/patches/patch-cf 1.1 - pkgsrc/x11/qt3-libs/patches/patch-cg 1.1 Module Name: pkgsrc Committed By: tron Date: Wed Aug 1 20:51:26 UTC 2007 Modified Files: pkgsrc/x11/qt3-libs: Makefile distinfo Added Files: pkgsrc/x11/qt3-libs/patches: patch-ca patch-cb patch-cc patch-cd patch-ce patch-cf patch-cg Log Message: Add patches provided by Trolltech to fix CVE-2007-3388. Bump package revision. --- x11/qt3-libs/Makefile | 4 ++-- x11/qt3-libs/distinfo | 9 +++++++- x11/qt3-libs/patches/patch-ca | 23 ++++++++++++++++++++ x11/qt3-libs/patches/patch-cb | 49 +++++++++++++++++++++++++++++++++++++++++++ x11/qt3-libs/patches/patch-cc | 25 ++++++++++++++++++++++ x11/qt3-libs/patches/patch-cd | 15 +++++++++++++ x11/qt3-libs/patches/patch-ce | 33 +++++++++++++++++++++++++++++ x11/qt3-libs/patches/patch-cf | 15 +++++++++++++ x11/qt3-libs/patches/patch-cg | 43 +++++++++++++++++++++++++++++++++++++ 9 files changed, 213 insertions(+), 3 deletions(-) create mode 100644 x11/qt3-libs/patches/patch-ca create mode 100644 x11/qt3-libs/patches/patch-cb create mode 100644 x11/qt3-libs/patches/patch-cc create mode 100644 x11/qt3-libs/patches/patch-cd create mode 100644 x11/qt3-libs/patches/patch-ce create mode 100644 x11/qt3-libs/patches/patch-cf create mode 100644 x11/qt3-libs/patches/patch-cg diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index eb97a8a6897..b2d8f04ead0 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2007/04/06 12:44:38 markd Exp $ +# $NetBSD: Makefile,v 1.63.4.1 2007/08/02 07:29:26 ghen Exp $ PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 65bb755dea4..fb0341e3f3b 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2007/04/06 12:44:38 markd Exp $ +$NetBSD: distinfo,v 1.44.4.1 2007/08/02 07:29:26 ghen Exp $ SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4 @@ -24,5 +24,12 @@ SHA1 (patch-ar) = 736703bd8831a4fa5562690b9159d937b233fccf SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 +SHA1 (patch-ca) = ea01baa00b69f51ee8a8b9d22fda0e73ef72c568 +SHA1 (patch-cb) = 5503e04dc0446253fdedd07b34abb15d9c4cceeb +SHA1 (patch-cc) = 1df4209b939c881f5aa294a6b02e6f8aa3a6fb72 +SHA1 (patch-cd) = 28fee429d9dd6c24a2e82b7bf87f913c85f5d6f1 +SHA1 (patch-ce) = d99fad12c395eecb34c5cddbcfe583426e91edb0 +SHA1 (patch-cf) = bb9d3dc04bb0bc3b9a089104a61f22a31f57c2c0 +SHA1 (patch-cg) = 28a663c77b1f72b5750445a010de932850d7c1c5 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 diff --git a/x11/qt3-libs/patches/patch-ca b/x11/qt3-libs/patches/patch-ca new file mode 100644 index 00000000000..bea9490918f --- /dev/null +++ b/x11/qt3-libs/patches/patch-ca @@ -0,0 +1,23 @@ +$NetBSD: patch-ca,v 1.1.2.2 2007/08/02 07:29:27 ghen Exp $ + +--- src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007 ++++ src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007 + +@@ -6349,7 +6349,7 @@ + cur = tag->prev; + if ( !cur ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 ); ++ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 ); + #endif + return; // something is wrong - give up + } +@@ -6372,7 +6372,7 @@ + break; + } else if ( !cur->leftTag ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 ); ++ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 ); + #endif + return; // something is amiss - give up + } diff --git a/x11/qt3-libs/patches/patch-cb b/x11/qt3-libs/patches/patch-cb new file mode 100644 index 00000000000..ffab340d45a --- /dev/null +++ b/x11/qt3-libs/patches/patch-cb @@ -0,0 +1,49 @@ +$NetBSD: patch-cb,v 1.1.2.2 2007/08/02 07:29:27 ghen Exp $ + +--- src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007 ++++ src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007 + +@@ -1043,8 +1043,8 @@ + return FALSE; + if ( !sqlCursor()->canInsert() ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::insertCurrent: insert not allowed for " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::insertCurrent: insert not allowed for %s", ++ sqlCursor()->name().latin1() ); + #endif + endInsert(); + return FALSE; +@@ -1117,16 +1117,16 @@ + return FALSE; + if ( sqlCursor()->primaryIndex().count() == 0 ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::updateCurrent: no primary index for " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::updateCurrent: no primary index for %s", ++ sqlCursor()->name().latin1() ); + #endif + endUpdate(); + return FALSE; + } + if ( !sqlCursor()->canUpdate() ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::updateCurrent: updates not allowed for " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::updateCurrent: updates not allowed for %s", ++ sqlCursor()->name().latin1() ); + #endif + endUpdate(); + return FALSE; +@@ -1191,8 +1191,8 @@ + return FALSE; + if ( sqlCursor()->primaryIndex().count() == 0 ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::deleteCurrent: no primary index " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::deleteCurrent: no primary index %s", ++ sqlCursor()->name().latin1() ); + #endif + return FALSE; + } + diff --git a/x11/qt3-libs/patches/patch-cc b/x11/qt3-libs/patches/patch-cc new file mode 100644 index 00000000000..3770be0f487 --- /dev/null +++ b/x11/qt3-libs/patches/patch-cc @@ -0,0 +1,25 @@ +$NetBSD: patch-cc,v 1.1.2.2 2007/08/02 07:29:27 ghen Exp $ + +--- src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007 ++++ src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007 + +@@ -234,7 +234,8 @@ + db->open(); + #ifdef QT_CHECK_RANGE + if ( !db->isOpen() ) +- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() ); ++ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s", ++ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() ); + #endif + } + return db; +@@ -686,7 +687,7 @@ + if ( !d->driver ) { + #ifdef QT_CHECK_RANGE + qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() ); +- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") ); ++ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() ); + #endif + d->driver = new QNullDriver(); + d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) ); + diff --git a/x11/qt3-libs/patches/patch-cd b/x11/qt3-libs/patches/patch-cd new file mode 100644 index 00000000000..fc2e4b9d1b7 --- /dev/null +++ b/x11/qt3-libs/patches/patch-cd @@ -0,0 +1,15 @@ +$NetBSD: patch-cd,v 1.1.2.2 2007/08/02 07:29:28 ghen Exp $ + +--- src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007 ++++ src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007 + +@@ -273,7 +273,7 @@ + if ( field ) + newSort.append( *field, desc ); + else +- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" ); ++ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1()); + } + return newSort; + } + diff --git a/x11/qt3-libs/patches/patch-ce b/x11/qt3-libs/patches/patch-ce new file mode 100644 index 00000000000..9a0c6e91d6e --- /dev/null +++ b/x11/qt3-libs/patches/patch-ce @@ -0,0 +1,33 @@ +$NetBSD: patch-ce,v 1.1.2.2 2007/08/02 07:29:28 ghen Exp $ + +--- src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007 ++++ src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007 + +@@ -298,7 +298,7 @@ + return i; + } + #ifdef QT_CHECK_RANGE +- qWarning( "QSqlRecord::position: unable to find field " + name ); ++ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() ); + #endif + return -1; + } +@@ -313,7 +313,7 @@ + checkDetach(); + if ( !sh->d->contains( i ) ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); ++ qWarning( "QSqlRecord::field: index out of range: %d", i ); + #endif + return 0; + } +@@ -344,7 +344,7 @@ + { + if ( !sh->d->contains( i ) ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); ++ qWarning( "QSqlRecord::field: index out of range: %d", i ); + #endif // QT_CHECK_RANGE + return 0; + } + diff --git a/x11/qt3-libs/patches/patch-cf b/x11/qt3-libs/patches/patch-cf new file mode 100644 index 00000000000..9f8d3e225bc --- /dev/null +++ b/x11/qt3-libs/patches/patch-cf @@ -0,0 +1,15 @@ +$NetBSD: patch-cf,v 1.1.2.2 2007/08/02 07:29:29 ghen Exp $ + +--- src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007 ++++ src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007 + +@@ -680,7 +680,7 @@ + if ( code != -1 ) + qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) ); + else +- qWarning( msg ); ++ qWarning( "%s", msg ); + #endif + #else + Q_UNUSED( msg ); + diff --git a/x11/qt3-libs/patches/patch-cg b/x11/qt3-libs/patches/patch-cg new file mode 100644 index 00000000000..f082d5d09d6 --- /dev/null +++ b/x11/qt3-libs/patches/patch-cg @@ -0,0 +1,43 @@ +$NetBSD: patch-cg,v 1.1.2.2 2007/08/02 07:29:29 ghen Exp $ + +--- src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007 ++++ src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007 + +@@ -978,7 +978,7 @@ + // ### catch references to embedded .svg files + QPixmap pix; + if ( !pix.load( href ) ) { +- qWarning( "QSvgDevice::play: Couldn't load image "+href ); ++ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() ); + break; + } + pt->drawPixmap( QRect( x1, y1, w, h ), pix ); +@@ -1024,8 +1024,8 @@ + break; + } + case InvalidElement: +- qWarning( "QSvgDevice::play: unknown element type " + +- node.nodeName() ); ++ qWarning( "QSvgDevice::play: unknown element type %s", ++ node.nodeName().latin1() ); + break; + }; + +@@ -1111,7 +1111,7 @@ + { + QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") ); + if ( reg.search( str ) == -1 ) { +- qWarning( "QSvgDevice::parseLen: couldn't parse " + str ); ++ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() ); + if ( ok ) + *ok = FALSE; + return 0.0; +@@ -1140,7 +1140,7 @@ + else if ( u == "pc" ) + dbl *= m.logicalDpiX() / 6.0; + else +- qWarning( "QSvgDevice::parseLen: Unknown unit " + u ); ++ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() ); + } + if ( ok ) + *ok = TRUE; -- cgit v1.2.3