Hello community, here is the log from the commit of package libqca-qt5 for openSUSE:Factory checked in at 2019-05-03 22:36:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca-qt5 (Old) and /work/SRC/openSUSE:Factory/.libqca-qt5.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca-qt5" Fri May 3 22:36:21 2019 rev:9 rq:698222 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqca-qt5/libqca-qt5.changes 2017-12-29 18:47:56.763964599 +0100 +++ /work/SRC/openSUSE:Factory/.libqca-qt5.new.5148/libqca-qt5.changes 2019-05-03 22:36:24.446488357 +0200 @@ -1,0 +2,33 @@ +Fri Apr 26 12:49:36 UTC 2019 - Fabian Vogt <[email protected]> + +- Fix source URL + +------------------------------------------------------------------- +Fri Apr 26 07:43:43 UTC 2019 - Wolfgang Bauer <[email protected]> + +- Update to 2.2.1 + * support for openssl 1.1 + * support for AES GCM and AES CCM modes + * new base64 convenience functions + * new botan2 support + * new hkdf support + * various build improvements and (deprecation) cleanups +- Drop patches merged upstream: + * 0001-Revert-tlsunittest-disable-some-ciphers.patch + * 0002-Disable-missed-openssl-cipher-suites.patch + * 0003-Add-support-for-OpenSSL-1.1.0.patch + * ansi.diff +- Rename qca-2.1.3-fixDSA.patch to qca-2.2.1-fixDSA.patch and + rebase it +- Re-enable pkcs11, there is no openssl conflict anymore +- Don't hardcode the certstore path anymore, ca-certificates is + BuldRequired so this can be detected automatically + +------------------------------------------------------------------- +Thu Oct 25 09:30:30 UTC 2018 - Jason Sikes <[email protected]> + +- Fix segfault when creating DSA keys + * [qca-2.1.3-fixDSA.patch] + * bsc#1108634 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libqca-qt5/libqca2.changes 2017-12-29 18:47:56.819948520 +0100 +++ /work/SRC/openSUSE:Factory/.libqca-qt5.new.5148/libqca2.changes 2019-05-03 22:36:24.594488657 +0200 @@ -1,0 +2,31 @@ +Fri Apr 26 12:49:35 UTC 2019 - Fabian Vogt <[email protected]> + +- Fix source URL + +------------------------------------------------------------------- +Fri Apr 26 07:43:43 UTC 2019 - Wolfgang Bauer <[email protected]> + +- Update to 2.2.1 + * support for openssl 1.1 + * support for AES GCM and AES CCM modes + * new base64 convenience functions + * new botan2 support + * new hkdf support + * various build improvements and (deprecation) cleanups +- Drop patches merged upstream: + * 0001-Revert-tlsunittest-disable-some-ciphers.patch + * 0002-Disable-missed-openssl-cipher-suites.patch + * 0003-Add-support-for-OpenSSL-1.1.0.patch +- Rename qca-2.1.3-fixDSA.patch to qca-2.2.1-fixDSA.patch and + rebase it +- Re-enable pkcs11, there is no openssl conflict anymore +- Run spec-cleaner + +------------------------------------------------------------------- +Thu Oct 25 09:28:30 UTC 2018 - Jason Sikes <[email protected]> + +- Fix segfault when creating DSA keys + * [qca-2.1.3-fixDSA.patch] + * bsc#1108634 + +------------------------------------------------------------------- Old: ---- 0001-Revert-tlsunittest-disable-some-ciphers.patch 0002-Disable-missed-openssl-cipher-suites.patch 0003-Add-support-for-OpenSSL-1.1.0.patch ansi.diff qca-2.1.3.tar.xz New: ---- qca-2.2.1-fixDSA.patch qca-2.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca-qt5.spec ++++++ --- /var/tmp/diff_new_pack.8KIo8W/_old 2019-05-03 22:36:25.326490141 +0200 +++ /var/tmp/diff_new_pack.8KIo8W/_new 2019-05-03 22:36:25.326490141 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqca-qt5 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,36 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%if 0%{?suse_version} > 1320 -# Disable PKCS11 on TW, conflicts with older openssl -%bcond_with pkcs11 -%else %bcond_without pkcs11 -%endif %define _so 2 Name: libqca-qt5 -Version: 2.1.3 +Version: 2.2.1 Release: 0 Summary: Qt Cryptographic Architecture 2 -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: https://userbase.kde.org/QCA -Source: http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz +Source: https://download.kde.org/stable/qca/%{version}/qca-%{version}.tar.xz Source1: baselibs.conf Source99: libqca-qt5-rpmlintrc -# PATCH-FIX-UPSTREAM (Needed for 0002 to apply) -Patch1: 0001-Revert-tlsunittest-disable-some-ciphers.patch -# PATCH-FIX-UPSTREAM (Variant of 0001, but for master) -Patch2: 0002-Disable-missed-openssl-cipher-suites.patch -# PATCH-FIX-UPSTREAM -Patch3: 0003-Add-support-for-OpenSSL-1.1.0.patch -# PATCH-FIX-OPENSUSE (Needed for gcrypt on 42.x?) -Patch100: ansi.diff +# PATCH-FIX-OPENSUSE +Patch0: qca-2.2.1-fixDSA.patch BuildRequires: ca-certificates BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel @@ -99,10 +88,7 @@ %prep %setup -q -n qca-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch100 -p1 +%patch0 -p1 %build %cmake \ @@ -112,7 +98,6 @@ -DWITH_botan_PLUGIN=OFF \ -DQCA_BINARY_INSTALL_DIR:PATH="%{_bindir}" \ -DQCA_MAN_INSTALL_DIR:PATH="%{_mandir}" \ - -Dqca_CERTSTORE="/etc/ssl/ca-bundle.pem" \ -DQCA_SUFFIX=qt5 make %{?_smp_mflags} ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.8KIo8W/_old 2019-05-03 22:36:25.342490173 +0200 +++ /var/tmp/diff_new_pack.8KIo8W/_new 2019-05-03 22:36:25.342490173 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqca2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,29 +20,22 @@ %if 0%{?suse_version} > 1320 # Enable gcrypt plugin on TW %bcond_without gcrypt -# Disable PKCS11 on TW, conflicts with older openssl -%bcond_with pkcs11 %else %bcond_with gcrypt -%bcond_without pkcs11 %endif %bcond_without nss - +%bcond_without pkcs11 Name: libqca2 -Version: 2.1.3 +Version: 2.2.1 Release: 0 Summary: Qt Cryptographic Architecture 2 -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: https://userbase.kde.org/QCA -Source: http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz +URL: https://userbase.kde.org/QCA +Source: https://download.kde.org/stable/qca/%{version}/qca-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM (Needed for 0002 to apply) -Patch1: 0001-Revert-tlsunittest-disable-some-ciphers.patch -# PATCH-FIX-UPSTREAM (Variant of 0001, but for master) -Patch2: 0002-Disable-missed-openssl-cipher-suites.patch -# PATCH-FIX-UPSTREAM -Patch3: 0003-Add-support-for-OpenSSL-1.1.0.patch +# PATCH-FIX-OPENSUSE +Patch0: qca-2.2.1-fixDSA.patch BuildRequires: ca-certificates BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel @@ -56,7 +49,7 @@ Requires: gpg2 >= 2.0.0 %requires_eq libqt4 %if %{with botan} -BuildRequires: pkgconfig(botan-1.10) +BuildRequires: libbotan-devel %endif %if %{with gcrypt} BuildRequires: libgcrypt-devel >= 1.7 @@ -161,12 +154,9 @@ %prep %setup -q -n qca-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch0 -p1 %build -# TODO: When needed switch to Qt5 build %cmake \ -DQCA_PLUGINS_INSTALL_DIR=%{_libdir}/qt4/plugins/ \ -DQCA_FEATURE_INSTALL_DIR=%{_datadir}/qt4/mkspecs/features/ \ @@ -193,12 +183,11 @@ %cmake_install %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc README COPYING TODO +%license COPYING +%doc README TODO %{_bindir}/mozcerts %{_libdir}/libqca.so.* %dir %{_libdir}/qt4/plugins/crypto @@ -208,40 +197,34 @@ %{_libdir}/qt4/plugins/crypto/libqca-gnupg.so %files devel -%defattr(-,root,root) %{_bindir}/qcatool %{_includedir}/QtCrypto %{_datadir}/qt4/mkspecs/features/crypto.prf -%{_mandir}/man1/qcatool.1.* +%{_mandir}/man1/qcatool.1%{?ext_man} %{_libdir}/libqca.so %{_libdir}/pkgconfig/qca2.pc %{_libdir}/cmake/Qca/ %files plugin-cyrus-sasl -%defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-cyrus-sasl.so %if %{with gcrypt} %files plugin-gcrypt -%defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-gcrypt.so %endif %if %{with botan} %files plugin-botan -%defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-botan.so %endif %if %{with nss} %files plugin-nss -%defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-nss.so %endif %if %{with pkcs11} %files plugin-pkcs11 -%defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-pkcs11.so %endif ++++++ qca-2.2.1-fixDSA.patch ++++++ Index: qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp =================================================================== --- qca-2.2.1.orig/plugins/qca-ossl/qca-ossl.cpp +++ qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp @@ -1682,18 +1682,14 @@ public: static bool make_dlgroup(const QByteArray &seed, int bits, int counter, DLParams *params) { - int ret_counter; QScopedPointer<DSA, DsaDeleter> dsa(DSA_new()); if(!dsa) return false; if (DSA_generate_parameters_ex(dsa.data(), bits, (const unsigned char *)seed.data(), seed.size(), - &ret_counter, NULL, NULL) != 1) + NULL, NULL, NULL) != 1) return false; - if(ret_counter != counter) - return false; - const BIGNUM *bnp, *bnq, *bng; DSA_get0_pqg(dsa.data(), &bnp, &bnq, &bng); params->p = bn2bi(bnp); ++++++ qca-2.1.3.tar.xz -> qca-2.2.1.tar.xz ++++++ ++++ 3883 lines of diff (skipped)
