Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-01-10 15:25:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-11-28 11:00:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-01-10 15:25:35.000000000 +0100 @@ -1,0 +2,33 @@ +Mon Jan 7 16:09:50 UTC 2013 - dmuel...@suse.com + +- Add cert-blacklist-more.diff, cert-blacklist-tuerktrust.diff: + * blacklist more evil certificates + +------------------------------------------------------------------- +Mon Jan 7 12:38:48 UTC 2013 - dmuel...@suse.com + +- enable linked support for OpenSSL + +------------------------------------------------------------------- +Fri Jan 4 15:16:33 UTC 2013 - dmuel...@suse.com + +- qdbusviewer.patch: Add fix for qdbusviewer not matching args (bnc#784197) +- openssl-incompatibility-fix.diff: Fix wrong error reporting when using + a binary incompatible version of openSSL (bnc#797006, CVE-2012-6093) + +------------------------------------------------------------------- +Sun Dec 16 18:59:51 CET 2012 - r...@suse.de + +- fix build on s390x by adding + qt4-fix-s390x-build.diff + +------------------------------------------------------------------- +Mon Dec 3 07:56:00 UTC 2012 - stephan.bin...@basyskom.com + +- Update to version 4.8.4: + * long list of forward and backward compatible + bug fixes. see included changes-4.8.4 for details +- remove obsolete backport disable-ssl-compression-by-default.patch +- update License and URL to Digia + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: ---- disable-ssl-compression-by-default.patch qt-everywhere-opensource-src-4.8.3.tar.gz New: ---- cert-blacklist-more.diff cert-blacklist-tuerktrust.diff openssl-incompatibility-fix.diff qdbusviewer.patch qt-everywhere-opensource-src-4.8.4.tar.bz2 qt4-fix-s390x-build.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:49.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,14 +31,14 @@ BuildRequires: update-desktop-files %endif Summary: Qt documentation -License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Documentation/HTML -Url: http://www.trolltech.com +Url: http://qt.digia.com/ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version: 4.8.3 +Version: 4.8.4 Release: 0 # COMMON-VERSION-END # COMMON-VERSION-END @@ -53,7 +53,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%{tar_version}.tar.gz +Source: qt-%{tar_version}.tar.bz2 # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf @@ -94,12 +94,17 @@ Patch136: handle-tga-files-properly.diff Patch137: qdbusconnection-no-warning-output.patch Patch138: undo-fix-jit-crash-on-x86_64.patch -Patch139: disable-ssl-compression-by-default.patch # PATCH-FIX-UPSTREAM fix_assistant_segfault_QTBUG-25324.patch [bnc#780763] [QTBUG#25324] Patch140: fix_assistant_segfault_QTBUG-25324.patch +# PATCH-FIX-OPENSUSE fix build on s390x failing to link in qnetworkconfigmanager.o +Patch141: qt4-fix-s390x-build.diff +Patch142: qdbusviewer.patch +Patch143: openssl-incompatibility-fix.diff +Patch144: cert-blacklist-tuerktrust.diff +Patch145: cert-blacklist-more.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 -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f %{_datadir}/qt4/mkspecs/qconfig.pri ; then \ @@ -170,8 +175,12 @@ %patch136 %patch137 %patch138 -p1 -%patch139 -p1 %patch140 -p1 +%patch141 -p0 +%patch142 +%patch143 +%patch144 -p1 +%patch145 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:49.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-sql-plugins # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,21 +30,21 @@ BuildRequires: update-desktop-files %endif Summary: Qt 4 SQL related libraries -License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: System/Libraries -Url: http://www.trolltech.com +Url: http://qt.digia.com/ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version: 4.8.3 +Version: 4.8.4 Release: 0 # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libqt4-devel >= %{version} # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%{tar_version}.tar.gz +Source: qt-%{tar_version}.tar.bz2 # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf @@ -85,12 +85,17 @@ Patch136: handle-tga-files-properly.diff Patch137: qdbusconnection-no-warning-output.patch Patch138: undo-fix-jit-crash-on-x86_64.patch -Patch139: disable-ssl-compression-by-default.patch # PATCH-FIX-UPSTREAM fix_assistant_segfault_QTBUG-25324.patch [bnc#780763] [QTBUG#25324] Patch140: fix_assistant_segfault_QTBUG-25324.patch +# PATCH-FIX-OPENSUSE fix build on s390x failing to link in qnetworkconfigmanager.o +Patch141: qt4-fix-s390x-build.diff +Patch142: qdbusviewer.patch +Patch143: openssl-incompatibility-fix.diff +Patch144: cert-blacklist-tuerktrust.diff +Patch145: cert-blacklist-more.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 -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f %{_datadir}/qt4/mkspecs/qconfig.pri ; then \ @@ -175,8 +180,12 @@ %patch136 %patch137 %patch138 -p1 -%patch139 -p1 %patch140 -p1 +%patch141 -p0 +%patch142 +%patch143 +%patch144 -p1 +%patch145 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:49.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,13 +50,13 @@ # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version: 4.8.3 +Version: 4.8.4 Release: 0 # COMMON-VERSION-END Summary: C++ Program Library, Core Components -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: System/Libraries -Url: http://www.qtsoftware.com +Url: http://qt.digia.com # bug437293 %ifarch ppc64 Obsoletes: qt-64bit @@ -71,7 +71,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Source: qt-%{tar_version}.tar.gz +Source: qt-%{tar_version}.tar.bz2 # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf @@ -112,12 +112,17 @@ Patch136: handle-tga-files-properly.diff Patch137: qdbusconnection-no-warning-output.patch Patch138: undo-fix-jit-crash-on-x86_64.patch -Patch139: disable-ssl-compression-by-default.patch # PATCH-FIX-UPSTREAM fix_assistant_segfault_QTBUG-25324.patch [bnc#780763] [QTBUG#25324] Patch140: fix_assistant_segfault_QTBUG-25324.patch +# PATCH-FIX-OPENSUSE fix build on s390x failing to link in qnetworkconfigmanager.o +Patch141: qt4-fix-s390x-build.diff +Patch142: qdbusviewer.patch +Patch143: openssl-incompatibility-fix.diff +Patch144: cert-blacklist-tuerktrust.diff +Patch145: cert-blacklist-more.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 -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f %{_datadir}/qt4/mkspecs/qconfig.pri ; then \ @@ -133,7 +138,7 @@ %package devel Summary: Qt Development Kit -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/X11 Requires: %{name} = %{version} Requires: Mesa-devel @@ -175,7 +180,7 @@ %package -n libqt4-sql-sqlite Summary: Qt 4 sqlite plugin -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/C and C++ Requires: libqt4-sql = %{version} Provides: libqt4_sql_backend = %{version} @@ -188,7 +193,7 @@ %package x11 Summary: Qt 4 GUI related libraries -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -206,7 +211,7 @@ %package qt3support Summary: C++ Program Library, Core Components -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: System/Libraries # bug437293 %ifarch ppc64 @@ -227,7 +232,7 @@ %package sql Summary: Qt 4 SQL related libraries -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -277,7 +282,7 @@ %package private-headers-devel Summary: Non-ABI stabile experimental API -License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/C and C++ Requires: libqt4-devel = %{version} Requires: libqt4-x11 = %{version} @@ -398,8 +403,12 @@ %patch136 %patch137 %patch138 -p1 -%patch139 -p1 %patch140 -p1 +%patch141 -p0 +%patch142 +%patch143 +%patch144 -p1 +%patch145 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ cert-blacklist-more.diff ++++++ commit 180bf94c241728dd6d6f100437914d3cb11cbc30 Author: Martin Petersson <martin.peters...@nokia.com> Date: Wed Mar 7 12:05:59 2012 +0100 QtNetwork: blacklist two more certificates The comodogate 72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0 certificate is a test certificate and the MD5 Collisions was created as a proof of concept deliberately made to be expired at the time of it's creation. Task-number: QTBUG-24654 (cherry picked from commit 4c0df9feb2b44d0c4fcaa5076f00aa08fbc1dda5) Signed-off-by: Peter Hartmann <phartm...@rim.com> Apparently this commit was forgotten to cherry-pick to Qt 4. Change-Id: I86949eaa3c02483b0b66b4a620bfa88aaa9aa99b Reviewed-by: Richard J. Moore <r...@kde.org> diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 37799d1..300a261 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -825,6 +825,8 @@ static const char *certificate_blacklist[] = { "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust + "72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0", "UTN-USERFirst-Hardware", // comodogate test certificate + "41", "MD5 Collisions Inc. (http://www.phreedom.org/md5)", // http://www.phreedom.org/research/rogue-ca/ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate ++++++ cert-blacklist-tuerktrust.diff ++++++ commit 451462b1e0304e0cb6c2872e4f5688bc2e556dca Author: Peter Hartmann <phartm...@rim.com> Date: Fri Jan 4 11:06:14 2013 +0100 SSL certificates: blacklist mis-issued Turktrust certificates Those certificates have erroneously set the CA attribute to true, meaning everybody in possesion of their keys can issue certificates on their own. backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase Task-number: QTBUG-28937 Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 Reviewed-by: Richard J. Moore <r...@kde.org> diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 038187f..37799d1 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust + + "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate + "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate 0 }; ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:49.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:49.000000000 +0100 @@ -29,9 +29,9 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary: Qt documentation -Url: http://www.trolltech.com +Url: http://qt.digia.com/ Group: Documentation/HTML # COMMON-VERSION-BEGIN # COMMON-VERSION-END ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:50.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:50.000000000 +0100 @@ -28,9 +28,9 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary: Qt 4 SQL related libraries -Url: http://www.trolltech.com +Url: http://qt.digia.com/ Group: System/Libraries # COMMON-VERSION-BEGIN # COMMON-VERSION-END ++++++ openssl-incompatibility-fix.diff ++++++ commit 691e78e5061d4cbc0de212d23b06c5dffddf2098 Author: Shane Kearns <dbgsh...@gmail.com> Date: Thu Dec 6 17:03:18 2012 +0000 Fix binary incompatibility between openssl versions OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 So we have to consider this struct as private implementation, and use the access functions instead. This bug would cause certificate verification problems if a different version of openssl is loaded at runtime to the headers Qt was compiled against. Task-number: QTBUG-28343 Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 Reviewed-by: Richard J. Moore <r...@kde.org> (cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252) --- src/network/ssl/qsslsocket_openssl.cpp +++ src/network/ssl/qsslsocket_openssl.cpp @@ -236,7 +236,7 @@ static int q_X509Callback(int ok, X509_STORE_CTX *ctx) { if (!ok) { // Store the error and at which depth the error was detected. - _q_sslErrorList()->errors << qMakePair<int, int>(ctx->error, ctx->error_depth); + _q_sslErrorList()->errors << qMakePair<int, int>(q_X509_STORE_CTX_get_error(ctx), q_X509_STORE_CTX_get_error_depth(ctx)); } // Always return OK to allow verification to continue. We're handle the // errors gracefully after collecting all errors, after verification has --- src/network/ssl/qsslsocket_openssl_symbols.cpp +++ src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -267,6 +267,10 @@ DEFINEFUNC2(int, X509_STORE_add_cert, X509_STORE *a, a, X509 *b, b, return 0, re DEFINEFUNC(void, X509_STORE_CTX_free, X509_STORE_CTX *a, a, return, DUMMYARG) DEFINEFUNC4(int, X509_STORE_CTX_init, X509_STORE_CTX *a, a, X509_STORE *b, b, X509 *c, c, STACK_OF(X509) *d, d, return -1, return) DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return) +DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) +DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) +DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) +DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) #ifdef SSLEAY_MACROS DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) @@ -832,6 +836,10 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(X509_STORE_CTX_init) RESOLVEFUNC(X509_STORE_CTX_new) RESOLVEFUNC(X509_STORE_CTX_set_purpose) + RESOLVEFUNC(X509_STORE_CTX_get_error) + RESOLVEFUNC(X509_STORE_CTX_get_error_depth) + RESOLVEFUNC(X509_STORE_CTX_get_current_cert) + RESOLVEFUNC(X509_STORE_CTX_get_chain) RESOLVEFUNC(X509_cmp) #ifndef SSLEAY_MACROS RESOLVEFUNC(X509_dup) --- src/network/ssl/qsslsocket_openssl_symbols_p.h +++ src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -374,6 +374,10 @@ int q_X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509, STACK_OF(X509) *chain); X509_STORE_CTX *q_X509_STORE_CTX_new(); int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); +int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); +int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); +X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); +STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) ++++++ qdbusviewer.patch ++++++ >From 560242131f9b5795cb7a3347b1b5a6a973f54e4a Mon Sep 17 00:00:00 2001 From: Dirk Mueller <muel...@kde.org> Date: Fri, 4 Jan 2013 13:45:24 +0100 Subject: [PATCH] Try harder in matching the method signature In cases where the Propertiesdialog has no specific Implementation for a dbus data type, it creates a regular QLineEdit. In such cases, qdbusviewer then tried to call the method with the arg set to a string instead of the real datatype (for example uint64), which usually does not work. We can be more clever and try to implicitely convert the user input to the right datatype, which makes the invocation succeed. --- tools/qdbus/qdbusviewer/qdbusviewer.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- tools/qdbus/qdbusviewer/qdbusviewer.cpp +++ tools/qdbus/qdbusviewer/qdbusviewer.cpp @@ -259,7 +259,8 @@ void QDBusViewer::callMethod(const BusSignature &sig) const QList<QByteArray> paramTypes = method.parameterTypes(); const QList<QByteArray> paramNames = method.parameterNames(); - QList<int> types; // remember the low-level D-Bus type + QList<int> types; // remember the low-level D-Bus type + QList<QVariant::Type> qvtypes; // remember the QVariant Type for (int i = 0; i < paramTypes.count(); ++i) { const QByteArray paramType = paramTypes.at(i); if (paramType.endsWith('&')) @@ -268,6 +269,7 @@ void QDBusViewer::callMethod(const BusSignature &sig) QVariant::Type type = QVariant::nameToType(paramType); dialog.addProperty(QString::fromLatin1(paramNames.value(i)), type); types.append(QMetaType::type(paramType)); + qvtypes.append(type); } if (!types.isEmpty()) { @@ -279,9 +281,16 @@ void QDBusViewer::callMethod(const BusSignature &sig) args = dialog.values(); } - // Special case - convert a value to a QDBusVariant if the - // interface wants a variant + // Try to convert the values we got as good as possible to the + // dbus signature. this is especially important for those inputted as strings for (int i = 0; i < args.count(); ++i) { + QVariant a = args.at(i); + if (qvtypes.at(i) != a.type() + && a.canConvert(qvtypes.at(i))) { + args[i].convert(qvtypes.at(i)); + } + // Special case - convert a value to a QDBusVariant if the + // interface wants a variant if (types.at(i) == qMetaTypeId<QDBusVariant>()) args[i] = QVariant::fromValue(QDBusVariant(args.at(i))); } -- 1.8.0.2 ++++++ qt-everywhere-opensource-src-4.8.3.tar.gz -> qt-everywhere-opensource-src-4.8.4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libqt4/qt-everywhere-opensource-src-4.8.3.tar.gz /work/SRC/openSUSE:Factory/.libqt4.new/qt-everywhere-opensource-src-4.8.4.tar.bz2 differ: char 1, line 1 ++++++ qt-never-strip.diff ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:50.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:50.000000000 +0100 @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- configure 2012/10/26 06:55:02 1.1 ++++ configure 2012/10/26 06:55:54 @@ -65,7 +65,6 @@ # initialize global variables @@ -8,17 +8,17 @@ QMAKE_CONFIG= QTCONFIG_CONFIG= QT_CONFIG= -@@ -1607,7 +1606,7 @@ +@@ -1609,7 +1608,7 @@ QMakeVar add QMAKE_CFLAGS -pg QMakeVar add QMAKE_CXXFLAGS -pg QMakeVar add QMAKE_LFLAGS -pg - QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip" -+ QMakeVar add CONFIG nostrip ++ QMakeVar add CONFIG nostrip else UNKNOWN_OPT=yes fi -@@ -3338,6 +3337,8 @@ - DEVICE_VARS_FILE="$DEVICE_VARS_OUTFILE" +@@ -3330,6 +3329,8 @@ + fi fi +QMakeVar add CONFIG nostrip ++++++ qt4-fix-s390x-build.diff ++++++ --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -189,6 +189,18 @@ #define WTF_CPU_SPARC 1 #endif +/* CPU(S390X) - S390 64-bit */ +#if defined(__s390x__) +#define WTF_CPU_S390X 1 +#define WTF_CPU_BIG_ENDIAN 1 +#endif + +/* CPU(S390) - S390 32-bit */ +#if defined(__s390__) +#define WTF_CPU_S390 1 +#define WTF_CPU_BIG_ENDIAN 1 +#endif + /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ @@ -884,7 +896,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) +#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 --- src/corelib/arch/qatomic_s390.h +++ src/corelib/arch/qatomic_s390.h @@ -398,6 +398,15 @@ return fetchAndStoreAcquire(newValue); } +template <typename T> +Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) +{ +#ifndef __s390x__ + return (T*)__CS_OLD_LOOP(&_q_value, (int)valueToAdd, "ar", "", "bcr 15,0\n"); +#else + return (T*)__CSG_OLD_LOOP(&_q_value, (long)valueToAdd, "agr", "", "bcr 15,0\n"); +#endif +} template <typename T> Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd) ++++++ undo-fix-jit-crash-on-x86_64.patch ++++++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:50.000000000 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:50.000000000 +0100 @@ -133,8 +133,8 @@ randomLocation += (1 << 24); randomLocation <<= 21; -#endif - m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); - if (!m_base) + m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); + if (m_base == MAP_FAILED) CRASH(); @@ -398,7 +387,7 @@ public: // 16MB of allocations have been freed, sweep m_freeList @@ -244,7 +244,7 @@ -/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. - On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ -#if ENABLE(ASSEMBLER) --#if CPU(X86_64) +-#if CPU(X86_64) && !COMPILER(MINGW64) -#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 -#else -#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
