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 | 7099c1b5b4103e950878fc5ca69fc3274b93e2bd (patch) | |
| tree | e405224424ad193a0836b52020020a932dc7e25e /net-misc/omniORB | |
| parent | Missing #ifdef in patch, thanks to Michael Sterrett for noticing. (diff) | |
| download | historical-7099c1b5b4103e950878fc5ca69fc3274b93e2bd.tar.gz historical-7099c1b5b4103e950878fc5ca69fc3274b93e2bd.tar.bz2 historical-7099c1b5b4103e950878fc5ca69fc3274b93e2bd.zip | |
Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch | 15 |
3 files changed, 18 insertions, 7 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/Manifest b/net-misc/omniORB/Manifest index 934fff23178f..0dbaf1a5ed28 100644 --- a/net-misc/omniORB/Manifest +++ b/net-misc/omniORB/Manifest @@ -1,8 +1,8 @@ AUX ldflags.patch 452 RMD160 b6ae2124dbb412a61e31cc82048065ccec058258 SHA1 b7b08ab39eb90ba52d517a3d8d6ec9ebd9dd5382 SHA256 d02d4ba72a5995b07a4189e28deaba25c3733e8639b682d5cee4b36180fc9bee AUX omniNames 677 RMD160 7c75795fa9b4808069060728a0404d6ed1138f78 SHA1 7e5f343aaac339cd84eccb70c17b06b86604d436 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed -AUX omniORB-4.1.4-openssl-1.patch 610 RMD160 9bfaccaabd88d565e11352ec04a1662cb20f34cb SHA1 8cc853bcf1dbba2dfb79736bfd54b855b70caee6 SHA256 5bee0f3eba77ee4d781c7b94b58775de9830b1765bf0a2e75c154003ea2edb95 +AUX omniORB-4.1.4-openssl-1.patch 770 RMD160 f4842ad2b8fc3ed597fee0386f6f783fb8a00ecf SHA1 59c3fc20f08e6aa9e5db1b034a90e9fa897c2676 SHA256 0a27f1476347939ba24fce9d0f2e02461644187a8b72ff727d96b3f9a817f623 DIST omniORB-4.1.4.tar.gz 3093814 RMD160 b84131230c59b1cef8f714ff1545e44f6779ade1 SHA1 7150d999bcef10c6c3cb24725386497c3f338aa1 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e EBUILD omniORB-4.1.4-r1.ebuild 2453 RMD160 b3f5b7faab891315c4c1e309bed394701f65e340 SHA1 73e91c14b5b83d24c1fd7b75337bed43f1de77a8 SHA256 297ea7b693f718955a690b20fdedb907a3f55af5ee00f6715ffe0d0bc1895bb7 EBUILD omniORB-4.1.4.ebuild 2235 RMD160 47f7def47d1471a3f1f9c518c31d09c208d583f5 SHA1 f7eac82b5109e9b211356deed86d6addfaab1fda SHA256 d9fe0d28039d6fccd8ba2036ed71c87e233a0da6a9798b28936a9a9fa8182cab -MISC ChangeLog 10659 RMD160 a26f17984f0731d3cadfba86f667c3a62ccecbc8 SHA1 70f54508cc8ad82a01daf40d971aac5a04efc83a SHA256 312cf56c4d1b7b6504a1eb177e0c9c2688ad2e5e00baea8c4e9107a3a01fe35e +MISC ChangeLog 10821 RMD160 59d44eadccfa6e49ac2cc64f489f573747a5178a SHA1 ad1d5db97a3d43573581cda7ebb6a0f26d281f22 SHA256 09970ea0137374963f6b39e5bd0e57274cace765d57922d45a0b5e9b56606ac8 MISC metadata.xml 225 RMD160 106c8f5ff0028efc2beb2d1d065d08e3de1941e3 SHA1 39b11879fb0385ec1afee3995b2d04ba5489f867 SHA256 f27264dffc823378b544553a8bde8fa711cdbd8f06750cc02a4714705e2c81a0 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(); } |