/[gentoo-x86]/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
Gentoo

Contents of /net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download) (as text)
Sun Jul 11 04:18:19 2010 UTC (9 years, 6 months ago) by ssuominen
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +11 -4 lines
File MIME type: text/x-diff
Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
(Portage version: 2.2_rc67/cvs/Linux x86_64)

1 http://bugs.gentoo.org/326791
2
3 --- include/omniORB4/sslContext.h
4 +++ include/omniORB4/sslContext.h
5 @@ -111,7 +111,11 @@
6 virtual ~sslContext();
7
8 protected:
9 - virtual SSL_METHOD* set_method();
10 + #if OPENSSL_VERSION_NUMBER >= 0x10000000L
11 + virtual const SSL_METHOD* set_method();
12 + #else
13 + virtual SSL_METHOD* set_method();
14 + #endif
15 // Default to return SSLv23_method().
16
17 virtual void set_supported_versions();
18 --- src/lib/omniORB/orbcore/ssl/sslContext.cc
19 +++ src/lib/omniORB/orbcore/ssl/sslContext.cc
20 @@ -197,7 +197,11 @@
21 }
22
23 /////////////////////////////////////////////////////////////////////////
24 +#if OPENSSL_VERSION_NUMBER >= 0x10000000L
25 +const SSL_METHOD*
26 +#else
27 SSL_METHOD*
28 +#endif
29 sslContext::set_method() {
30 return SSLv23_method();
31 }

  ViewVC Help
Powered by ViewVC 1.1.20