diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-11 04:18:19 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-11 04:18:19 +0000 |
| commit | 20bd58af07d70c6a780e1c67021485936c1dec4d (patch) | |
| tree | 4a277a2033fefc70df697aa57adecd7559805a21 /net-misc/omniORB | |
| parent | Missing #ifdef in patch, thanks to Michael Sterrett for noticing. (diff) | |
| download | gentoo-2-20bd58af07d70c6a780e1c67021485936c1dec4d.tar.gz gentoo-2-20bd58af07d70c6a780e1c67021485936c1dec4d.tar.bz2 gentoo-2-20bd58af07d70c6a780e1c67021485936c1dec4d.zip | |
Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/omniORB')
| -rw-r--r-- | net-misc/omniORB/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog index ba8725562c61..7628f85b4f03 100644 --- a/net-misc/omniORB/ChangeLog +++ b/net-misc/omniORB/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/omniORB # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.68 2010/07/11 03:26:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.69 2010/07/11 04:18:19 ssuominen Exp $ + + 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + files/omniORB-4.1.4-openssl-1.patch: + Missing #ifdef in patch, thanks to Michael Sterrett for noticing. 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> omniORB-4.1.4-r1.ebuild, +files/omniORB-4.1.4-openssl-1.patch: diff --git a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch index eaeb3da13ac5..968013a25781 100644 --- a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch +++ b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch @@ -2,23 +2,30 @@ http://bugs.gentoo.org/326791 --- include/omniORB4/sslContext.h +++ include/omniORB4/sslContext.h -@@ -111,7 +111,7 @@ +@@ -111,7 +111,11 @@ virtual ~sslContext(); protected: - virtual SSL_METHOD* set_method(); -+ virtual const SSL_METHOD* set_method(); ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ virtual const SSL_METHOD* set_method(); ++ #else ++ virtual SSL_METHOD* set_method(); ++ #endif // Default to return SSLv23_method(). virtual void set_supported_versions(); --- src/lib/omniORB/orbcore/ssl/sslContext.cc +++ src/lib/omniORB/orbcore/ssl/sslContext.cc -@@ -197,7 +197,7 @@ +@@ -197,7 +197,11 @@ } ///////////////////////////////////////////////////////////////////////// --SSL_METHOD* ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L +const SSL_METHOD* ++#else + SSL_METHOD* ++#endif sslContext::set_method() { return SSLv23_method(); } |