rpms/openscada/devel openscada-0.6.3.3-openssl.patch, NONE, 1.1 openscada.spec, 1.11, 1.12

[Tomáš Mráz]

Author: tmraz

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

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


openscada-0.6.3.3-openssl.patch:
 modssl.cpp |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE openscada-0.6.3.3-openssl.patch ---
diff -up openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp.openssl openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp
--- openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp.openssl	2009-06-10 12:03:54.000000000 +0200
+++ openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp	2009-08-25 20:35:04.000000000 +0200
@@ -314,7 +314,12 @@ void *TSocketIn::Task( void *sock_in )
     string ssl_method = TSYS::strSepParse(s.addr(),2,':');
 
     //-- Set SSL method --
-    SSL_METHOD *meth = SSLv23_server_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_METHOD *meth;
+#else
+    SSL_METHOD *meth;
+#endif
+    meth = SSLv23_server_method();
     if( ssl_method == "SSLv2" )		meth = SSLv2_server_method();
     else if( ssl_method == "SSLv3" )	meth = SSLv3_server_method();
     else if( ssl_method == "TLSv1" )	meth = TLSv1_server_method();
@@ -670,7 +675,12 @@ void TSocketOut::start()
     string ssl_method = TSYS::strSepParse(addr(),2,':');
 
     //> Set SSL method
-    SSL_METHOD *meth = SSLv23_client_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_METHOD *meth;
+#else
+    SSL_METHOD *meth;
+#endif
+    meth = SSLv23_client_method();
     if( ssl_method == "SSLv2" )		meth = SSLv2_client_method();
     else if( ssl_method == "SSLv3" )	meth = SSLv3_client_method();
     else if( ssl_method == "TLSv1" )	meth = TLSv1_client_method();


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openscada.spec	21 Aug 2009 15:05:36 -0000	1.11
+++ openscada.spec	25 Aug 2009 18:37:18 -0000	1.12
@@ -67,6 +67,7 @@ Release: 12%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
+Patch1: openscada-0.6.3.3-openssl.patch
 License: GPLv2
 Group: Applications/Engineering
 URL: http://oscada.org.ua
@@ -851,6 +852,7 @@ die Anschreibung "root" und das Kennwort
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
+%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -1209,7 +1211,7 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
 - rebuilt with new openssl
 
 * Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11