Andreas Tille pushed to branch master at Debian Med / libzeep
Commits: ac25f90d by Andreas Tille at 2018-10-26T06:07:15Z Fix for Boost version 1.67 - - - - - 0456054b by Andreas Tille at 2018-10-26T06:11:35Z Upload to unstable - - - - - 3 changed files: - debian/changelog - + debian/patches/0007-Fix-for-Boost-version-1.67.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,15 @@ -libzeep (3.0.2-7) UNRELEASED; urgency=medium +libzeep (3.0.2-7) unstable; urgency=medium + [ Andreas Tille ] * Point Vcs fields to salsa.debian.org * Standards-Version: 4.2.1 * Drop useless get-orig-source target - -- Andreas Tille <[email protected]> Fri, 26 Oct 2018 07:44:25 +0200 + [ Giovanni Mascellani ] + * Fix for Boost version 1.67. + Closes: #911886 + + -- Andreas Tille <[email protected]> Fri, 26 Oct 2018 08:07:31 +0200 libzeep (3.0.2-6) unstable; urgency=medium ===================================== debian/patches/0007-Fix-for-Boost-version-1.67.patch ===================================== @@ -0,0 +1,42 @@ +From: Giovanni Mascellani <[email protected]> +Date: Fri, 12 Oct 2018 17:26:23 +0200 +Bug-Debian: https://bugs.debian.org/911886 +Subject: Fix for Boost version 1.67. + +In basic_socket, native_type and native were deprecated and removed +in favor of native_handle_type and native_handle. +--- + src/preforked-http-server.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/preforked-http-server.cpp b/src/preforked-http-server.cpp +index a80a65b..89fc89d 100644 +--- a/src/preforked-http-server.cpp ++++ b/src/preforked-http-server.cpp +@@ -181,7 +181,7 @@ void preforked_server_base::start() + + bool preforked_server_base::read_socket_from_parent(int fd_socket, boost::asio::ip::tcp::socket& socket) + { +- typedef boost::asio::ip::tcp::socket::native_type native_type; ++ typedef boost::asio::ip::tcp::socket::native_handle_type native_type; + + #if __APPLE__ + // macos is special... +@@ -245,7 +245,7 @@ bool preforked_server_base::read_socket_from_parent(int fd_socket, boost::asio:: + + void preforked_server_base::write_socket_to_worker(int fd_socket, boost::asio::ip::tcp::socket& socket) + { +- typedef boost::asio::ip::tcp::socket::native_type native_type; ++ typedef boost::asio::ip::tcp::socket::native_handle_type native_type; + + struct msghdr msg; + union { +@@ -268,7 +268,7 @@ void preforked_server_base::write_socket_to_worker(int fd_socket, boost::asio::i + *(reinterpret_cast<native_type*>(CMSG_DATA(cmptr))) = socket.native(); + */ + native_type *fdptr = reinterpret_cast<native_type*>(CMSG_DATA(cmptr)); +- *fdptr = socket.native(); ++ *fdptr = socket.native_handle(); + + msg.msg_name = nullptr; + msg.msg_namelen = 0; ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ linking-order.diff libzeep-3.0-g++6-boost1.60.patch spelling.patch boost-1.65-compat.patch +0007-Fix-for-Boost-version-1.67.patch View it on GitLab: https://salsa.debian.org/med-team/libzeep/compare/adeaf8b58629a50067f14d31a2dad401ba29e777...0456054b2e9d34d6c8d0ff047cf72a1182f337fb -- View it on GitLab: https://salsa.debian.org/med-team/libzeep/compare/adeaf8b58629a50067f14d31a2dad401ba29e777...0456054b2e9d34d6c8d0ff047cf72a1182f337fb You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
