Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Fix for Boost version 1.67
· ac25f90d
Andreas Tille
authored
Oct 26, 2018
ac25f90d
Upload to unstable
· 0456054b
Andreas Tille
authored
Oct 26, 2018
0456054b
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
0456054b
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 <tille@debian.org> Fri, 26 Oct 2018 07:44:25 +0200
[ Giovanni Mascellani ]
* Fix for Boost version 1.67.
Closes: #911886
-- Andreas Tille <tille@debian.org> 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 → 100644
View file @
0456054b
From: Giovanni Mascellani <gio@debian.org>
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
View file @
0456054b
...
...
@@ -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