diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-13 08:03:58 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-13 08:03:58 +0000 |
| commit | 35daed127df5ac939433094f954f354575c495b8 (patch) | |
| tree | cd07708fdf51a88fac5f25abce4966b6e81ad82a /net-libs/libmsn | |
| parent | Version bump. (diff) | |
| download | gentoo-2-35daed127df5ac939433094f954f354575c495b8.tar.gz gentoo-2-35daed127df5ac939433094f954f354575c495b8.tar.bz2 gentoo-2-35daed127df5ac939433094f954f354575c495b8.zip | |
Fix building with OpenSSL >= 1.0.0 wrt #328031 by Alec M.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libmsn')
| -rw-r--r-- | net-libs/libmsn/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libmsn/files/libmsn-4.1-openssl-1.patch | 17 | ||||
| -rw-r--r-- | net-libs/libmsn/libmsn-4.1.ebuild | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/net-libs/libmsn/ChangeLog b/net-libs/libmsn/ChangeLog index f12db78f416a..755c586f6621 100644 --- a/net-libs/libmsn/ChangeLog +++ b/net-libs/libmsn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libmsn # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libmsn/ChangeLog,v 1.24 2010/06/27 08:55:29 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libmsn/ChangeLog,v 1.25 2010/07/13 08:03:58 ssuominen Exp $ + + 13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> libmsn-4.1.ebuild, + +files/libmsn-4.1-openssl-1.patch: + Fix building with OpenSSL >= 1.0.0 wrt #328031 by Alec M. 27 Jun 2010; Christian Faulhammer <fauli@gentoo.org> libmsn-4.1.ebuild: x86 stable, bug 322791 diff --git a/net-libs/libmsn/files/libmsn-4.1-openssl-1.patch b/net-libs/libmsn/files/libmsn-4.1-openssl-1.patch new file mode 100644 index 000000000000..cdaecf7dc54d --- /dev/null +++ b/net-libs/libmsn/files/libmsn-4.1-openssl-1.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/328031 + +--- msntest/msntest.cpp ++++ msntest/msntest.cpp +@@ -259,7 +259,11 @@ + if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected) + { + BIO *bio_socket_new; +- SSL_METHOD *meth=NULL; ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *meth=NULL; ++ #else ++ SSL_METHOD *meth=NULL; ++ #endif + meth=SSLv23_client_method(); + SSLeay_add_ssl_algorithms(); + mySocketsSsl[i].ctx = SSL_CTX_new(meth); diff --git a/net-libs/libmsn/libmsn-4.1.ebuild b/net-libs/libmsn/libmsn-4.1.ebuild index e04b728969b7..717e1a2ad5a0 100644 --- a/net-libs/libmsn/libmsn-4.1.ebuild +++ b/net-libs/libmsn/libmsn-4.1.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-libs/libmsn/libmsn-4.1.ebuild,v 1.5 2010/06/27 08:55:29 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libmsn/libmsn-4.1.ebuild,v 1.6 2010/07/13 08:03:58 ssuominen Exp $ EAPI=2 @@ -21,3 +21,5 @@ DEPEND=" RDEPEND="${DEPEND}" DOCS=(README THANKS TODO) + +PATCHES=( "${FILESDIR}/${P}-openssl-1.patch" ) |