From f6e70c094512a4f79e1f8c3c99fd8d9e789aa2e7 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 12 Dec 2017 15:50:51 +0000 Subject: - Fix build with boost 1.66 PR: 224179 Reported by: jbeich@FreeBSD.org --- security/i2pd/files/patch-daemon_I2PControl.cpp | 11 +++++++++++ security/i2pd/files/patch-libi2pd_I2PEndian.h | 16 ++++++++++++++++ security/i2pd/files/patch-libi2pd_Reseed.cpp | 11 +++++++++++ 3 files changed, 38 insertions(+) create mode 100644 security/i2pd/files/patch-daemon_I2PControl.cpp create mode 100644 security/i2pd/files/patch-libi2pd_I2PEndian.h create mode 100644 security/i2pd/files/patch-libi2pd_Reseed.cpp (limited to 'security') diff --git a/security/i2pd/files/patch-daemon_I2PControl.cpp b/security/i2pd/files/patch-daemon_I2PControl.cpp new file mode 100644 index 000000000000..e45bc92bdfff --- /dev/null +++ b/security/i2pd/files/patch-daemon_I2PControl.cpp @@ -0,0 +1,11 @@ +--- daemon/I2PControl.cpp.orig 2017-12-04 18:40:32 UTC ++++ daemon/I2PControl.cpp +@@ -35,7 +35,7 @@ namespace client + I2PControlService::I2PControlService (const std::string& address, int port): + m_IsRunning (false), m_Thread (nullptr), + m_Acceptor (m_Service, boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address), port)), +- m_SSLContext (m_Service, boost::asio::ssl::context::sslv23), ++ m_SSLContext (boost::asio::ssl::context::sslv23), + m_ShutdownTimer (m_Service) + { + i2p::config::GetOption("i2pcontrol.password", m_Password); diff --git a/security/i2pd/files/patch-libi2pd_I2PEndian.h b/security/i2pd/files/patch-libi2pd_I2PEndian.h new file mode 100644 index 000000000000..218622fa0df7 --- /dev/null +++ b/security/i2pd/files/patch-libi2pd_I2PEndian.h @@ -0,0 +1,16 @@ +--- libi2pd/I2PEndian.h.orig 2017-12-04 18:40:32 UTC ++++ libi2pd/I2PEndian.h +@@ -3,10 +3,10 @@ + #include + #include + +-#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +-#include +-#elif __FreeBSD__ ++#if defined(__FreeBSD__) + #include ++#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) ++#include + #elif defined(__APPLE__) && defined(__MACH__) + + #include diff --git a/security/i2pd/files/patch-libi2pd_Reseed.cpp b/security/i2pd/files/patch-libi2pd_Reseed.cpp new file mode 100644 index 000000000000..da2ca8e2bbc2 --- /dev/null +++ b/security/i2pd/files/patch-libi2pd_Reseed.cpp @@ -0,0 +1,11 @@ +--- libi2pd/Reseed.cpp.orig 2017-12-04 18:40:32 UTC ++++ libi2pd/Reseed.cpp +@@ -522,7 +522,7 @@ namespace data + boost::asio::io_service service; + boost::system::error_code ecode; + +- boost::asio::ssl::context ctx(service, boost::asio::ssl::context::sslv23); ++ boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23); + ctx.set_verify_mode(boost::asio::ssl::context::verify_none); + boost::asio::ssl::stream s(service, ctx); + -- cgit v1.2.3