diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-29 08:45:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-29 08:45:01 +0000 |
| commit | 9aa6224af326e4c42d3d5fd1c9cab33ab7550ed9 (patch) | |
| tree | 6d08653aeb9cbd19c1477101e34af533de11159e /net-p2p/dclib | |
| parent | Added ~hppa to KEYWORDS. (diff) | |
| download | gentoo-2-9aa6224af326e4c42d3d5fd1c9cab33ab7550ed9.tar.gz gentoo-2-9aa6224af326e4c42d3d5fd1c9cab33ab7550ed9.tar.bz2 gentoo-2-9aa6224af326e4c42d3d5fd1c9cab33ab7550ed9.zip | |
Fix building with OpenSSL >= 1.0.0 wrt #330291 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/dclib')
| -rw-r--r-- | net-p2p/dclib/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/dclib/dclib-0.3.23.ebuild | 5 | ||||
| -rw-r--r-- | net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch | 52 |
3 files changed, 60 insertions, 3 deletions
diff --git a/net-p2p/dclib/ChangeLog b/net-p2p/dclib/ChangeLog index 1716df795c1f..df33433e6452 100644 --- a/net-p2p/dclib/ChangeLog +++ b/net-p2p/dclib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/dclib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/ChangeLog,v 1.115 2010/03/23 10:38:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/ChangeLog,v 1.116 2010/07/29 08:45:01 ssuominen Exp $ + + 29 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> dclib-0.3.23.ebuild, + +files/dclib-0.3.23-openssl-1.patch: + Fix building with OpenSSL >= 1.0.0 wrt #330291 by Diego E. Pettenò. 23 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dclib-0.3.23.ebuild, +files/dclib-0.3.23-asneeded.patch: diff --git a/net-p2p/dclib/dclib-0.3.23.ebuild b/net-p2p/dclib/dclib-0.3.23.ebuild index bc2dbbbb93b9..4846fd7064f0 100644 --- a/net-p2p/dclib/dclib-0.3.23.ebuild +++ b/net-p2p/dclib/dclib-0.3.23.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-p2p/dclib/dclib-0.3.23.ebuild,v 1.8 2010/03/23 10:38:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/dclib-0.3.23.ebuild,v 1.9 2010/07/29 08:45:01 ssuominen Exp $ EAPI=2 inherit autotools eutils @@ -21,7 +21,8 @@ DEPEND="app-arch/bzip2 ssl? ( dev-libs/openssl )" src_prepare() { - epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-openssl-1.patch eautoreconf } diff --git a/net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch b/net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch new file mode 100644 index 000000000000..f8b4a4bc2af2 --- /dev/null +++ b/net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch @@ -0,0 +1,52 @@ +http://bugs.gentoo.org/330291 + +--- dclib/core/cssl.cpp ++++ dclib/core/cssl.cpp +@@ -86,7 +86,11 @@ + /** */ + SSL_CTX * CSSL::InitClientCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *method; ++ #else + SSL_METHOD *method; ++ #endif + SSL_CTX *ctx = NULL; + + method = SSLv23_client_method(); /* Create new client-method instance */ +@@ -109,7 +113,11 @@ + /** */ + SSL_CTX * CSSL::InitServerCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *method; ++ #else + SSL_METHOD *method; ++ #endif + SSL_CTX *ctx = NULL; + + method = SSLv23_server_method(); /* Create new client-method instance */ +@@ -130,7 +138,11 @@ + /** */ + SSL_CTX * CSSL::NewTLSv1ClientCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD * method = TLSv1_client_method(); ++ #else + SSL_METHOD * method = TLSv1_client_method(); ++ #endif + SSL_CTX * ctx = NULL; + + if ( method != NULL ) +@@ -149,7 +161,11 @@ + /** */ + SSL_CTX * CSSL::NewTLSv1ServerCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD * method = TLSv1_server_method(); ++ #else + SSL_METHOD * method = TLSv1_server_method(); ++ #endif + SSL_CTX * ctx = NULL; + + if ( method != NULL ) |