[arch-commits] Commit in kea/trunk (PKGBUILD asiolink-fix-build-with-boost-1.66.patch)

[Bartłomiej Piotrowski]

    Date: Saturday, December 30, 2017 @ 14:36:56
  Author: bpiotrowski
Revision: 277170

1.3.0-2: rebuild against boost 1.66

Added:
  kea/trunk/asiolink-fix-build-with-boost-1.66.patch
Modified:
  kea/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |    6 +
 asiolink-fix-build-with-boost-1.66.patch |   99 +++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-30 14:35:24 UTC (rev 277169)
+++ PKGBUILD	2017-12-30 14:36:56 UTC (rev 277170)
@@ -3,7 +3,7 @@
 pkgbase='kea'
 pkgname=('kea' 'kea-devel-docs')
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting both DHCPv4 and DHCPv6'
 arch=('x86_64')
 url='http://kea.isc.org'
@@ -20,6 +20,7 @@
 
 source=(https://ftp.isc.org/isc/kea/${pkgver}/kea-${pkgver}.tar.gz{,.asc}
         fix-scripts-include-path.patch
+        asiolink-fix-build-with-boost-1.66.patch
         LICENSE
         tmpfiles-kea.conf
         kea-dhcp4.service
@@ -27,6 +28,7 @@
 sha512sums=('4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b'
             'SKIP'
             '81874fd3a12f55ea23593b7248c7653450c3a6e5ba8e79c7c5fb40ab685b0dc5d4e29e50f10000bd9018200731dba35f15e5d86c8005c94d14865d73e19983e5'
+            '2ac01524f70c95986cb64f8d0fc29612aec38c8ab95892469329ced071cf3660b4e9997b6e22a62765c244a9c68b41c4729aec8cfe03099e009ce858faa5c661'
             '32a402845f82f89a8357208be666b58672d70cf30fc264f3093b89b4201bf73b57877a080ed123c9beb8e50cd5396092a6286c33e511b595efb1b43e196e3be1'
             '13a473bea4f8a1ba40f5667b880010590c5fddecaa76c360113e977c9ab3898558141cda17000def7b1c592b7dc6f8d5a508752351c601f6484abd775b60d214'
             '24fdd95fc25bcd6aaf21cec598f3d09715418705aadbb2403792b62f4d8789b1897aa65f5e68184612d0a2c1c6be4123491db2fc3b1d602f6e7c5cd6c2d278eb'
@@ -39,6 +41,8 @@
   # Also, it fallbacks to the absolute path inside the chrooted build dir,
   # which will certainly not exist on the target system...
   patch -p1 < "${srcdir}"/fix-scripts-include-path.patch
+
+  patch -p1 < "${srcdir}"/asiolink-fix-build-with-boost-1.66.patch
 }
 
 build() {

Added: asiolink-fix-build-with-boost-1.66.patch
===================================================================
--- asiolink-fix-build-with-boost-1.66.patch	                        (rev 0)
+++ asiolink-fix-build-with-boost-1.66.patch	2017-12-30 14:36:56 UTC (rev 277170)
@@ -0,0 +1,99 @@
+From 758f62a57395ce851f87a56af93409a36c69e5a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at archlinux.org>
+Date: Sat, 30 Dec 2017 14:40:24 +0100
+Subject: [PATCH] asiolink: fix build with boost 1.66
+
+- use native_handle() for getting native socket type
+- use io_context instead of io_service
+---
+ src/lib/asiolink/io_acceptor.h         | 4 ++++
+ src/lib/asiolink/io_service.h          | 5 +++++
+ src/lib/asiolink/tcp_socket.h          | 4 ++++
+ src/lib/asiolink/udp_socket.h          | 4 ++++
+ src/lib/asiolink/unix_domain_socket.cc | 4 ++++
+ 5 files changed, 21 insertions(+)
+
+diff --git a/src/lib/asiolink/io_acceptor.h b/src/lib/asiolink/io_acceptor.h
+index c493d34..913a328 100644
+--- a/src/lib/asiolink/io_acceptor.h
++++ b/src/lib/asiolink/io_acceptor.h
+@@ -47,7 +47,11 @@ public:
+ 
+     /// @brief Returns file descriptor of the underlying socket.
+     virtual int getNative() const {
++#if BOOST_VERSION < 106600
+         return (acceptor_->native());
++#else
++        return (acceptor_->native_handle());
++#endif
+     }
+ 
+     /// @brief Opens acceptor socket given the endpoint.
+diff --git a/src/lib/asiolink/io_service.h b/src/lib/asiolink/io_service.h
+index e9e402d..e0832b2 100644
+--- a/src/lib/asiolink/io_service.h
++++ b/src/lib/asiolink/io_service.h
+@@ -11,7 +11,12 @@
+ 
+ namespace boost {
+ namespace asio {
++#if BOOST_VERSION < 106600
+     class io_service;
++#else
++    class io_context;
++    typedef io_context io_service;
++#endif
+ }
+ }
+ 
+diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h
+index adf74d1..83b8264 100644
+--- a/src/lib/asiolink/tcp_socket.h
++++ b/src/lib/asiolink/tcp_socket.h
+@@ -75,7 +75,11 @@ public:
+ 
+     /// \brief Return file descriptor of underlying socket
+     virtual int getNative() const {
++#if BOOST_VERSION < 106600
+         return (socket_.native());
++#else
++        return (socket_.native_handle());
++#endif
+     }
+ 
+     /// \brief Return protocol of socket
+diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h
+index 07ba447..5b040cf 100644
+--- a/src/lib/asiolink/udp_socket.h
++++ b/src/lib/asiolink/udp_socket.h
+@@ -61,7 +61,11 @@ public:
+ 
+     /// \brief Return file descriptor of underlying socket
+     virtual int getNative() const {
++#if BOOST_VERSION < 106600
+         return (socket_.native());
++#else
++        return (socket_.native_handle());
++#endif
+     }
+ 
+     /// \brief Return protocol of socket
+diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc
+index f17ec2e..d1ad9ec 100644
+--- a/src/lib/asiolink/unix_domain_socket.cc
++++ b/src/lib/asiolink/unix_domain_socket.cc
+@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_service)
+ 
+ int
+ UnixDomainSocket::getNative() const {
++#if BOOST_VERSION < 106600
+     return (impl_->socket_.native());
++#else
++    return (impl_->socket_.native_handle());
++#endif
+ }
+ 
+ int
+-- 
+2.15.1
+