diff options
Diffstat (limited to 'net-vpn/freelan')
| -rw-r--r-- | net-vpn/freelan/Manifest | 8 | ||||
| -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 | ||||
| -rw-r--r-- | net-vpn/freelan/freelan-2.1.ebuild | 56 | ||||
| -rw-r--r-- | net-vpn/freelan/freelan-2.2.ebuild | 7 |
6 files changed, 86 insertions, 62 deletions
diff --git a/net-vpn/freelan/Manifest b/net-vpn/freelan/Manifest index 109481a1c8fb..c9db62981504 100644 --- a/net-vpn/freelan/Manifest +++ b/net-vpn/freelan/Manifest @@ -1,6 +1,6 @@ -AUX openrc/freelan.initd 263 BLAKE2B d0a111fc41f2b5774e5073fca1e68df333c180f95b0335d4f18cf681b9cf238a55203b13bf3aee757497234c4e2feb1732bebe03095ec729e79526ef5f55147a SHA512 bf8ac87cbfdf83ab38e0a90f85d598abf25028682cd94b6b44de69d02daecf35d35403e2a3e63c10cb6a99f783f7a72bb58fd0e0cb00013c32fe2aba4b179f23 -DIST freelan-2.1.tar.gz 4340411 BLAKE2B 78365f8f4d6334313abd824a68a06470a34e6e62b17fae1f32e3d655c1210892ccbb17ba81b02930e1554d73adbaea171562365dcda091677513d15506f631fe SHA512 f01f0021ab54450be8cf81b3ee58a74ff02e421ccc0e6b7a3733bbd721dedb14a0bf8c6a9e01d20f000e4b232c89fc358834e696211e239c899e4926e6682e1a +AUX freelan-2.2-boost-1.70-asio.patch 805 BLAKE2B f5f920d7ece3b33b4b06e014db4fa776b4804698579618859c11ff65359a3ea5ba4395fde30ff4ac960d17d5d838c6b6c1f254e432a2ec799fdb417f4f3f5097 SHA512 19a23501b1fcb9e6fa655c5ec948f52a0e782e95cd66cbe39abf50a3a7ca5a2775db365bfe296a48cb34f322a4c53c9dca1a1a2ec3a581f2e0ac6115ec4fd238 +AUX freelan-2.2-boost-1.70.patch 2161 BLAKE2B 117652cf276c8a3f51142170e013595c0842dc0572935d4e04f10c5d725adb7921200bb891de55eb042cddb71a2cfddbd0d614081576910cb82d9eef0b399c41 SHA512 6ee657fbfe90f71b672a425103b972af2fa2692dd90b88e991bc8013a25dfa6fd8e2ed91bf106d219333ee56b92cc02eedc378b93b497c11008a152d05d0481a +AUX openrc/freelan.initd 260 BLAKE2B d4e8fe25be6935e392fd940ff4509568a9c4e2666ea47998a705f0b7f304e90e14c095856d320b868c544e1f22269898466d2ab5ac9ec6c6098b631ab37a7927 SHA512 72bdad57ae939226fcf75e6a99631634b190413f946eb5a165f870ffb1bdac33050f04fb4cde347c64c0ccd86c7e4800c5b6671ec86ad3fb88ee791f1c509fac DIST freelan-2.2.tar.gz 3071919 BLAKE2B d63cc4133e6c4a55a966d605150c30566b23c3ca69d8eb2df2cd7dd23e2b6325a3b809c4d3c1c6db649988643ab5dd294f11ef90b5b849ad3f9c4c6f4789083f SHA512 e44ffcec6d85f8d2e46ed29267e0b198589009b0bc131bc6fcaa35f21e47b5db13d6ebeb83d7fee7f5baa9c91bd709d37039fd4e66f8f1720521a82d9241dfc0 -EBUILD freelan-2.1.ebuild 1238 BLAKE2B ea8727853befdb3007d0b470bea019af58c2d5145a4457b5d6b5441320faad6f49321710640a2c183132be9c7cee8a3b84b640c35854fdefa7f77e6b2b4dfef5 SHA512 98ef62c55d750433f8bb1227fed883f8f84072fba1cecf013d9dd9bf60002815d4d78221a6d59b48134cdb872b4be5d3c8a5cbc266995a82380ce439b09b2fd8 -EBUILD freelan-2.2.ebuild 1238 BLAKE2B ea8727853befdb3007d0b470bea019af58c2d5145a4457b5d6b5441320faad6f49321710640a2c183132be9c7cee8a3b84b640c35854fdefa7f77e6b2b4dfef5 SHA512 98ef62c55d750433f8bb1227fed883f8f84072fba1cecf013d9dd9bf60002815d4d78221a6d59b48134cdb872b4be5d3c8a5cbc266995a82380ce439b09b2fd8 +EBUILD freelan-2.2.ebuild 1334 BLAKE2B 888fff55bbb2522dc14e1456febcb5b26353cccd5b92c737c915a799a13d8f28a6281fa9b49f443fecc30b103c4fe1a5deaf95f0749a09e639727ba4a282a741 SHA512 042ab04708af750e3e14da45bb00ca5c34cb68c2502285943f2c5c491f16cc1be4a3d67c7b9a2153cafd407d2eeabaf531025049865ad88db2e5e9dd91e1bc50 MISC metadata.xml 340 BLAKE2B 0357b1c5d1b93bc0eda1ef8fab979eff07eff843168adcf3c81ca210d129b8ff84167704c49c2d1940e4e9aea0ac50f11ec80da36a88e988cb66c8b7b109684b SHA512 864027adfa1b5b2947c04b737a862aabb9dee4f411d837489cad78bd0e46cd92d31a71ee1167dc938ec0dd23d8005dc1255df6d1b21820f05c3b420f1e280608 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" diff --git a/net-vpn/freelan/freelan-2.1.ebuild b/net-vpn/freelan/freelan-2.1.ebuild deleted file mode 100644 index d286ce106e25..000000000000 --- a/net-vpn/freelan/freelan-2.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit scons-utils toolchain-funcs - -DESCRIPTION="Peer-to-peer VPN software that abstracts a LAN over the Internet" -HOMEPAGE="http://www.freelan.org/" -SRC_URI="https://github.com/freelan-developers/freelan/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -DEPEND=" - <dev-libs/boost-1.70:=[threads] - dev-libs/openssl:0= - net-misc/curl:= - virtual/libiconv - net-libs/miniupnpc:= -" -RDEPEND="${DEPEND}" - -src_prepare() { - export FREELAN_NO_GIT=1 - export FREELAN_NO_GIT_VERSION=${PV} - - sed -e "s/CXXFLAGS='-O3'/CXXFLAGS=''/" \ - -e "s/CXXFLAGS=\['-Werror'\]/CXXFLAGS=[]/" \ - -e "s/CXXFLAGS=\['-pedantic'\]/CXXFLAGS=[]/" \ - -i SConstruct || die - default -} - -src_compile() { - tc-export CXX CC AR - export LINK="$(tc-getCXX)" - - local MYSCONS=( - "--mode=$(usex debug debug release)" - prefix="${EPREFIX:-/}" - bin_prefix="/usr" - apps - ) - escons "${MYSCONS[@]}" -} - -src_install() { - DESTDIR="${D}" escons --mode=release install prefix="${EPREFIX:-/}" bin_prefix="/usr" - dobin build/release/bin/freelan - dodoc CONTRIBUTING.md README.md - - newinitd "${FILESDIR}/openrc/freelan.initd" freelan -} diff --git a/net-vpn/freelan/freelan-2.2.ebuild b/net-vpn/freelan/freelan-2.2.ebuild index d286ce106e25..5230dbc4e9a8 100644 --- a/net-vpn/freelan/freelan-2.2.ebuild +++ b/net-vpn/freelan/freelan-2.2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64" IUSE="debug" DEPEND=" - <dev-libs/boost-1.70:=[threads] + dev-libs/boost:=[threads] dev-libs/openssl:0= net-misc/curl:= virtual/libiconv @@ -23,6 +23,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-2.2-boost-1.70.patch + "${FILESDIR}"/${PN}-2.2-boost-1.70-asio.patch +) + src_prepare() { export FREELAN_NO_GIT=1 export FREELAN_NO_GIT_VERSION=${PV} |