Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ce22186a16eba73402c61d90de980a19742bbc4
commit 7ce22186a16eba73402c61d90de980a19742bbc4 Author: crazy <[EMAIL PROTECTED]> Date: Thu Sep 20 11:52:06 2007 +0200 qt4-4.3.1-2-i686 * [SEC] relbump * closes #2422 in -current * added missing Fdie's diff --git a/source/kde-extra/qt4/CVE-2007-4137.patch b/source/kde-extra/qt4/CVE-2007-4137.patch new file mode 100644 index 0000000..e2bbdd0 --- /dev/null +++ b/source/kde-extra/qt4/CVE-2007-4137.patch @@ -0,0 +1,11 @@ +--- src/corelib/codecs/qutfcodec.cpp ++++ src/corelib/codecs/qutfcodec.cpp +@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const char *chars, int len, C + + int originalLength = target->length(); + QString &result = *target; +- result.resize(originalLength + len); // worst case ++ result.resize(originalLength + len + 1); // worst case + QChar *qch = result.data() + originalLength; + uchar ch; + int invalid = 0; diff --git a/source/kde-extra/qt4/FrugalBuild b/source/kde-extra/qt4/FrugalBuild index d48c0e8..e656bc1 100644 --- a/source/kde-extra/qt4/FrugalBuild +++ b/source/kde-extra/qt4/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt4 origname=qt pkgver=4.3.1 -pkgrel=1 +pkgrel=2 pkgmore=x11-opensource-src pkgdesc="The QT4 GUI toolkit." url="http://www.trolltech.com/products/qt"; @@ -18,6 +18,7 @@ options=('nodocs' 'scriptlet') up2date="lynx -dump ftp://ftp.trolltech.com/qt/source/|grep 'qt-x11-opensource-src'|grep -v rc[1-9]|grep -v beta|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-qt4-copy.tar.bz2 \ + CVE-2007-4137.patch \ assistant4.desktop designer4.desktop linguist4.desktop qt4config.desktop \ dummy.patch qt4.sh.off Trolltech.conf apply_patches) @@ -118,13 +119,14 @@ build() Fexe /etc/profile.d/qt4.sh.off Fexe /etc/$pkgname/Trolltech.conf ## some more fixes - cd $Fdestdir/usr/share/$pkgname/mkspecs - rm -rf default ## blah symlink to build dir - ln -sf linux-g++ default + cd $Fdestdir/usr/share/$pkgname/mkspecs || Fdie + rm -rf default || Fdie ## blah symlink to build dir + ln -sf linux-g++ default || Fdie } sha1sums=('ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2' \ '67783ee03af5c615cb6b66df2a7499c22225f841' \ + 'bc00ca6a74edde2a8536988b47e75cc68cb0cb25' \ '991ed0d2f047e0ead54efc050c652595b7bed00b' \ '19281b54674d4071a3814200fd8a64e097ece2e8' \ '410b18b9a496cf551f7ff6cb282c719c874bc883' \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
