mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
Stole a patch from gentoo to fix the compilation of libmsn against OpenSSL-1.0.0
svn path=/nixpkgs/trunk/; revision=22805
This commit is contained in:
parent
370f15acf3
commit
bfbdc2db7c
@ -6,5 +6,7 @@ stdenv.mkDerivation rec {
|
||||
url = "mirror://sourceforge/libmsn/${name}.tar.bz2";
|
||||
sha256 = "0p3c3gidnq4ai697dgg930hm7aap4176sbq7w7nn0mxg4rg5gwfx";
|
||||
};
|
||||
patches = [ ./libmsn-4.1-openssl-1.patch ];
|
||||
patchFlags = "-p0";
|
||||
buildInputs = [ cmake openssl ];
|
||||
}
|
||||
|
17
pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch
Normal file
17
pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch
Normal 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);
|
Loading…
Reference in New Issue
Block a user