From bfbdc2db7c93b6dedcafaee8f541e167a991eab6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 29 Jul 2010 09:41:29 +0000 Subject: [PATCH] Stole a patch from gentoo to fix the compilation of libmsn against OpenSSL-1.0.0 svn path=/nixpkgs/trunk/; revision=22805 --- pkgs/development/libraries/libmsn/default.nix | 2 ++ .../libraries/libmsn/libmsn-4.1-openssl-1.patch | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix index 77f8b5727781..3d7f20291b9a 100644 --- a/pkgs/development/libraries/libmsn/default.nix +++ b/pkgs/development/libraries/libmsn/default.nix @@ -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 ]; } diff --git a/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch b/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch new file mode 100644 index 000000000000..cdaecf7dc54d --- /dev/null +++ b/pkgs/development/libraries/libmsn/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);