diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-09-10 08:06:49 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-09-11 06:58:57 +0000 |
| commit | 03557b99165fa1886727c50823c33b1f6471140f (patch) | |
| tree | f630708a64074b2bc431f9363b3d0ca7e53cd1be | |
| parent | 07b8f6d4a983ed53d6a2647ae1f70040ca782849 (diff) | |
| download | aports-03557b99165fa1886727c50823c33b1f6471140f.tar.bz2 aports-03557b99165fa1886727c50823c33b1f6471140f.tar.xz | |
community/anytun: rebuild against boost-1.71
| -rw-r--r-- | community/anytun/APKBUILD | 4 | ||||
| -rw-r--r-- | community/anytun/boost-1.70.patch | 25 |
2 files changed, 28 insertions, 1 deletions
diff --git a/community/anytun/APKBUILD b/community/anytun/APKBUILD index 0bb2d84145..57696a2360 100644 --- a/community/anytun/APKBUILD +++ b/community/anytun/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=anytun pkgver=0.3.7 -pkgrel=2 +pkgrel=3 pkgdesc="Secure anycast tunneling protocol implementation for flexible and fault-tolerant VPNs" options="!check" # No testsuite url="https://www.anytun.org/" @@ -14,6 +14,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" source="http://www.anytun.org/download/$pkgname-$pkgver.tar.gz fix-werror-compile-flags.patch fix-iostream.patch + boost-1.70.patch $pkgname.initd" builddir="$srcdir"/$pkgname-$pkgver/src @@ -37,4 +38,5 @@ package() { sha512sums="bf1cccfd39b5190d7190590346be867de75ac7256d16648887b3988bdc01dccc4e5084cdad57990b753a55c12417a3c34f66a8871da035d79846aecc188e4578 anytun-0.3.7.tar.gz 25c870750e2358afbf40d9fffb5d53aed84b8d763dd78fe698a124e362cd3d3eb6a850b59cb3bb50b0dbd51dd86944198d4a18b5c8a799561f53e76797e2c1e9 fix-werror-compile-flags.patch 8c2eece0357666867f8cd9c7ef9307bcf88b9172ac033c18bd33ba470b3c19ad722c7eeafcda3a9ae95539d86ab04285fe5d7fa9766630f689c58e2c3fb239c3 fix-iostream.patch +21a1faa02d2313b2f2f5a58f9873c9b64a4bc7d9dd3f60938651b38446e06a53840371fae935f84b7a13676b8381a942ab16c2feb3a9895654004c8a637a5db9 boost-1.70.patch a31455058e0ac60ed9457c79eea789ce19ba49abc200b59c0d8390eb0c3b6f09813177f9b679fb8ac69ac7b0be862e4604d19298ae4cd79925511fff3963e93d anytun.initd" diff --git a/community/anytun/boost-1.70.patch b/community/anytun/boost-1.70.patch new file mode 100644 index 0000000000..c31e6fa480 --- /dev/null +++ b/community/anytun/boost-1.70.patch @@ -0,0 +1,25 @@ +diff --git a/src/syncServer.cpp b/src/syncServer.cpp +index 1e6e352..5aeb197 100644 +--- a/syncServer.cpp ++++ b/syncServer.cpp +@@ -48,6 +48,11 @@ + #include "log.h" + #include "anytunError.h" + ++#if BOOST_VERSION >= 107000 ++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) ++#else ++#define GET_IO_SERVICE(s) ((s).get_io_service()) ++#endif + //using asio::ip::tcp; + + SyncServer::SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect) +@@ -125,7 +130,7 @@ void SyncServer::start_accept() + std::list<AcceptorsElement>::iterator it = acceptors_.begin(); + for(; it != acceptors_.end(); ++it) { + if(!it->started_) { +- SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(it->acceptor_->get_io_service()); ++ SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(GET_IO_SERVICE(*it->acceptor_)); + conns_.push_back(new_connection); + it->acceptor_->async_accept(new_connection->socket(), + boost::bind(&SyncServer::handle_accept, this, new_connection, boost::asio::placeholders::error, it)); |