diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:37:21 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:37:21 -0300 |
| commit | a1ae9076f18ec51553e17dfe867f95b6b4931362 (patch) | |
| tree | c0ca52078abd65c9f3d4c40cf871bbae7d17d5c2 /extra/libmsn | |
| parent | 7caeeae33fd491dbea5044168bbc50197963118c (diff) | |
| parent | 28b13b7e8e6e1e4fa1593f0dfb1c37569f2f90a8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asunder/PKGBUILD
community/gshare/PKGBUILD
community/kim4/PKGBUILD
community/listen/PKGBUILD
community/mercury/PKGBUILD
core/eglibc/nscd
Diffstat (limited to 'extra/libmsn')
| -rw-r--r-- | extra/libmsn/openssl1.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/extra/libmsn/openssl1.patch b/extra/libmsn/openssl1.patch deleted file mode 100644 index 0ff7de898..000000000 --- a/extra/libmsn/openssl1.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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); |