rpms/qca-tls/devel qca-tls-1.0-ossl10.patch, NONE, 1.1 qca-tls.spec, 1.24, 1.25

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/qca-tls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3586

Modified Files:
	qca-tls.spec 
Added Files:
	qca-tls-1.0-ossl10.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
- rebuilt with new openssl


qca-tls-1.0-ossl10.patch:
 qca-tls.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE qca-tls-1.0-ossl10.patch ---
diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp
--- qca-tls-1.0/qca-tls.cpp.ossl10	2009-08-26 10:08:36.000000000 +0200
+++ qca-tls-1.0/qca-tls.cpp	2009-08-26 10:11:57.000000000 +0200
@@ -953,7 +953,11 @@ public:
 	RSAKeyContext *key;
 
 	SSL *ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
 	SSL_METHOD *method;
+#endif
 	SSL_CTX *context;
 	BIO *rbio, *wbio;
 	CertContext cc;


Index: qca-tls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- qca-tls.spec	21 Aug 2009 15:37:52 -0000	1.24
+++ qca-tls.spec	26 Aug 2009 08:13:49 -0000	1.25
@@ -11,6 +11,8 @@ Source0:	http://delta.affinix.com/downlo
 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)
 
 BuildRequires:	qt3-devel
@@ -28,7 +30,7 @@ contains the TLS plugin.
 %setup -q
 %patch0 -p0 -b .mach
 %patch1 -p0 -b .ossl098
-
+%patch2 -p1 -b .ossl10
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt3.sh
@@ -56,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17