Control: tags 948281 + pending Dear maintainer,
I've prepared an NMU for anytun (versioned as 0.3.7-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer or cancel the NMU. Regards, Fabio Tobich diff -Nru anytun-0.3.7/debian/changelog anytun-0.3.7/debian/changelog --- anytun-0.3.7/debian/changelog 2018-11-17 19:21:25.000000000 -0200 +++ anytun-0.3.7/debian/changelog 2020-06-08 14:11:32.000000000 -0300 @@ -1,3 +1,11 @@ +anytun (0.3.7-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/20_fix-build-with-boost1.71.patch: added to fix FTBFS + against boost1.71. Thanks Giovanni Mascellani. (Closes: #948281) + + -- Fabio Augusto De Muzio Tobich <ftob...@gmail.com> Mon, 08 Jun 2020 14:11:32 -0300 + anytun (0.3.7-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru anytun-0.3.7/debian/patches/20_fix-build-with-boost1.71.patch anytun-0.3.7/debian/patches/20_fix-build-with-boost1.71.patch --- anytun-0.3.7/debian/patches/20_fix-build-with-boost1.71.patch 1969-12-31 21:00:00.000000000 -0300 +++ anytun-0.3.7/debian/patches/20_fix-build-with-boost1.71.patch 2020-06-08 14:11:32.000000000 -0300 @@ -0,0 +1,69 @@ +Description: Fix build with Boost 1.71. +Author: Giovanni Mascellani <g...@debian.org> +Bug-Debian: https://bugs.debian.org/948281 +Last-Update: 2020-01-06 +--- anytun-0.3.7.orig/src/syncServer.cpp ++++ anytun-0.3.7/src/syncServer.cpp +@@ -125,7 +125,11 @@ void SyncServer::start_accept() + std::list<AcceptorsElement>::iterator it = acceptors_.begin(); + for(; it != acceptors_.end(); ++it) { + if(!it->started_) { ++#if BOOST_VERSION >= 107000 ++ SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(it->acceptor_->get_executor()); ++#else + SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(it->acceptor_->get_io_service()); ++#endif + 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)); +--- anytun-0.3.7.orig/src/syncTcpConnection.cpp ++++ anytun-0.3.7/src/syncTcpConnection.cpp +@@ -66,10 +66,18 @@ void SyncTcpConnection::Send(std::string + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); + } ++ ++#if BOOST_VERSION >= 107000 ++SyncTcpConnection::SyncTcpConnection(const boost::asio::executor& executor) ++ : socket_(executor) ++{ ++} ++#else + SyncTcpConnection::SyncTcpConnection(boost::asio::io_service& io_service) + : socket_(io_service) + { + } ++#endif + + void SyncTcpConnection::handle_write(const boost::system::error_code& /*error*/, + size_t /*bytes_transferred*/) +--- anytun-0.3.7.orig/src/syncTcpConnection.h ++++ anytun-0.3.7/src/syncTcpConnection.h +@@ -60,9 +60,15 @@ public: + typedef boost::shared_ptr<SyncTcpConnection> pointer; + typedef boost::asio::ip::tcp proto; + ++#if BOOST_VERSION >= 107000 ++ static pointer create(const boost::asio::executor& executor) { ++ return pointer(new SyncTcpConnection(executor)); ++ }; ++#else + static pointer create(boost::asio::io_service& io_service) { + return pointer(new SyncTcpConnection(io_service)); + }; ++#endif + + boost::function<void(SyncTcpConnection*)> onConnect; + proto::socket& socket(); +@@ -70,7 +76,11 @@ public: + void start(); + void Send(std::string message); + private: ++#if BOOST_VERSION >= 107000 ++ SyncTcpConnection(const boost::asio::executor& executor); ++#else + SyncTcpConnection(boost::asio::io_service& io_service); ++#endif + + void handle_write(const boost::system::error_code & /*error*/, + size_t /*bytes_transferred*/); diff -Nru anytun-0.3.7/debian/patches/series anytun-0.3.7/debian/patches/series --- anytun-0.3.7/debian/patches/series 2018-07-23 10:12:55.000000000 -0300 +++ anytun-0.3.7/debian/patches/series 2020-06-08 14:11:24.000000000 -0300 @@ -1,2 +1,3 @@ 01-fix-typos 10_fix_boost167_compilation.patch +20_fix-build-with-boost1.71.patch
