commit libqt4 for openSUSE:Factory

21 Apr 2011

Hello community,

here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Thu Apr 21 11:51:27 CEST 2011.



--------

--- libqt4/libqt4-devel-doc-data.changes	2011-03-03 14:53:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes	2011-03-28 12:54:59.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Mar 28 11:59:33 CEST 2011 - dmueller@suse.de
+
+- blacklist fraudulently issued certificates:
+  http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+
+-------------------------------------------------------------------
+Fri Mar 11 14:15:20 CET 2011 - dmueller@suse.de
+
+- revert last change temporarily
+
+-------------------------------------------------------------------
+Thu Mar 10 00:29:48 CET 2011 - dmueller@suse.de
+
+- remove Mesa-devel from libqt4-devel
+
+-------------------------------------------------------------------
libqt4-devel-doc.changes: same change
libqt4-sql-plugins.changes: same change
libqt4.changes: same change

calling whatdependson for head-i586


New:
----
  comodo-blacklisting.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -21,14 +21,14 @@
 
 Name:           libqt4-devel-doc-data
 BuildRequires:  cups-devel freeglut-devel freetype2-devel libQtWebKit-devel libqt4-devel pkgconfig
-BuildRequires:  alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel
+BuildRequires:  Mesa-devel alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel
 %if 0%{?suse_version}
 BuildRequires:  fdupes update-desktop-files
 %endif
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.7.2
-Release:        2
+Release:        3
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion %version
@@ -79,6 +79,7 @@
 Patch121:       webkit-sparc64.diff
 Patch123:       use-cups-default-print-settings-bnc552218.diff
 Patch124:       qtreeview-fix-QTBUG-16292.diff
+Patch125:       comodo-blacklisting.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports  -xsync -xinput -gtkstyle
@@ -137,6 +138,7 @@
 %endif
 %patch123
 %patch124
+%patch125
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them

++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -20,7 +20,7 @@
 
 
 Name:           libqt4-devel-doc
-BuildRequires:  cups-devel freeglut-devel libjpeg-devel libpng-devel
+BuildRequires:  Mesa-devel cups-devel freeglut-devel libjpeg-devel libpng-devel
 BuildRequires:  alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
@@ -31,7 +31,7 @@
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.7.2
-Release:        2
+Release:        3
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion %version
@@ -86,6 +86,7 @@
 Patch121:       webkit-sparc64.diff
 Patch123:       use-cups-default-print-settings-bnc552218.diff
 Patch124:       qtreeview-fix-QTBUG-16292.diff
+Patch125:       comodo-blacklisting.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports  -xsync -xinput -gtkstyle
@@ -144,6 +145,7 @@
 %endif
 %patch123
 %patch124
+%patch125
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -22,14 +22,14 @@
 Name:           libqt4-sql-plugins
 BuildRequires:  cups-devel
 BuildRequires:  libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel
-BuildRequires:  alsa-devel gtk2-devel libqt4-devel
+BuildRequires:  Mesa-devel alsa-devel gtk2-devel libqt4-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.7.2
-Release:        2
+Release:        3
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion %version
@@ -78,6 +78,7 @@
 Patch121:       webkit-sparc64.diff
 Patch123:       use-cups-default-print-settings-bnc552218.diff
 Patch124:       qtreeview-fix-QTBUG-16292.diff
+Patch125:       comodo-blacklisting.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports  -xsync -xinput -gtkstyle
@@ -136,6 +137,7 @@
 %endif
 %patch123
 %patch124
+%patch125
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -54,7 +54,7 @@
 Obsoletes:      libqt4-dbus-1 < 4.4.0
 # COMMON-VERSION-BEGIN
 Version:        4.7.2
-Release:        2
+Release:        3
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion %version
@@ -96,6 +96,7 @@
 Patch121:       webkit-sparc64.diff
 Patch123:       use-cups-default-print-settings-bnc552218.diff
 Patch124:       qtreeview-fix-QTBUG-16292.diff
