Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.12 grimoire by Eric Sandall (e3d3fed41029f0fa570a68df8138f49e5038d635)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.12 grimoire by Eric Sandall (e3d3fed41029f0fa570a68df8138f49e5038d635)
  • Date: Sat, 4 Aug 2007 15:42:42 -0500

GIT changes to stable-0.12 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

VERSION | 2
crypto/nss/DETAILS | 6 -
crypto/nss/HISTORY | 3
devel/phppgadmin/DETAILS | 5 -
devel/phppgadmin/HISTORY | 3
http/firefox/DETAILS | 4
http/firefox/HISTORY | 5 +
http/firefox/firefox-config.patch | 10 +-
libs/nspr/DETAILS | 4
libs/nspr/HISTORY | 3
mail/thunderbird/DETAILS | 4
mail/thunderbird/HISTORY | 3
net/tor/DETAILS | 3
net/tor/HISTORY | 4
x11-toolkits/qt-x11/170529.diff | 189
++++++++++++++++++++++++++++++++++++++
x11-toolkits/qt-x11/DETAILS | 2
x11-toolkits/qt-x11/HISTORY | 6 +
x11-toolkits/qt-x11/PRE_BUILD | 2
18 files changed, 238 insertions(+), 20 deletions(-)

New commits:
commit e3d3fed41029f0fa570a68df8138f49e5038d635
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

VERSION: 0.12-6

commit ceeb6fe6bfe5e977c0a0f4977ef5589bfdfe1d3d
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird 2.0.0.6
(cherry picked from commit a6a316c84f91688287ec5d0562c1cd963c8fd03f)

commit 3f58fcf1216db89082b26f866c537451a596bb22
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

firefox 2.0.0.6, SECURITY_PATCH=10
(cherry picked from commit e778c23bb5106d7335d3a0ced45c8fc09174742f)

commit 730c3b2862e6364b3a2239cd755c7c3d80fac3f9
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nss 3.11.7
(cherry picked from commit 4494db74f29116e68584ed434e8ffacf01e58117)

commit 1f93e9a8d0b57577808f969187479ef3fac7a55d
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nspr 4.6.7
(cherry picked from commit afa79f9b7f8c284444aa1dbde1eb1afff2b113d4)

commit 03e2149b5acc3bec1097912539589a4f3be7dc6a
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

phppgadmin 4.1.3
(cherry picked from commit c579018aa87576888856ded02293cc53b3a68141)

commit 5e146bbf52a2d5f9a0952ff48776a3f9463cf539
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Eric Sandall <sandalle AT sourcemage.org>

tor: version update and SECURITY update

commit 3c3dd1f8fe1841fc90b286fef571fb98ded619c4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt-x11 - CVE-2007-3388
(cherry picked from commit 783e4577f95aa6d9497d63ed485aca78f2553157)

diff --git a/VERSION b/VERSION
index 5a35c0a..7344349 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.12-5
+0.12-6
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index f4372e6..c354a0f 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,11 +1,11 @@
SPELL=nss
- VERSION=3.11.5
+ VERSION=3.11.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_5_RTM/src/$SOURCE
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
ENTERED=20030919
-
SOURCE_HASH=sha512:12d96063fa119f2da47c1bb187e939d5d2ca18533e92941ecda71b5bdd44861d4fdd38b5af43d5e7fdbd0fb66bb7a32e9042a455a10be87e1b24c4ba6495783a
+
SOURCE_HASH=sha512:29495bed6e3a3e96f4553b4ba235616f335658f6a2f0ea3e8572b57fc3ccf95fc6adda61fdbba83f2b5fca5bc461d423acaffb8d1b88791f10012216cf9366fe
LICENSE[0]=MPL
LICENSE[1]=GPL
LICENSE[2]=LGPL
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index d618df4..65f2da2 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.11.7
+
2007-03-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.11.5

diff --git a/devel/phppgadmin/DETAILS b/devel/phppgadmin/DETAILS
index 71991e9..139abe7 100755
--- a/devel/phppgadmin/DETAILS
+++ b/devel/phppgadmin/DETAILS
@@ -1,6 +1,7 @@
SPELL=phppgadmin
- VERSION=4.1.1
-
SOURCE_HASH=sha512:ff713b81dea42d4531223306b283304986ab6426f133f9c0abda91da52e87d9718d43af14eeb4ece43f7718b181aa59103d58be04cf824dc230d52dc9348fecd
+ VERSION=4.1.3
+
SOURCE_HASH=sha512:94997f329153ba6e3200bfcf10fae615a91648186fb2aab976026205bfef610d7692f33c4c6fc875676bfc06e8e9f797e1db42c4f3a6a915cb3f2a6e94f62e61
+ SECURITY_PATCH=1
SOURCE=phpPgAdmin-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpPgAdmin-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/phppgadmin/HISTORY b/devel/phppgadmin/HISTORY
index 25ff932..47a07f1 100644
--- a/devel/phppgadmin/HISTORY
+++ b/devel/phppgadmin/HISTORY
@@ -1,3 +1,6 @@
+2007-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.3, SECURITY_PATCH=1, CVE-2007-2865
+
2007-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.1.1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index d984bcc..a6aeb0a 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=2.0.0.5
+ VERSION=2.0.0.6
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,7 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SECURITY_PATCH=9
+ SECURITY_PATCH=10
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 3ac5f0f..f39d2ae 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2007-07-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.0.6, SECURITY_PATCH=10
+
http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.6
+ * firefox-config.patch: updated to 2.0.0.6
+
2007-07-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.5, SECURITY_PATCH=9

