commit 01c22f01c2fce37f9aae8599e583e5b3a8817ebf
Author: Jan Rękorajski <[email protected]>
Date: Mon Oct 25 10:17:48 2021 +0200
- move qt5 support to separate package
- fix building with openssl 3.0.0
- rel 2
openssl3.patch | 22 +++++++++++++++
qca.spec | 85 +++++++---------------------------------------------------
2 files changed, 31 insertions(+), 76 deletions(-)
---
diff --git a/qca.spec b/qca.spec
index 08523f7..cc63750 100644
--- a/qca.spec
+++ b/qca.spec
@@ -2,17 +2,13 @@ Summary: Qt Cryptographic Architecture (QCA) Library
Summary(pl.UTF-8): Biblioteka Qt Cryptographic Architecture (QCA)
Name: qca
Version: 2.2.1
-Release: 1
+Release: 2
License: LGPL v2.1
Group: Libraries
Source0:
https://download.kde.org/stable/qca/%{version}/%{name}-%{version}.tar.xz
# Source0-md5: 5d809bf0ade891dc89dfd7639cbeaa9d
-Patch1: qt5.patch
+Patch0: openssl3.patch
URL: https://invent.kde.org/libraries/qca
-BuildRequires: Qt5Core-devel
-BuildRequires: Qt5Gui-devel
-BuildRequires: Qt5Network-devel
-BuildRequires: Qt5Test-devel
BuildRequires: QtCore-devel
BuildRequires: QtGui-devel
BuildRequires: QtNetwork-devel
@@ -21,9 +17,9 @@ BuildRequires: cmake >= 2.8.2
BuildRequires: libstdc++-devel
BuildRequires: nss-devel
BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pkcs11-helper-devel
BuildRequires: qt4-build >= 4.3.3-3
BuildRequires: qt4-qmake >= 4.3.3-3
-BuildRequires: qt5-build
BuildRequires: which
Provides: qt4-plugin-qca-ossl = %{version}
Obsoletes: qt4-plugin-qca-cyrus-sasl
@@ -51,40 +47,15 @@ Qt Cryptographic Architecture (QCA) Library - development
files.
Biblioteka Qt Cryptographic Architecture (QCA) - pliki dla
programistów.
-%package -n qca-qt5
-Summary: Qt Cryptographic Architecture (QCA) Library
-Summary(pl.UTF-8): Biblioteka Qt Cryptographic Architecture (QCA)
-Group: Libraries
-URL: http://download.kde.org/stable/qca/
-
-%description -n qca-qt5
-Qt Cryptographic Architecture (QCA) Library. qt5 version
-
-%description -n qca-qt5 -l pl.UTF-8
-Biblioteka Qt Cryptographic Architecture (QCA).
-
-%package -n qca-qt5-devel
-Summary: Qt Cryptographic Architecture (QCA) Library - development files
-Summary(pl.UTF-8): Biblioteka Qt Cryptographic Architecture (QCA) - pliki
dla programistów
-Group: Development/Libraries
-Requires: QtCore-devel
-Requires: qca-qt5 = %{version}-%{release}
-
-%description -n qca-qt5-devel
-Qt Cryptographic Architecture (QCA) Library - development files.
-
-%description -n qca-qt5-devel -l pl.UTF-8
-Biblioteka Qt Cryptographic Architecture (QCA) - pliki dla
-programistów.
-
%prep
%setup -q
-%patch1 -p1
+%patch0 -p1
%build
-install -d build4
-cd build4
+install -d build
+cd build
QC_CERTSTORE_PATH=/etc/certs/ca-certificates.crt; export QC_CERTSTORE_PATH
+export CXXFLAGS="%{rpmcxxflags} -fpermissive"
%cmake \
-DQCA_LIBRARY_INSTALL_DIR=%{_libdir} \
-DQCA_FEATURE_INSTALL_DIR=%{_datadir}/qt4/mkspecs/features/ \
@@ -93,20 +64,9 @@ QC_CERTSTORE_PATH=/etc/certs/ca-certificates.crt; export
QC_CERTSTORE_PATH
%{__make}
cd ..
-install -d build5
-cd build5
-%cmake \
- -DQCA_INSTALL_IN_QT_PREFIX=ON \
- -DQCA_MAN_INSTALL_DIR=%{_mandir} \
- ..
-%{__make}
-
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C build4 install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__make} -C build5 install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
@@ -115,9 +75,6 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post -n qca-qt5 -p /sbin/ldconfig
-%postun -n qca-qt5 -p /sbin/ldconfig
-
%files
%defattr(644,root,root,755)
%doc README
@@ -133,6 +90,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/qca/crypto/libqca-logger.so
%attr(755,root,root) %{_libdir}/qca/crypto/libqca-nss.so
%attr(755,root,root) %{_libdir}/qca/crypto/libqca-ossl.so
+%attr(755,root,root) %{_libdir}/qca/crypto/libqca-pkcs11.so
%attr(755,root,root) %{_libdir}/qca/crypto/libqca-softstore.so
%{_mandir}/man1/qcatool.1*
@@ -143,28 +101,3 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/qca2.pc
%{_datadir}/qt4/mkspecs/features/crypto.prf
%{_libdir}/cmake/Qca
-
-%files -n qca-qt5
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qt5/bin/mozcerts-qt5
-%attr(755,root,root) %{_libdir}/qt5/bin/qcatool-qt5
-#%{_prefix}/certs/rootcerts.pem
-%attr(755,root,root) %ghost %{_libdir}/libqca-qt5.so.2
-%attr(755,root,root) %{_libdir}/libqca-qt5.so.*.*
-%dir %{_libdir}/qt5/plugins/crypto
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-cyrus-sasl.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-gcrypt.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-gnupg.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-logger.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-nss.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-ossl.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/crypto/libqca-softstore.so
-%{_mandir}/man1/qcatool-qt5.1*
-
-%files -n qca-qt5-devel
-%defattr(644,root,root,755)
-%{_includedir}/qt5/Qca-qt5
-%{_libdir}/cmake/Qca-qt5
-%attr(755,root,root) %{_libdir}/libqca-qt5.so
-%{_pkgconfigdir}/qca2-qt5.pc
-%{_libdir}/qt5/mkspecs/features/crypto.prf
diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644
index 0000000..21c416d
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,22 @@
+--- qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp~ 2019-04-24 14:58:14.000000000
+0200
++++ qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp 2021-10-25 09:47:06.323914358
+0200
+@@ -2048,7 +2048,9 @@
+ {
+ case EME_PKCS1v15: pad = RSA_PKCS1_PADDING; break;
+ case EME_PKCS1_OAEP: pad = RSA_PKCS1_OAEP_PADDING; break;
++#ifdef RSA_SSLV23_PADDING
+ case EME_PKCS1v15_SSL: pad = RSA_SSLV23_PADDING; break;
++#endif
+ case EME_NO_PADDING: pad = RSA_NO_PADDING; break;
+ default: return SecureArray(); break;
+ }
+@@ -2076,7 +2078,9 @@
+ {
+ case EME_PKCS1v15: pad = RSA_PKCS1_PADDING; break;
+ case EME_PKCS1_OAEP: pad = RSA_PKCS1_OAEP_PADDING; break;
++#ifdef RSA_SSLV23_PADDING
+ case EME_PKCS1v15_SSL: pad = RSA_SSLV23_PADDING; break;
++#endif
+ case EME_NO_PADDING: pad = RSA_NO_PADDING; break;
+ default: return false; break;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qca.git/commitdiff/01c22f01c2fce37f9aae8599e583e5b3a8817ebf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
