Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at 2014-04-25 16:09:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca2 (Old) and /work/SRC/openSUSE:Factory/.libqca2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca2" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2014-04-17 14:11:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2014-04-25 16:09:51.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Apr 19 04:59:22 UTC 2014 - [email protected] + +- qca-no-ssl-internals.patch + spec file: Never use + the ssl library internals directly, instead use the proper + API accessors. + +------------------------------------------------------------------- New: ---- qca-no-ssl-internals.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.zhJDaC/_old 2014-04-25 16:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.zhJDaC/_new 2014-04-25 16:09:52.000000000 +0200 @@ -60,6 +60,7 @@ Patch3: qca-2.0.3-gcc47.patch # PATCH-FIX-UPSTREAM detect_ssl2_available.diff -- fix build with no-ssl2 in openssl lib Patch4: detect_ssl2_available.diff +Patch5: qca-no-ssl-internals.patch Requires: gpg2 >= 2.0.0 %requires_eq libqt4 @@ -194,6 +195,7 @@ pushd qca-ossl-* %patch2 %patch4 -p1 +%patch5 -p3 popd cd ../../.. %setup -D -q -n qca-%{tar_version} @@ -203,7 +205,7 @@ %build # I confess this is ugly.. # but there are too many "pro" files to make a patch ( > 180) -find -type f -name "*.pro" -exec sed -i "1i QMAKE_CXXFLAGS +=$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -fvisibility-inlines-hidden" {} + +find -type f -name "*.pro" -exec sed -i "1i QMAKE_CXXFLAGS +=$RPM_OPT_FLAGS -DOPENSSL_NO_SSL_INTERN -DOPENSSL_LOAD_CONF -fvisibility-inlines-hidden" {} + pushd plugins rm -rf CMakeLists.txt qca-%{version} for i in *; do @@ -212,7 +214,7 @@ popd export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" -export EXTRA_FLAGS="$RPM_OPT_FLAGS -fvisibility-inlines-hidden -DOPENSSL_LOAD_CONF" +export EXTRA_FLAGS="$RPM_OPT_FLAGS -fvisibility-inlines-hidden -DOPENSSL_LOAD_CONF -DOPENSSL_NO_SSL_INTERN" export QMAKE_CXXFLAGS="$EXTRA_FLAGS" if [ %{_lib} = lib64 ]; then EXTRA_FLAGS="$EXTRA_FLAGS -DLIB_SUFFIX=64" ++++++ qca-no-ssl-internals.patch ++++++ --- qca-2.0.3.orig/plugins/qca-ossl-2.0.0-beta3/qca-ossl.cpp +++ qca-2.0.3/plugins/qca-ossl-2.0.0-beta3/qca-ossl.cpp @@ -5161,7 +5161,7 @@ public: QStringList cipherList; for(int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) { SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i); - cipherList += cipherIDtoString(version, thisCipher->id); + cipherList += cipherIDtoString(version, SSL_CIPHER_get_id(thisCipher)); } SSL_free(ssl); @@ -5538,13 +5538,13 @@ public: { SessionInfo sessInfo; - sessInfo.isCompressed = (0 != ssl->session->compress_meth); + sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(SSL_get_session(ssl))); - if (ssl->version == TLS1_VERSION) + if (SSL_version(ssl) == TLS1_VERSION) sessInfo.version = TLS::TLS_v1; - else if (ssl->version == SSL3_VERSION) + else if (SSL_version(ssl) == SSL3_VERSION) sessInfo.version = TLS::SSL_v3; - else if (ssl->version == SSL2_VERSION) + else if (SSL_version(ssl) == SSL2_VERSION) sessInfo.version = TLS::SSL_v2; else { qDebug("unexpected version response"); @@ -5552,7 +5552,7 @@ public: } sessInfo.cipherSuite = cipherIDtoString( sessInfo.version, - SSL_get_current_cipher(ssl)->id); + SSL_CIPHER_get_id(SSL_get_current_cipher(ssl))); sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
