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 | ef2d1f4fd1370bde393694a80653899723cb4966 (patch) | |
| tree | be40aab8b302d650f2eff9aaf21e22b68a35fdf8 | |
| parent | Version bump. (diff) | |
| download | historical-ef2d1f4fd1370bde393694a80653899723cb4966.tar.gz historical-ef2d1f4fd1370bde393694a80653899723cb4966.tar.bz2 historical-ef2d1f4fd1370bde393694a80653899723cb4966.zip | |
Fix building with OpenSSL >= 1.0.0 wrt #328031 by Alec M.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
| -rw-r--r-- | net-libs/libmsn/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libmsn/Manifest | 15 | ||||
| -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 |
4 files changed, 28 insertions, 14 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/Manifest b/net-libs/libmsn/Manifest index 26fca5e0f037..247ed98938e0 100644 --- a/net-libs/libmsn/Manifest +++ b/net-libs/libmsn/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX libmsn-4.1-openssl-1.patch 702 RMD160 4f94e30c9de01e9cc22b8cac1d2459d7a525d70a SHA1 9c4e03a146b094bf1f4986cbfb057a208840aa96 SHA256 667b7fe556a8b7ca18e163be496c297f52cb516c4ae5dd8353a0c40843809442 DIST libmsn-4.0-beta6.tar.bz2 275815 RMD160 5db7ba844678b4d0fa48205ac9aaa6d22885ac77 SHA1 fb970082dd71c8c365f480fb3f42d6c01509cd2c SHA256 d2b449bf70d56cc209198dbfc609d86aeef9b0fe6cbe34631867956220eade0a DIST libmsn-4.1.tar.bz2 289614 RMD160 bf3eaa30e3d0f715bdcf5cbf2030f80590972745 SHA1 94b3a9fcba491987a2fc79d30cd19a184c763526 SHA256 ddf1575e26af5760ede1072f6d4e2057a9532118e9bd7692898a60dbe21b6c5c EBUILD libmsn-4.0_beta6.ebuild 619 RMD160 3717aa0b7bed301094378ce6d7bf453df9cac4e4 SHA1 95b99c00b91816f9fa76459be8e4eb6bc1862813 SHA256 a8530e26a8aade6604d03704fc2cc564acdfe0d239dc630e075ac49edc636ac9 -EBUILD libmsn-4.1.ebuild 619 RMD160 841b7ad1b2c4d15abf05ea1cb37878f665ca1366 SHA1 b3526caad4907dbc9aa3f7f5c6487a8d8e3e9437 SHA256 81ae323bf7f4fbcf3f9571ec94529a270719c467f9c1ecbdf5d75a0d9dc99235 -MISC ChangeLog 3103 RMD160 6d26188212f1a80c0ae31461022e1ce1ebb8a487 SHA1 1eca6fb146c4a9860e147777b2b0a7c59cf1ebb7 SHA256 991bd27a9cf859b730d305f0252d19f41e05137e7ca3db95d6e8842e9a2a507a +EBUILD libmsn-4.1.ebuild 671 RMD160 f2d864092e28aee54867960e713481f16d4effd7 SHA1 e973444aab354854d87a55a6369ec4d1ac87d0d8 SHA256 79b23016bcb611f1d83d4ff34f055a9187d02c7d2f6ae97f457250748d2a066e +MISC ChangeLog 3278 RMD160 339bdb33599ecff522afd37673f79a4c4e5f9dce SHA1 e47058af858945d88bb35e0517314fcd0dd497e1 SHA256 a2e3c03eb6ac46f25f2912c1c12bd52b198d24706b9c83cd8be8b962a6210d65 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkwnEjoACgkQNQqtfCuFnePRLQCfcpf9JIbkP2Q1ZNZ1X9x8QB3m -GDkAn2gRScfuAAedT46WPMxQK6rMg4Cr -=gcb8 ------END PGP SIGNATURE----- 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" ) |