rpms/dclib/devel dclib-0.3.23-openssl.patch, NONE, 1.1 dclib.spec, 1.24, 1.25

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28076

Modified Files:
	dclib.spec 
Added Files:
	dclib-0.3.23-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
- rebuilt with new openssl


dclib-0.3.23-openssl.patch:
 cssl.cpp |   22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

--- NEW FILE dclib-0.3.23-openssl.patch ---
diff -up dclib-0.3.23/dclib/core/cssl.cpp.openssl dclib-0.3.23/dclib/core/cssl.cpp
--- dclib-0.3.23/dclib/core/cssl.cpp.openssl	2009-01-07 23:13:52.000000000 +0100
+++ dclib-0.3.23/dclib/core/cssl.cpp	2009-08-25 14:12:21.000000000 +0200
@@ -86,7 +86,11 @@ void CSSL::DeInitSSLLibrary()
 /** */
 SSL_CTX * CSSL::InitClientCTX()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
 	SSL_METHOD *method;
+#endif
 	SSL_CTX *ctx = NULL;
 
 	method = SSLv23_client_method();		/* Create new client-method instance */
@@ -109,7 +113,11 @@ SSL_CTX * CSSL::InitClientCTX()
 /** */
 SSL_CTX * CSSL::InitServerCTX()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
 	SSL_METHOD *method;
+#endif
 	SSL_CTX *ctx = NULL;
 
 	method = SSLv23_server_method();		/* Create new client-method instance */
@@ -130,9 +138,14 @@ SSL_CTX * CSSL::InitServerCTX()
 /** */
 SSL_CTX * CSSL::NewTLSv1ClientCTX()
 {
-	SSL_METHOD * method = TLSv1_client_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
+	SSL_METHOD *method;
+#endif
 	SSL_CTX * ctx = NULL;
 	
+	method = TLSv1_client_method();
 	if ( method != NULL )
 	{
 		ctx = SSL_CTX_new(method);
@@ -149,9 +162,14 @@ SSL_CTX * CSSL::NewTLSv1ClientCTX()
 /** */
 SSL_CTX * CSSL::NewTLSv1ServerCTX()
 {
-	SSL_METHOD * method = TLSv1_server_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
+	SSL_METHOD *method;
+#endif
 	SSL_CTX * ctx = NULL;
 	
+	method = TLSv1_server_method();
 	if ( method != NULL )
 	{
 		ctx = SSL_CTX_new(method);


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dclib.spec	21 Aug 2009 13:01:02 -0000	1.24
+++ dclib.spec	25 Aug 2009 12:14:08 -0000	1.25
@@ -7,6 +7,7 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
+Patch1:         dclib-0.3.23-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
 BuildRequires:  automake, autoconf
@@ -35,6 +36,7 @@ on dclib.
 
 %build
 %configure --disable-static
+%patch1 -p1 -b .openssl
 make %{?_smp_mflags}
 
 
@@ -70,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.23-3