diff -Nru anytun-0.3.7/debian/changelog anytun-0.3.7/debian/changelog --- anytun-0.3.7/debian/changelog 2020-06-08 19:11:32.000000000 +0200 +++ anytun-0.3.7/debian/changelog 2020-12-14 18:02:37.000000000 +0100 @@ -1,3 +1,10 @@ +anytun (0.3.7-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * [0aff52e] Fix FTBFS against boost1.74. (Closes: #977219) + + -- Anton Gladky Mon, 14 Dec 2020 18:02:37 +0100 + anytun (0.3.7-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru anytun-0.3.7/debian/.gitlab-ci.yml anytun-0.3.7/debian/.gitlab-ci.yml --- anytun-0.3.7/debian/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ anytun-0.3.7/debian/.gitlab-ci.yml 2020-12-14 18:02:37.000000000 +0100 @@ -0,0 +1,9 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +reprotest: + allow_failure: true + +blhc: + allow_failure: true diff -Nru anytun-0.3.7/debian/patches/30_fix-build-with-boost1.74.patch anytun-0.3.7/debian/patches/30_fix-build-with-boost1.74.patch --- anytun-0.3.7/debian/patches/30_fix-build-with-boost1.74.patch 1970-01-01 01:00:00.000000000 +0100 +++ anytun-0.3.7/debian/patches/30_fix-build-with-boost1.74.patch 2020-12-14 18:01:37.000000000 +0100 @@ -0,0 +1,61 @@ +Description: Fix FTBFS against boost1.74 +Author: Anton Gladky +Bug-Debian: https://bugs.debian.org/977219 +Last-Update: 2020-12-14 + +Index: anytun-0.3.7/src/syncTcpConnection.cpp +=================================================================== +--- anytun-0.3.7.orig/src/syncTcpConnection.cpp ++++ anytun-0.3.7/src/syncTcpConnection.cpp +@@ -67,7 +67,12 @@ void SyncTcpConnection::Send(std::string + boost::asio::placeholders::bytes_transferred)); + } + +-#if BOOST_VERSION >= 107000 ++#if BOOST_VERSION >= 107300 ++SyncTcpConnection::SyncTcpConnection(const boost::asio::basic_socket_acceptor::executor_type& executor) ++ : socket_(executor) ++{ ++} ++#elif BOOST_VERSION >= 107000 + SyncTcpConnection::SyncTcpConnection(const boost::asio::executor& executor) + : socket_(executor) + { +Index: anytun-0.3.7/src/syncTcpConnection.h +=================================================================== +--- anytun-0.3.7.orig/src/syncTcpConnection.h ++++ anytun-0.3.7/src/syncTcpConnection.h +@@ -46,6 +46,9 @@ + #ifndef ANYTUN_syncTcpConnection_h_INCLUDED + #define ANYTUN_syncTcpConnection_h_INCLUDED + ++#define BOOST_ASIO_NO_TS_EXECUTORS ++ ++ + #include + #include + #include +@@ -60,7 +63,11 @@ public: + typedef boost::shared_ptr pointer; + typedef boost::asio::ip::tcp proto; + +-#if BOOST_VERSION >= 107000 ++#if BOOST_VERSION >= 107300 ++ static pointer create(const boost::asio::basic_socket_acceptor::executor_type& executor) { ++ return pointer(new SyncTcpConnection(executor)); ++ }; ++#elif BOOST_VERSION >= 107000 + static pointer create(const boost::asio::executor& executor) { + return pointer(new SyncTcpConnection(executor)); + }; +@@ -76,7 +83,9 @@ public: + void start(); + void Send(std::string message); + private: +-#if BOOST_VERSION >= 107000 ++#if BOOST_VERSION >= 107300 ++ SyncTcpConnection(const boost::asio::basic_socket_acceptor::executor_type& executor); ++#elif BOOST_VERSION >= 107000 + SyncTcpConnection(const boost::asio::executor& executor); + #else + SyncTcpConnection(boost::asio::io_service& io_service); diff -Nru anytun-0.3.7/debian/patches/series anytun-0.3.7/debian/patches/series --- anytun-0.3.7/debian/patches/series 2020-06-08 19:11:24.000000000 +0200 +++ anytun-0.3.7/debian/patches/series 2020-12-14 18:00:10.000000000 +0100 @@ -1,3 +1,4 @@ 01-fix-typos 10_fix_boost167_compilation.patch 20_fix-build-with-boost1.71.patch +30_fix-build-with-boost1.74.patch