Fix building with OpenSSL >= 1.0.0 wrt #326791 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 1ad3117773d26fcdae10e8a77cefb3a18bc2738a..ba8725562c61ff5bdb6234c2ee07a7e228375d2a 100644 (file)
--- 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.67 2010/06/26 13:00:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.68 2010/07/11 03:26:29 ssuominen Exp $
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  omniORB-4.1.4-r1.ebuild, +files/omniORB-4.1.4-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326791 by Diego E. Pettenò.
 
   26 Jun 2010; <nixnut@gentoo.org> omniORB-4.1.4-r1.ebuild:
   ppc stable #322295

diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 421e84cb6b84d49d4c256bbe9e3e2fa778d1a328..934fff23178f519cf5a7ca2b3b7be1f56be1c5ad 100644 (file)
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,7 +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
 DIST omniORB-4.1.4.tar.gz 3093814 RMD160 b84131230c59b1cef8f714ff1545e44f6779ade1 SHA1 7150d999bcef10c6c3cb24725386497c3f338aa1 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e
-EBUILD omniORB-4.1.4-r1.ebuild 2411 RMD160 41ccea5ab0b7cbeb63bf6c5e5cc101b8785d8585 SHA1 1a6a9bcc5163c9f64c516f102d6d6f5cc9d38325 SHA256 e4b8bbe8a37ede017813c4a537e4e2b323b4f8cda4a4fc3ed411a3171059d00d
+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 10465 RMD160 e31e3a2723363b82cc67f6d612cea1f97dd947a1 SHA1 6a905e9ead706a58ed90def555767addd34996e1 SHA256 a24bdd81c3ede7180d6659f43e9994f3f16bd655c2a899083fb8b6f6e40e603a
+MISC ChangeLog 10659 RMD160 a26f17984f0731d3cadfba86f667c3a62ccecbc8 SHA1 70f54508cc8ad82a01daf40d971aac5a04efc83a SHA256 312cf56c4d1b7b6504a1eb177e0c9c2688ad2e5e00baea8c4e9107a3a01fe35e
 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
new file mode 100644 (file)
index 0000000..eaeb3da
--- /dev/null
+++ b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/326791
+
+--- include/omniORB4/sslContext.h
++++ include/omniORB4/sslContext.h
+@@ -111,7 +111,7 @@
+   virtual ~sslContext();
+ 
+  protected:
+-  virtual SSL_METHOD* set_method(); 
++  virtual const SSL_METHOD* set_method(); 
+   // 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 @@
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////
+-SSL_METHOD*
++const SSL_METHOD*
+ sslContext::set_method() {
+   return SSLv23_method();
+ }

diff --git a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
index 593415bad278c339e2245e10ffb84110cbeca069..c56c42065c2bc2e3e054466bf22cd4ef2558a6a3 100644 (file)
--- a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v 1.4 2010/06/26 13:00:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v 1.5 2010/07/11 03:26:29 ssuominen Exp $
 
 EAPI="3"
 
@@ -27,7 +27,8 @@ pkg_setup() {
 
 src_prepare() {
        # respect ldflags, bug #284191
-       epatch "${FILESDIR}/ldflags.patch"
+       epatch "${FILESDIR}"/ldflags.patch \
+               "${FILESDIR}"/${P}-openssl-1.patch
 
        sed -i -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
                -e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \