[Frugalware-darcs] frugalware-0.6: qt-3.3.7-5terminus1-i686

VMiklos vmiklos at frugalware.org
Mon Aug 13 21:17:45 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070813191607-e2957-de8157d3464ab0e1520615867d063a46a606ec65.gz;

[qt-3.3.7-5terminus1-i686
VMiklos <vmiklos at frugalware.org>**20070813191607
 added CVE-2007-3388.patch
 closes #2311
] {
addfile ./source/kde/qt/CVE-2007-3388.patch
hunk ./source/kde/qt/CVE-2007-3388.patch 1
+diff -Naurp qt-x11-free-3.3.8/src/sql/qdatatable.cpp qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp
+--- qt-x11-free-3.3.8/src/sql/qdatatable.cpp	2007-01-11 14:46:33.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -1043,8 +1043,8 @@ bool QDataTable::insertCurrent()
+ 	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 @@ bool QDataTable::updateCurrent()
+ 	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 @@ bool QDataTable::deleteCurrent()
+ 	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 -Naurp qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp
+--- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp	2007-01-11 16:03:02.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -234,7 +234,8 @@ QSqlDatabase* QSqlDatabaseManager::datab
+ 	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 @@ void QSqlDatabase::init( const QString& 
+     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 -Naurp qt-x11-free-3.3.8/src/sql/qsqlindex.cpp qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp
+--- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp	2007-01-11 14:46:35.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -273,7 +273,7 @@ QSqlIndex QSqlIndex::fromStringList( con
+ 	if ( field )
+ 	    newSort.append( *field, desc );
+ 	else
+-	    qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
++	    qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+     }
+     return newSort;
+ }
+diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp
+--- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp	2007-01-11 14:46:35.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -298,7 +298,7 @@ int QSqlRecord::position( const QString&
+ 	    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 @@ QSqlField* QSqlRecord::field( int i )
+     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 @@ const QSqlField* QSqlRecord::field( int 
+ {
+     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 -Naurp qt-x11-free-3.3.8/src/tools/qglobal.cpp qt-x11-free-3.3.8-p/src/tools/qglobal.cpp
+--- qt-x11-free-3.3.8/src/tools/qglobal.cpp	2007-02-02 15:01:06.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/tools/qglobal.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -680,7 +680,7 @@ void qSystemWarning( const char* msg, in
+     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 -Naurp qt-x11-free-3.3.8/src/widgets/qtextedit.cpp qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp
+--- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp	2007-02-02 15:01:23.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -6349,7 +6349,7 @@ void QTextEdit::optimParseTags( QString 
+ 		    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 @@ void QTextEdit::optimParseTags( QString 
+ 				    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 -Naurp qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp
+--- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp	2007-02-02 15:01:03.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -978,7 +978,7 @@ bool QSvgDevice::play( const QDomNode &n
+ 		// ### 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 @@ bool QSvgDevice::play( const QDomNode &n
+                 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 @@ double QSvgDevice::parseLen( const QStri
+ {
+     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 @@ double QSvgDevice::parseLen( const QStri
+ 	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;
hunk ./source/kde/qt/FrugalBuild 7
-pkgrel=4
+pkgrel=5terminus1
hunk ./source/kde/qt/FrugalBuild 26
-	0075-fix-array-underrun.diff)
+	0075-fix-array-underrun.diff \
+	CVE-2007-3388.patch)
hunk ./source/kde/qt/FrugalBuild 87
-sha1sums=('824a4a69f78450e0c32b6c4bca17ef5d07a3b58d'\
-          '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0'\
-          '0464d40d9bd518fe8d139b1306136089349a4cdf'\
-          '7562323175ec47483dcb45c2857519f6276e0a51'\
-          '54d37e3988c4b195ae960ef2c59e678151115211'\
-          '0d5fcbe569723792700bad3c82abe34d5e5163c4'\
-          'dba54b91b2b00c1d052ac512d824b29d31aefb89'\
-          '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871'\
-          'dffee9bbe4d3256b7331eb3d26ebd9d6b5adc996'\
-          '62abbe0142a494d81811b6293937a75462203523')
+sha1sums=('824a4a69f78450e0c32b6c4bca17ef5d07a3b58d' \
+          '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \
+          '0464d40d9bd518fe8d139b1306136089349a4cdf' \
+          '7562323175ec47483dcb45c2857519f6276e0a51' \
+          '54d37e3988c4b195ae960ef2c59e678151115211' \
+          '0d5fcbe569723792700bad3c82abe34d5e5163c4' \
+          'dba54b91b2b00c1d052ac512d824b29d31aefb89' \
+          '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \
+          'dffee9bbe4d3256b7331eb3d26ebd9d6b5adc996' \
+          '62abbe0142a494d81811b6293937a75462203523' \
+          'f7634fb0419bda723053adb885facd270ccb10ec')
}


More information about the Frugalware-darcs mailing list