From 319751dd78b0373777e987fe3ba3f66faab2ae0a Mon Sep 17 00:00:00 2001 From: Tomáš Mráz Date: Aug 22 2009 09:58:40 +0000 Subject: - rebuilt with new openssl --- diff --git a/bes-3.7.2-openssl.patch b/bes-3.7.2-openssl.patch new file mode 100644 index 0000000..848cc78 --- /dev/null +++ b/bes-3.7.2-openssl.patch @@ -0,0 +1,30 @@ +diff -up bes-3.7.2/ppt/SSLClient.cc.openssl bes-3.7.2/ppt/SSLClient.cc +--- bes-3.7.2/ppt/SSLClient.cc.openssl 2009-03-12 22:30:41.000000000 +0100 ++++ bes-3.7.2/ppt/SSLClient.cc 2009-08-22 11:56:21.000000000 +0200 +@@ -79,7 +79,11 @@ SSLClient::initConnection() + SSL_library_init() ; + BESDEBUG( "ppt", "OK" << endl ) + ++#if OPENSSL_VERSION_NUMBER < 0x10000000L + SSL_METHOD *method = NULL ; ++#else ++ const SSL_METHOD *method = NULL ; ++#endif + SSL_CTX *context = NULL ; + + BESDEBUG( "ppt", "Creating method and context ... " << endl ) +diff -up bes-3.7.2/ppt/SSLServer.cc.openssl bes-3.7.2/ppt/SSLServer.cc +--- bes-3.7.2/ppt/SSLServer.cc.openssl 2009-03-10 03:46:41.000000000 +0100 ++++ bes-3.7.2/ppt/SSLServer.cc 2009-08-22 11:54:08.000000000 +0200 +@@ -83,7 +83,11 @@ SSLServer::initConnection() + SSL_library_init() ; + BESDEBUG( "ppt", "OK" << endl ) + ++#if OPENSSL_VERSION_NUMBER < 0x10000000L + SSL_METHOD *method = NULL ; ++#else ++ const SSL_METHOD *method = NULL ; ++#endif + SSL_CTX *context = NULL ; + BESDEBUG( "ppt", "Creating method and context ... " << endl ) + method = SSLv3_server_method() ; diff --git a/bes.spec b/bes.spec index 4c42730..3e1f077 100644 --- a/bes.spec +++ b/bes.spec @@ -14,6 +14,7 @@ License: LGPLv2+ URL: http://www.opendap.org/download/BES.html Source0: http://www.opendap.org/pub/source/bes-%{version}.tar.gz Patch1: bes-3.6.2-includes.patch +Patch2: bes-3.7.2-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +65,7 @@ Documentation of OPeNDAP BES. %prep %setup -q %patch1 -p1 -b .includes +%patch2 -p1 -b .openssl chmod a-x dispatch/BESStreamResponseHandler* %build @@ -156,7 +158,7 @@ exit 0 %doc __distribution_docs/api-html/ %changelog -* Fri Aug 21 2009 Tomas Mraz - 3.7.2-3 +* Sat Aug 22 2009 Tomas Mraz - 3.7.2-3 - rebuilt with new openssl * Fri Jul 24 2009 Fedora Release Engineering - 3.7.2-2