summaryrefslogtreecommitdiff
path: root/x11/qt3-libs/patches/patch-cc
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2007-08-02 07:29:26 +0000
committerghen <ghen@pkgsrc.org>2007-08-02 07:29:26 +0000
commite6b7260591578ce9416052904f11052488b53a28 (patch)
tree499c9d04442352af0f7d5a26c06b8e2772129feb /x11/qt3-libs/patches/patch-cc
parent557392fd3f1e43b3275d536de00f8330f566b692 (diff)
downloadpkgsrc-e6b7260591578ce9416052904f11052488b53a28.tar.gz
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.
Diffstat (limited to 'x11/qt3-libs/patches/patch-cc')
-rw-r--r--x11/qt3-libs/patches/patch-cc25
1 files changed, 25 insertions, 0 deletions
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" ) );
+