Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Wed Aug 17 09:57:24 CEST 2011. -------- libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-08-12 11:55:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-08-15 06:29:39.000000000 +0200 @@ -2 +2 @@ -Fri Aug 12 09:54:52 UTC 2011 - adrian@suse.de +Mon Aug 15 04:28:53 UTC 2011 - crrodriguez@opensuse.org @@ -4,2 +4,7 @@ -- remove docdir before collecting files, %doc from 12.1 is not doing - this anymore on purpose +- Add fix for QTBUG-14985. + +------------------------------------------------------------------- +Fri Aug 12 15:29:24 CEST 2011 - dmueller@suse.de + +- do not generate documentation in libqt4, it is supposed + to be in libqt4-devel-doc calling whatdependson for head-i586 New: ---- qsslsocket-QTBUG-14985.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.U08NYf/_old 2011-08-17 09:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.U08NYf/_new 2011-08-17 09:56:16.000000000 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 6 +Release: 7 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.U08NYf/_old 2011-08-17 09:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.U08NYf/_new 2011-08-17 09:56:16.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 11 +Release: 13 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -97,6 +97,7 @@ Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff Patch125: tiff-samples-reader-crash.diff +Patch126: qsslsocket-QTBUG-14985.patch 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 @@ -152,6 +153,7 @@ %patch123 %patch124 %patch125 +%patch126 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -422,7 +424,7 @@ sed -i -e "s/qt_instdate=$TODAY/qt_instdate=$CHANGES/" configure echo yes | ./configure %common_options $platform \ - -plugin-sql-sqlite -nomake examples -nomake demos -webkit -xmlpatterns + -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs -webkit -xmlpatterns %check_config test -s translations/qt_de.qm || rm translations/qt_de.qm make %{?jobs:-j %jobs} @@ -468,8 +470,7 @@ %fdupes %{buildroot}/usr/include %fdupes %{buildroot}/usr/share/qt4 -fdupes %{buildroot}/usr/share/doc/packages/libqt4 -find %{buildroot}/usr/share/doc/packages/libqt4/src/images/* -type f |xargs chmod a-x +%fdupes %{buildroot}/usr/share/doc/packages/%base_name # # we do not package qvfb, and assistant in devel-doc # @@ -482,9 +483,6 @@ %suse_update_desktop_file -i designer4 Qt Development GUIDesigner %suse_update_desktop_file -i linguist4 Qt Development Translation -# rpm from SUSE 12.1 is not removing docdir on %doc usage anymore -rm -rf $RPM_BUILD_ROOT%_defaultdocdir - %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros ++++++ qsslsocket-QTBUG-14985.patch ++++++ --- src/network/ssl/qsslsocket_openssl.cpp.orig +++ src/network/ssl/qsslsocket_openssl.cpp @@ -278,7 +278,13 @@ init_context: // Enable all bug workarounds. q_SSL_CTX_set_options(ctx, SSL_OP_ALL); - +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + // Tell OpenSSL to release memory early + // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html + // FIXME also do runtime SSL version checking or make Qt require 1.0.0 + // http://www.openssl.org/docs/crypto/OPENSSL_VERSION_NUMBER.html + q_SSL_CTX_set_mode(ctx, SSL_MODE_RELEASE_BUFFERS); +#endif // Initialize ciphers QByteArray cipherString; int first = true; --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig +++ src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -389,6 +389,7 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsign bp,(char *)x,enc,kstr,klen,cb,u) #endif #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) +#define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org