diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-vpn/freelan/files | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'net-vpn/freelan/files')
-rw-r--r-- | net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch | 25 | ||||
-rw-r--r-- | net-vpn/freelan/files/freelan-2.2-boost-1.70.patch | 50 | ||||
-rw-r--r--[-rwxr-xr-x] | net-vpn/freelan/files/openrc/freelan.initd | 2 |
3 files changed, 76 insertions, 1 deletions
diff --git a/net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch b/net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch new file mode 100644 index 000000000000..2410ad06f6c5 --- /dev/null +++ b/net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch @@ -0,0 +1,25 @@ +From a3e4150d6df690ea083a74f2e66894dc2af0cd9e Mon Sep 17 00:00:00 2001 +From: QuantumEntangledAndy <sheepchaan@gmail.com> +Date: Sat, 8 Jun 2019 10:10:10 +0700 +Subject: [PATCH] Fix for boost versions less than 1.66 + +--- + libs/fscp/include/fscp/server.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libs/fscp/include/fscp/server.hpp b/libs/fscp/include/fscp/server.hpp +index 2b18a595..1f4b30ee 100644 +--- a/libs/fscp/include/fscp/server.hpp ++++ b/libs/fscp/include/fscp/server.hpp +@@ -288,7 +288,11 @@ namespace fscp + */ + boost::asio::io_service& get_io_service() + { ++#if BOOST_ASIO_VERSION >= 101200 // Boost 1.66+ + return reinterpret_cast<boost::asio::io_context&>(get_socket().get_executor().context()); ++#else ++ return get_socket().get_io_service(); ++#endif + } + + /** diff --git a/net-vpn/freelan/files/freelan-2.2-boost-1.70.patch b/net-vpn/freelan/files/freelan-2.2-boost-1.70.patch new file mode 100644 index 000000000000..1fa2bb48d658 --- /dev/null +++ b/net-vpn/freelan/files/freelan-2.2-boost-1.70.patch @@ -0,0 +1,50 @@ +From d16490d00a47c8dcf008fa1b3219f54669716da3 Mon Sep 17 00:00:00 2001 +From: Sebastien Vincent <sebastien.vincent@cppextrem.com> +Date: Sun, 19 May 2019 17:57:07 +0200 +Subject: [PATCH] [build] Adds support for Boost >= 1.70. + +--- + libs/freelan/src/core.cpp | 2 +- + libs/fscp/include/fscp/server.hpp | 2 +- + libs/fscp/src/server.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libs/freelan/src/core.cpp b/libs/freelan/src/core.cpp +index 840a522a..969ae305 100644 +--- a/libs/freelan/src/core.cpp ++++ b/libs/freelan/src/core.cpp +@@ -777,7 +777,7 @@ namespace freelan + + boost::apply_visitor( + asiotap::endpoint_async_resolve_visitor( +- boost::make_shared<resolver_type>(boost::ref(m_io_service)), ++ boost::make_shared<resolver_type>(m_io_service), + to_protocol(m_configuration.fscp.hostname_resolution_protocol), + resolver_query::address_configured, + DEFAULT_SERVICE, +diff --git a/libs/fscp/include/fscp/server.hpp b/libs/fscp/include/fscp/server.hpp +index 3766b4a3..2b18a595 100644 +--- a/libs/fscp/include/fscp/server.hpp ++++ b/libs/fscp/include/fscp/server.hpp +@@ -288,7 +288,7 @@ namespace fscp + */ + boost::asio::io_service& get_io_service() + { +- return get_socket().get_io_service(); ++ return reinterpret_cast<boost::asio::io_context&>(get_socket().get_executor().context()); + } + + /** +diff --git a/libs/fscp/src/server.cpp b/libs/fscp/src/server.cpp +index cb717ec4..62b92dca 100644 +--- a/libs/fscp/src/server.cpp ++++ b/libs/fscp/src/server.cpp +@@ -1106,7 +1106,7 @@ namespace fscp + template <typename WaitHandler> + void server::ep_hello_context_type::async_wait_reply(boost::asio::io_service& io_service, uint32_t hello_unique_number, const boost::posix_time::time_duration& timeout, WaitHandler handler) + { +- const boost::shared_ptr<boost::asio::deadline_timer> timer = boost::make_shared<boost::asio::deadline_timer>(boost::ref(io_service), timeout); ++ const boost::shared_ptr<boost::asio::deadline_timer> timer = boost::make_shared<boost::asio::deadline_timer>(io_service, timeout); + + m_pending_requests[hello_unique_number] = pending_request_status(timer); + diff --git a/net-vpn/freelan/files/openrc/freelan.initd b/net-vpn/freelan/files/openrc/freelan.initd index bab116d3db06..e1e4232f4382 100755..100644 --- a/net-vpn/freelan/files/openrc/freelan.initd +++ b/net-vpn/freelan/files/openrc/freelan.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/freelan" |