Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at 2015-12-13 09:37:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-25 16:09:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2015-12-13 09:37:02.000000000 +0100 @@ -1,0 +2,50 @@ +Sun Dec 6 08:42:54 UTC 2015 - [email protected] + +- update to version 2.1.1 (now part of KDE) +- use system root certificates + +------------------------------------------------------------------- +Mon Nov 23 12:20:15 UTC 2015 - [email protected] + +- updated to version 2.1.0 (plugins now included) + - Ported to Qt5 (Qt4 also supported) + - New building system. CMake instead of qmake + - Added CTR symetric cipher support to qca core + - Added no padding encryption algorithm to qca core + - qcatool2 renamed to qcatool + - fixed crash in qcatool when only options provided on command line without any commands + - Use plugins installation path as hard-coded runtime plugins search path + - Added new functiion pluginPaths + - Added functions to get runtime QCA version + - Fixed 'no watch file' warnings in FileWatch + - Added EME_PKCS1v15_SSL Encryption Algorithm + - New implementation of SafeTimer to prevent crashes + - Updated certificates for unittests + - RSA Keys are permutable, can encrypt with private and decrypt with public + - Add unloadProvider() function for symmetry with insertProvider() + - Overloaded "makeKey" to derive a password depending on a time factor + - Remove pointer to deinit() routine from QCoreApplication at deinitialization + - Fix a couple of crashes where all plugins might not be available + - Fix operating on keys with unrelated expired subkeys + - Fixed timers in Synchronizer class + - Dropped randomunittest + - Fixed many unittests + - qca-gnupg: internal refactoring + - qca-gnupg: try both gpg and gpg2 to find gnupg executable + - qca-gnupg: fixed some encodings problem + - qca-ossl: no DSA_* dl groups in FIPS specification + - qca-ossl: added missed signatures to CRLContext + - qca-ossl: fixed certs time zone + - qca-nss: fixed KeyLenght for Cipher + - qca-botan: fixed getting result size for ciphers +- removed deprecated patches: + - fix-qt-check.diff + - r928413.diff + - disable-insecure-ssl.diff + - qca-2.0.3-gcc47.patch + - detect_ssl2_available.diff + - qca-no-ssl-internals.patch +- enabled plugin-nss +- spec file cleanup + +------------------------------------------------------------------- Old: ---- detect_ssl2_available.diff disable-insecure-ssl.diff fix-qt-check.diff qca-2.0.3-gcc47.patch qca-2.0.3.tar.bz2 qca-cyrus-sasl-2.0.0-beta3.tar.bz2 qca-gnupg-2.0.0-beta3.tar.bz2 qca-no-ssl-internals.patch qca-ossl-2.0.0-beta3.tar.bz2 qca-pkcs11-2.0.0-beta2.tar.bz2 r928413.diff New: ---- qca-2.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.wKg3xR/_old 2015-12-13 09:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.wKg3xR/_new 2015-12-13 09:37:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqca2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,50 +17,39 @@ Name: libqca2 -BuildRequires: cmake +BuildRequires: ca-certificates +BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel BuildRequires: gpg2 -BuildRequires: kde4-filesystem BuildRequires: libdrm-devel BuildRequires: libgcrypt-devel BuildRequires: libjpeg-devel -BuildRequires: libqt4-devel -BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: pkgconfig(QtCore) >= 4.7 +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libssl) Summary: Qt Cryptographic Architecture 2 License: LGPL-2.1+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://delta.affinix.com/qca/ -Version: 2.0.3 +Url: https://projects.kde.org/projects/kdesupport/qca +Version: 2.1.1 Release: 0 -%define tar_version %{version} -%define my_subdirs qca-gnupg-* qca-ossl-* qca-pkcs11-* qca-cyrus-sasl-* %define with_botan 0 -%define with_nss 0 +%define with_nss 1 %define with_pkcs11 1 %if %with_botan -BuildRequires: libbotan-devel +BuildRequires: pkgconfig(botan-1.10) %endif %if %with_pkcs11 -BuildRequires: mozilla-nss-devel +BuildRequires: pkgconfig(nss) %endif %if %with_pkcs11 -BuildRequires: pkcs11-helper-devel +BuildRequires: pkgconfig(libpkcs11-helper-1) %endif -Source: http://delta.affinix.com/download/qca/2.0/qca-%{tar_version}.tar.bz2 -Source1: http://delta.affinix.com/download/qca/2.0/plugins/qca-cyrus-sasl-2.0.0-beta3.tar.bz2 -Source2: http://delta.affinix.com/download/qca/2.0/plugins/qca-gnupg-2.0.0-beta3.tar.bz2 -Source3: http://delta.affinix.com/download/qca/2.0/plugins/qca-ossl-2.0.0-beta3.tar.bz2 -Source4: http://delta.affinix.com/download/qca/2.0/plugins/qca-pkcs11-2.0.0-beta2.tar.bz2 +Source: http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz Source5: baselibs.conf -Patch0: fix-qt-check.diff -Patch1: r928413.diff -Patch2: disable-insecure-ssl.diff -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 @@ -73,12 +62,6 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. - - -Authors: --------- - Justin Karneges <[email protected]> - %package devel Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ @@ -90,12 +73,6 @@ including a library and a plugin for using all supported capabilities of openssl, like SSL/TLS, X509, RSA, SHA1, MD5, Blowfish, 3DES and AES. - - -Authors: --------- - Justin Karneges <[email protected]> - %package plugin-cyrus-sasl Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ @@ -110,14 +87,7 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. - - -Authors: --------- - Justin Karneges <[email protected]> - %if %with_botan - %package plugin-botan Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ @@ -132,16 +102,9 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. - - - -Authors: --------- - Justin Karneges <[email protected]> - %endif -%if %with_nss +%if %with_nss %package plugin-nss Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ @@ -155,16 +118,9 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. - - - -Authors: --------- - Justin Karneges <[email protected]> - %endif -%if %with_pkcs11 +%if %with_pkcs11 %package plugin-pkcs11 Summary: Qt Cryptographic Architecture 2 - pkcs11 support Group: Development/Libraries/C and C++ @@ -178,76 +134,23 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. - - - -Authors: --------- - Justin Karneges <[email protected]> - %endif %prep -%setup -q -c -n qca-%{tar_version}/plugins -a 1 -a 2 -a 3 -a 4 -pushd qca-gnupg-* -%patch0 -popd -pushd qca-ossl-* -%patch2 -%patch4 -p1 -%patch5 -p3 -popd -cd ../../.. -%setup -D -q -n qca-%{tar_version} -%patch1 -%patch3 +%setup -q -n qca-%{version} %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_NO_SSL_INTERN -DOPENSSL_LOAD_CONF -fvisibility-inlines-hidden" {} + -pushd plugins -rm -rf CMakeLists.txt qca-%{version} -for i in *; do - echo "add_subdirectory($i)" >> CMakeLists.txt -done -popd -export CXXFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="$RPM_OPT_FLAGS" -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" -fi -#cmake . -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" -DCMAKE_INSTALL_PREFIX=/usr $EXTRA_FLAGS -./configure --prefix=%{_prefix} --libdir=%{_libdir} --debug --no-separate-debug-info -make %{?jobs:-j %jobs} -export LD_LIBRARY_PATH=$PWD/lib -cd plugins -for sub in %{my_subdirs}; do -pushd $sub - ./configure --debug --no-separate-debug-info --with-qca=$PWD/../.. --verbose - make %{?jobs:-j %jobs} -popd -done +cmake . +make %{?_smp_mflags} %install -make INSTALL_ROOT=$RPM_BUILD_ROOT install -rm apidocs/html/installdox -cd plugins -for sub in %{my_subdirs}; do -pushd $sub - make INSTALL_ROOT=$RPM_BUILD_ROOT install -popd -done -mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig +make DESTDIR="%{buildroot}" install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros %if %suse_version < 1110 sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf @@ -256,44 +159,43 @@ %files %defattr(-,root,root) %doc README COPYING TODO +%{_bindir}/mozcerts %{_libdir}/libqca.so.* %dir %{_libdir}/qt4/plugins/crypto -#%{_libdir}/qt4/plugins/crypto/libqca-logger.so -#%{_libdir}/qt4/plugins/crypto/libqca-softstore.so +%{_libdir}/qt4/plugins/crypto/libqca-logger.so +%{_libdir}/qt4/plugins/crypto/libqca-softstore.so %{_libdir}/qt4/plugins/crypto/libqca-ossl.so %{_libdir}/qt4/plugins/crypto/libqca-gnupg.so -#%{_libdir}/qt4/plugins/crypto/libqca-gcrypt.so -%dir %{_datadir}/qca -%{_datadir}/qca/certs/ %files devel %defattr(-,root,root) -%doc apidocs/html -%{_bindir}/qcatool2 +%{_bindir}/qcatool %{_includedir}/QtCrypto %{_datadir}/qt4/mkspecs/features/crypto.prf -%{_mandir}/man1/qcatool2* +%dir %{_datadir}/qt4/man/ +%dir %{_datadir}/qt4/man/man1/ +%{_datadir}/qt4/man/man1/qcatool.1 %{_libdir}/libqca.so -%{_libdir}/libqca.prl %{_libdir}/pkgconfig/qca2.pc +%{_libdir}/cmake/Qca/ %files plugin-cyrus-sasl %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-cyrus-sasl.so -%if %with_botan +%if %with_botan %files plugin-botan %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-botan.so %endif -%if %with_nss +%if %with_nss %files plugin-nss %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-nss.so %endif -%if %with_pkcs11 +%if %with_pkcs11 %files plugin-pkcs11 %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-pkcs11.so ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.wKg3xR/_old 2015-12-13 09:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.wKg3xR/_new 2015-12-13 09:37:03.000000000 +0100 @@ -4,9 +4,9 @@ requires "libqca2 = <version>" supplements "packageand(libqca2-plugin-cyrus-sasl:libqca2-<targettype>)" -libqca2-plugin-botan - requires "libqca2 = <version>" - supplements "packageand(libqca2-plugin-botan:libqca2-<targettype>)" +#libqca2-plugin-botan +# requires "libqca2 = <version>" +# supplements "packageand(libqca2-plugin-botan:libqca2-<targettype>)" libqca2-plugin-pkcs11 requires "libqca2 = <version>"