+Patch125:       comodo-blacklisting.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports  -xsync -xinput -gtkstyle
@@ -154,6 +155,7 @@
 %endif
 %patch123
 %patch124
+%patch125
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them


++++++ comodo-blacklisting.diff ++++++
--- src/network/ssl/qsslcertificate.cpp
+++ src/network/ssl/qsslcertificate.cpp
@@ -219,17 +219,19 @@
     Returns true if this certificate is valid; otherwise returns
     false.
 
-    Note: Currently, this function only checks that the current
+    Note: Currently, this function checks that the current
     data-time is within the date-time range during which the
-    certificate is considered valid. No other checks are
-    currently performed.
+    certificate is considered valid, and checks that the
+    certificate is not in a blacklist of fraudulent certificates.
 
     \sa isNull()
 */
 bool QSslCertificate::isValid() const
 {
     const QDateTime currentTime = QDateTime::currentDateTime();
-    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
+    return currentTime >= d->notValidBefore &&
+            currentTime <= d->notValidAfter &&
+            ! QSslCertificatePrivate::isBlacklisted(*this);
 }
 
 /*!
@@ -798,6 +800,30 @@
     return certificates;
 }
 
+// These certificates are known to be fraudulent and were created during the comodo
+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+static const char *certificate_blacklist[] = {
+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
+    0
+};
+
+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
+{
+    for (int a = 0; certificate_blacklist[a] != 0; a++) {
+        if (certificate.serialNumber() == certificate_blacklist[a])
+            return true;
+    }
+    return false;
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
 {
--- src/network/ssl/qsslcertificate_p.h
+++ src/network/ssl/qsslcertificate_p.h
@@ -96,6 +96,7 @@
     static QSslCertificate QSslCertificate_from_X509(X509 *x509);
     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
+    static bool isBlacklisted(const QSslCertificate &certificate);
 
     friend class QSslSocketBackendPrivate;
 
--- src/network/ssl/qsslsocket_openssl.cpp
+++ src/network/ssl/qsslsocket_openssl.cpp
@@ -1183,6 +1183,13 @@
     X509 *x509 = q_SSL_get_peer_certificate(ssl);
     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
     q_X509_free(x509);
+    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
+        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
+        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
+        emit q->error(QAbstractSocket::SslHandshakeFailedError);
+        plainSocket->disconnectFromHost();
+        return false;
+    }
 
     // Start translating errors.
     QList<QSslError> errors;

++++++ libqt4-devel-doc-data.spec.in ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -20,7 +20,7 @@
 
 Name:           libqt4-devel-doc-data
 BuildRequires:  cups-devel freeglut-devel freetype2-devel libQtWebKit-devel libqt4-devel pkgconfig
-BuildRequires:  alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel
+BuildRequires:  alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel Mesa-devel
 %if 0%{?suse_version}
 BuildRequires:  fdupes update-desktop-files
 %endif

++++++ libqt4-devel-doc.spec.in ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -19,7 +19,7 @@
 # nodebuginfo
 
 Name:           libqt4-devel-doc
-BuildRequires:  cups-devel freeglut-devel libjpeg-devel libpng-devel
+BuildRequires:  cups-devel freeglut-devel libjpeg-devel libpng-devel Mesa-devel
 BuildRequires:  alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes

++++++ libqt4-sql-plugins.spec.in ++++++
--- /var/tmp/diff_new_pack.xXHljP/_old	2011-04-21 11:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xXHljP/_new	2011-04-21 11:50:14.000000000 +0200
@@ -21,7 +21,7 @@
 Name:           libqt4-sql-plugins
 BuildRequires:  cups-devel
 BuildRequires:  libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel
-BuildRequires:  alsa-devel gtk2-devel libqt4-devel
+BuildRequires:  alsa-devel gtk2-devel libqt4-devel Mesa-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)