ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Stole a patch from gentoo to fix the compilation of libmsn against OpenSSL-1.0.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=22805
This commit is contained in:
Sander van der Burg 2010-07-29 09:41:29 +00:00
parent 370f15acf3
commit bfbdc2db7c
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libmsn/default.nix
View File

@ -6,5 +6,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/libmsn/${name}.tar.bz2"; url = "mirror://sourceforge/libmsn/${name}.tar.bz2";
sha256 = "0p3c3gidnq4ai697dgg930hm7aap4176sbq7w7nn0mxg4rg5gwfx"; sha256 = "0p3c3gidnq4ai697dgg930hm7aap4176sbq7w7nn0mxg4rg5gwfx";
}; };
patches = [ ./libmsn-4.1-openssl-1.patch ];
patchFlags = "-p0";
buildInputs = [ cmake openssl ]; buildInputs = [ cmake openssl ];
} }

17
pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch Normal file
View File

@ -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);