New patch, should work

1 files changed, 5 insertions, 75 deletions

diff --git a/libtorrent-rasterbar/build/libtorrent-rasterbar_boost_asio.diff b/libtorrent-rasterbar/build/libtorrent-rasterbar_boost_asio.diff
index 7d17f601..3c2a786c 100644
--- a/libtorrent-rasterbar/build/libtorrent-rasterbar_boost_asio.diff
+++ b/libtorrent-rasterbar/build/libtorrent-rasterbar_boost_asio.diff
@@ -1,78 +1,8 @@
-Index: src/torrent.cpp
-===================================================================
---- src/torrent.cpp	(revision 6508)
-+++ src/torrent.cpp	(working copy)
-@@ -85,9 +85,11 @@
- #ifdef TORRENT_USE_OPENSSL
- #include "libtorrent/ssl_stream.hpp"
- #include <boost/asio/ssl/context.hpp>
+--- libtorrent-rasterbar-0.16.0/src/asio_ssl.cpp.orig	2012-03-27 04:02:55.000000000 +0200
++++ libtorrent-rasterbar-0.16.0/src/asio_ssl.cpp	2012-06-03 21:23:01.383877108 +0200
+@@ -1,3 +1,5 @@
+ // builds all boost.asio SSL source as a separate compilation unit
 +#if BOOST_VERSION > 104700
- #include <boost/asio/ssl/rfc2818_verification.hpp>
- #include <boost/asio/ssl/verify_context.hpp>
--#endif
-+#endif // BOOST_VERSION
-+#endif // TORRENT_USE_OPENSSL
- 
- #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
- #include "libtorrent/struct_debug.hpp"
-@@ -1287,6 +1289,7 @@
- 
- #ifdef TORRENT_USE_OPENSSL
- 
-+#if BOOST_VERSION > 104600
- 	bool torrent::verify_peer_cert(bool preverified, boost::asio::ssl::verify_context& ctx)
- 	{
- 		// if the cert wasn't signed by the correct CA, fail the verification
-@@ -1372,6 +1375,7 @@
- 
- 		return false;
- 	}
-+#endif // BOOST_VERSION
- 
- 	void torrent::init_ssl(std::string const& cert)
- 	{
-@@ -1388,6 +1392,7 @@
- 
- 		TORRENT_ASSERT(RAND_status() == 1);
- 
-+#if BOOST_VERSION > 104600
- 		// create the SSL context for this torrent. We need to
- 		// inject the root certificate, and no other, to
- 		// verify other peers against
-@@ -1469,9 +1474,12 @@
- #endif
- 		// if all went well, set the torrent ssl context to this one
- 		m_ssl_ctx = ctx;
--
- 		// tell the client we need a cert for this torrent
- 		alerts().post_alert(torrent_need_cert_alert(get_handle()));
-+#else
-+		set_error(asio::error::not_supported, "x.509 certificate");
-+		pause();
-+#endif
- 	}
- 
- #endif // TORRENT_OPENSSL
-Index: include/libtorrent/torrent.hpp
-===================================================================
---- include/libtorrent/torrent.hpp	(revision 6508)
-+++ include/libtorrent/torrent.hpp	(working copy)
-@@ -47,6 +47,7 @@
- #include <boost/enable_shared_from_this.hpp>
- #include <boost/scoped_ptr.hpp>
- #include <boost/intrusive_ptr.hpp>
-+#include <boost/version.hpp>
- 
- #ifdef _MSC_VER
- #pragma warning(pop)
-@@ -954,7 +955,10 @@
- #ifdef TORRENT_USE_OPENSSL
- 		boost::shared_ptr<asio::ssl::context> m_ssl_ctx;
- 
-+#if BOOST_VERSION > 104600
- 		bool verify_peer_cert(bool preverified, boost::asio::ssl::verify_context& ctx);
+ #include <boost/asio/ssl/impl/src.hpp>
 +#endif
-+
- 		void init_ssl(std::string const& cert);
- #endif