Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3cd37c5a8f97a199c588d0c0cbe6a60221656bd7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3cd37c5a8f97a199c588d0c0cbe6a60221656bd7)
  • Date: Sat, 5 Sep 2009 06:08:02 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

x11-toolkits/qt4/DETAILS | 2 +-
x11-toolkits/qt4/HISTORY | 8 ++++++++
x11-toolkits/qt4/PRE_BUILD | 3 +++
x11-toolkits/qt4/nokia.diff | 11 +++++++++++
4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 952dc738091c9ffc284757f5eda06be9805ff02c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt4 - fix cve-2009-2700

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 4075727..adf1f98 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -23,7 +23,7 @@ persistent_remove QT_VER

SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/source/$SOURCE
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
#esac
SOURCE_URL[0]=http://download.qtsoftware.com/$URI
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 980573e..4dcd082 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,11 @@
+2009-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply nokia patch
+ * nodia.diff: added, upstream security patch
+
<http://qt.nokia.com/about/news/qt-patches-released-addressing-potential-security-flaw>
+ cve-2009-2700
+ fixes bug #15388
+
2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
* POST_INSTALL: fix bad pkgconfig files
* DETAILS: PATCHLEVEL=2
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 27d53a0..58941c6 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# upstream patch
+patch -p0 < $SPELL_DIRECTORY/nokia.diff &&
+
# add better optimisation flags
sed -i "s|-O2||" mkspecs/common/g++.conf \
mkspecs/linux-cxx/qmake.conf &&
diff --git a/x11-toolkits/qt4/nokia.diff b/x11-toolkits/qt4/nokia.diff
new file mode 100644
index 0000000..5d365b3
--- /dev/null
+++ b/x11-toolkits/qt4/nokia.diff
@@ -0,0 +1,11 @@
+--- src/network/ssl/qsslcertificate.cpp 2009-09-05 11:24:45.000000000
+0200
++++ src/network/ssl/qsslcertificate.cpp.cp 2009-09-05 11:54:28.000000000
+0200
+@@ -377,7 +377,7 @@
+ }
+
+ const char *altNameStr = reinterpret_cast<const char
*>(q_ASN1_STRING_data(genName->d.ia5));
+- const QString altName = QLatin1String(QByteArray(altNameStr,
len));
++ const QString altName = QString::fromLatin1(altNameStr, len);
+ if (genName->type == GEN_DNS)
+ result.insert(QSsl::DnsEntry, altName);
+ else if (genName->type == GEN_EMAIL)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3cd37c5a8f97a199c588d0c0cbe6a60221656bd7), Treeve Jelbert, 09/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page