http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.5
diff --git a/http/firefox/firefox-config.patch
b/http/firefox/firefox-config.patch
index 9b9b8a1..179fc5f 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
exit 0
;;
--cflags)
-- if test "/usr/local/include/firefox-2.0.0.5" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.5"
+- if test "/usr/local/include/firefox-2.0.0.6" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.6"
+ if test "/usr/include/firefox" != /usr/include ; then
+ includes="-I/usr/include/firefox"
fi
@@ -25,14 +25,14 @@
if test "$echo_cflags" = "yes"; then
nspr_cflags="-I/usr/include/nspr"
for n in $echo_components; do
-- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.5/$n"
+- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.6/$n"
+ component_includes="$component_includes -I/usr/include/firefox/$n"
done
echo $component_includes $includes $nspr_cflags
fi

if test "$echo_idlflags" = "yes"; then
-- echo "-I/usr/local/share/idl/firefox-2.0.0.5"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.6"
+ echo "-I/usr/share/idl/firefox"
fi

@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.5 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.6 $libs
+ echo -L/usr/lib $libs
fi
diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 2935061..6662309 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,11 +1,11 @@
SPELL=nspr
- VERSION=4.6.6
+ VERSION=4.6.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
-
SOURCE_HASH=sha512:aa7ba3390fb37f5e278f03da1d3b80b336e8f4b5b5223ca6d1a55ff96b9055f846913ffaa95adb122cc9b1746457c82ac34340cb2aeb907d2b634f25ee33b881
+
SOURCE_HASH=sha512:9f8cf1d5cd3b290857743bd50e194214271e9d64fd86ee96190750e4455150c7471c3e7c35c6047a082105ba64560ff8406c466d62ef609f89cab69f1c6e2264
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=MPL
PATCHLEVEL=0
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index 883e213..3c619a7 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.6.7
+
2007-03-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.6.6

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index beb5714..07c9b7c 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=2.0.0.5
+ VERSION=2.0.0.6
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -18,7 +18,7 @@ ENIGMAIL_VERSION=0.95.2
LICENSE[1]=MPL
LICENSE[2]=MPL
fi
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 53917c3..b0a2d7f 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2007-08-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.0.6, SECURITY_PATCH=9
+
2007-07-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.5, SECURITY_PATCH=8

diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index ae9cee8..a88f395 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -6,7 +6,8 @@ if [ "$TOR_DEVEL" == "y" ]; then
SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE

SOURCE_HASH=sha512:69ed2d10a22827fd72ade87ce8a80479d6f1075ec0be864e64ef3dd3c27dd6054522f4af06979309333eba8f2699bfee6168f43800f72ca4032e91f115f600c9
else
- VERSION=0.1.1.24
+ VERSION=0.1.2.16
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE

SOURCE_HASH=sha512:e940d508d46130387b1383647772754d68c364398489ff91055038fb539df7cf9891026fefcadc1550efbf4c11bbcde0ec0e92608cca08f6f0160aca62731a68
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index e0c7b41..1d2a4cf 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,7 @@
+2007-08-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated TOR_DEVEL=n to 0.1.2.16
+ SECURITY_PATCH++
+
2006-10-17 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated stable to 0.1.1.24, development to 0.1.2.2-alpha

diff --git a/x11-toolkits/qt-x11/170529.diff b/x11-toolkits/qt-x11/170529.diff
new file mode 100644
index 0000000..969c536
--- /dev/null
+++ b/x11-toolkits/qt-x11/170529.diff
@@ -0,0 +1,189 @@
+--- //depot/qt/3/src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
++++ //depot/qt/3/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
+ }
+--- //depot/qt/3/src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
++++ //depot/qt/3/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;
+ }
+
+--- //depot/qt/3/src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
++++ //depot/qt/3/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" ) );
+
+--- //depot/qt/3/src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
++++ //depot/qt/3/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;
+ }
+
+--- //depot/qt/3/src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
++++ //depot/qt/3/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;
+ }
+
+--- //depot/qt/3/src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
++++ //depot/qt/3/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 );
+
+--- //depot/qt/3/src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
++++ //depot/qt/3/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;
diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index bf0b814..565e387 100755
--- a/x11-toolkits/qt-x11/DETAILS
+++ b/x11-toolkits/qt-x11/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-free-$VERSION
WEB_SITE=http://www.trolltech.com/qt/x11.html
KEYWORDS="qt x11 libs"
ENTERED=20020410
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
DOCS="FAQ README README-QT.TXT"
SHORT="Qt simplifies writing and maintaining GUI applications"
cat << EOF
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 463e901..6c05737 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,9 @@
+2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD:apply patch
+ * 170529.diff: added
+ fixes bug #13923
+
2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD:apply patch
diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
index d6a04ec..6ccb4a4 100755
--- a/x11-toolkits/qt-x11/PRE_BUILD
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -2,7 +2,7 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
# apply patches
patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.diff &&
-
+patch -p4 < $SPELL_DIRECTORY/170529.diff &&
# fix detecction of firebird
sedit "s/-lgds//" configure &&
sedit "/gds/D;/\t}/D" plugins/src/sqldrivers/ibase/ibase.pro &&



  • [SM-Commit] GIT changes to stable-0.12 grimoire by Eric Sandall (e3d3fed41029f0fa570a68df8138f49e5038d635), Eric Sandall, 08/04/2007

Archive powered by MHonArc 2.6.24.

Top of Page