From 56f209879968a42c9d02c342709a8f01ea04a365 Mon Sep 17 00:00:00 2001 From: tnut Date: Tue, 27 Apr 2010 20:19:23 +0200 Subject: maj libmsn#4.1-1 --- extra/libmsn/.footprint | 6 +++--- extra/libmsn/.md5sum | 3 ++- extra/libmsn/Pkgfile | 8 +++++--- extra/libmsn/openssl1.patch | 17 +++++++++++++++++ 4 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 extra/libmsn/openssl1.patch diff --git a/extra/libmsn/.footprint b/extra/libmsn/.footprint index 4a87c758b..01f366298 100644 --- a/extra/libmsn/.footprint +++ b/extra/libmsn/.footprint @@ -21,8 +21,8 @@ drwxr-xr-x root/root usr/include/msn/ -rw-r--r-- root/root usr/include/msn/switchboardserver.h -rw-r--r-- root/root usr/include/msn/util.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libmsn.so -> libmsn.so.0.1 -lrwxrwxrwx root/root usr/lib/libmsn.so.0.1 -> libmsn.so.0.1.0 --rwxr-xr-x root/root usr/lib/libmsn.so.0.1.0 +lrwxrwxrwx root/root usr/lib/libmsn.so -> libmsn.so.0.3 +lrwxrwxrwx root/root usr/lib/libmsn.so.0.3 -> libmsn.so.0.3.0 +-rwxr-xr-x root/root usr/lib/libmsn.so.0.3.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libmsn.pc diff --git a/extra/libmsn/.md5sum b/extra/libmsn/.md5sum index b05eeae2c..cef3dab3a 100644 --- a/extra/libmsn/.md5sum +++ b/extra/libmsn/.md5sum @@ -1 +1,2 @@ -160bd277a66bd837d0a26e4c03454be3 libmsn-4.0-beta7.tar.bz2 +769d3cf0e5625263fbc23321c1ddfcb0 libmsn-4.1.tar.bz2 +c8d7e2113d967a1d38a531e9fe8e7861 openssl1.patch diff --git a/extra/libmsn/Pkgfile b/extra/libmsn/Pkgfile index e5292760a..df39ae2f0 100644 --- a/extra/libmsn/Pkgfile +++ b/extra/libmsn/Pkgfile @@ -2,14 +2,16 @@ # URL:http://sourceforge.net/projects/libmsn # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: cmake +# Depends on: cmake, openssl name=libmsn -version=4.0-beta7 +version=4.1 release=1 -source=(http://freefr.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2) +source=(http://freefr.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2 \ + openssl1.patch) build() { + patch -Np0 -i $SRC/openssl1.patch cd $name-$version mkdir build cd build diff --git a/extra/libmsn/openssl1.patch b/extra/libmsn/openssl1.patch new file mode 100644 index 000000000..0ff7de898 --- /dev/null +++ b/extra/libmsn/openssl1.patch @@ -0,0 +1,17 @@ +--- libmsn-4.1/msntest/msntest.cpp~ 2010-04-01 15:05:13.248056050 +0200 ++++ libmsn-4.1/msntest/msntest.cpp 2010-04-01 15:07:18.938878993 +0200 +@@ -259,7 +259,13 @@ + 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); -- cgit v1.2.3-54-g00ecf