diff options
Diffstat (limited to 'redhat/dependencies/tqca-tls')
| -rw-r--r-- | redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch | 26 | ||||
| -rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls.spec | 20 |
2 files changed, 34 insertions, 12 deletions
diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch new file mode 100644 index 000000000..edfb376e0 --- /dev/null +++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch @@ -0,0 +1,26 @@ +--- ./qca-tls.cpp.ossl098 2003-12-10 17:53:57.000000000 +0100 ++++ ./qca-tls.cpp 2005-11-13 22:21:50.000000000 +0100 +@@ -454,7 +454,11 @@ + if(!r) { + // try this other public function, for whatever reason + p = (void *)in; ++#ifdef OSSL_097 ++ r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len); ++#else + r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len); ++#endif + } + if(r) { + if(pub) { +@@ -798,7 +802,11 @@ + + bool createFromDER(const char *in, unsigned int len) + { ++#ifdef OSSL_097 ++ const unsigned char *p = (const unsigned char *)in; ++#else + unsigned char *p = (unsigned char *)in; ++#endif + X509 *t = d2i_X509(NULL, &p, len); + if(!t) + return false; diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 4f1cb6fa4..f95290a0e 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -1,3 +1,4 @@ +# Always build under "/usr" %define _prefix /usr Name: tqca-tls @@ -12,20 +13,18 @@ URL: http://delta.affinix.com/qca/ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: %{name}-%{version}.tar.gz # Fix build in mach for QT apps Patch0: qca-tls-1.0-mach.patch -# Missing ifdefs for openssl 0.9.8 -Patch1: qca-tls-1.0-ossl098.patch # Build with openssl 1.0.0 Patch2: qca-tls-1.0-ossl10.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +# Allows building with TQT3 from TDE Patch10: tqca-tls-qmake-tqt3.patch BuildRequires: tqt3-devel >= 3.4.0 -# To build with openssl 0.9.7, disable patch1 BuildRequires: openssl-devel >= 0.9.8 @@ -35,27 +34,24 @@ Cryptographic Architecture (TQCA). TQCA is a library providing an easy API for several cryptographic algorithms to TQt programs. This package only contains the TLS plugin. + %prep %setup -q -n dependencies/%{name} %patch0 -p0 -b .mach -#patch1 -p0 -b .ossl098 %patch2 -p1 -b .ossl10 %patch10 -p1 %build -./configure \ - --qtdir=/usr +./configure %__make %{?_smp_mflags} - %install %__rm -rf %{?buildroot} -%__mkdir -p %{?buildroot}%{_libdir}/tqt3/plugins/crypto %__make install INSTALL_ROOT=%{?buildroot} - %clean -%__rm -rf $RPM_BUILD_ROOT +%__rm -rf %{?buildroot} + %files %defattr(0644,root,root,0755) |