pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/kea
Module Name: pkgsrc
Committed By: wiz
Date: Wed Jan 15 06:05:14 UTC 2025
Modified Files:
pkgsrc/net/kea: Makefile distinfo
Added Files:
pkgsrc/net/kea/patches: patch-src_lib_asiolink_io__address.cc
patch-src_lib_asiolink_io__service.cc
patch-src_lib_asiolink_tcp__endpoint.h
patch-src_lib_asiolink_udp__endpoint.h
patch-src_lib_asiolink_unix__domain__socket.cc
patch-src_lib_dhcp_iface__mgr.cc
Log Message:
kea: add upstream patches to fix built with latest boost
Patches reported working by NAKAJI Hiroyuki in PR 58993.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/kea/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/kea/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__address.cc \
pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__service.cc \
pkgsrc/net/kea/patches/patch-src_lib_asiolink_tcp__endpoint.h \
pkgsrc/net/kea/patches/patch-src_lib_asiolink_udp__endpoint.h \
pkgsrc/net/kea/patches/patch-src_lib_asiolink_unix__domain__socket.cc \
pkgsrc/net/kea/patches/patch-src_lib_dhcp_iface__mgr.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/kea/Makefile
diff -u pkgsrc/net/kea/Makefile:1.11 pkgsrc/net/kea/Makefile:1.12
--- pkgsrc/net/kea/Makefile:1.11 Sun Dec 29 15:09:57 2024
+++ pkgsrc/net/kea/Makefile Wed Jan 15 06:05:13 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2024/12/29 15:09:57 adam Exp $
+# $NetBSD: Makefile,v 1.12 2025/01/15 06:05:13 wiz Exp $
DISTNAME= kea-${VERSION}
COMMENT= Next-generation ISC Dynamic Host Configuration Protocol (DHCP) Server
-PKGREVISION= 1
+PKGREVISION= 2
.include "options.mk"
Index: pkgsrc/net/kea/distinfo
diff -u pkgsrc/net/kea/distinfo:1.3 pkgsrc/net/kea/distinfo:1.4
--- pkgsrc/net/kea/distinfo:1.3 Wed Nov 13 14:37:28 2024
+++ pkgsrc/net/kea/distinfo Wed Jan 15 06:05:13 2025
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.3 2024/11/13 14:37:28 taca Exp $
+$NetBSD: distinfo,v 1.4 2025/01/15 06:05:13 wiz Exp $
BLAKE2s (kea-2.6.1.tar.gz) = fbc82aa775b8cb7624d6051ba6276283b387d1e5273e4737e56ad96f380ae890
SHA512 (kea-2.6.1.tar.gz) = 23a4c431117097538a15afd8a28016b49db5490f866aa03abd2bdfef5eaab5031491320acdf3097899d4b071cccff4b53c032ff076b13cab853e063aaa2810ec
Size (kea-2.6.1.tar.gz) = 10467190 bytes
SHA1 (patch-config.h.in) = 854ce1d2685f378ee4dcc06d1901e0c7a371bc32
SHA1 (patch-configure.ac) = 9d70489a402e91fa9db9d576860bcf152d773249
+SHA1 (patch-src_lib_asiolink_io__address.cc) = 9f4d36fe5dd84a47d10f77059e934ec14bf477d7
+SHA1 (patch-src_lib_asiolink_io__service.cc) = 0b64596b9903cb2872866ae92cd7844479be0519
+SHA1 (patch-src_lib_asiolink_tcp__endpoint.h) = 7d4df393abf0a636f40037f723160eacbcb328df
+SHA1 (patch-src_lib_asiolink_udp__endpoint.h) = d1b0e39cc005cfebb25b89b01018bebd75c6baf2
+SHA1 (patch-src_lib_asiolink_unix__domain__socket.cc) = aff0cc2b9c240d7064d966bc287d93e88968d4a8
+SHA1 (patch-src_lib_dhcp_iface__mgr.cc) = 82bb7a4518bc4f8468d41d1f1e38c51a4155b6b3
SHA1 (patch-src_lib_dhcp_pkt__filter__bpf.cc) = 42f0e2c23a6dc8467dd28669b032f63fa11566d4
Added files:
Index: pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__address.cc
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__address.cc:1.1
--- /dev/null Wed Jan 15 06:05:14 2025
+++ pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__address.cc Wed Jan 15 06:05:14 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_lib_asiolink_io__address.cc,v 1.1 2025/01/15 06:05:14 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/isc-projects/kea/pull/143
+
+--- src/lib/asiolink/io_address.cc.orig 2024-07-25 08:50:58.000000000 +0000
++++ src/lib/asiolink/io_address.cc
+@@ -37,7 +37,7 @@ IOAddress::Hash::operator()(const IOAddr
+ // because we'd like to throw our own exception on failure.
+ IOAddress::IOAddress(const std::string& address_str) {
+ boost::system::error_code err;
+- asio_address_ = ip::address::from_string(address_str, err);
++ asio_address_ = ip::make_address(address_str, err);
+ if (err) {
+ isc_throw(IOError, "Failed to convert string to address '"
+ << address_str << "': " << err.message());
+@@ -116,7 +116,7 @@ IOAddress::isV6Multicast() const {
+ uint32_t
+ IOAddress::toUint32() const {
+ if (asio_address_.is_v4()) {
+- return (asio_address_.to_v4().to_ulong());
++ return (asio_address_.to_v4().to_uint());
+ } else {
+ isc_throw(BadValue, "Can't convert " << toText()
+ << " address to IPv4.");
Index: pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__service.cc
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__service.cc:1.1
--- /dev/null Wed Jan 15 06:05:14 2025
+++ pkgsrc/net/kea/patches/patch-src_lib_asiolink_io__service.cc Wed Jan 15 06:05:14 2025
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_lib_asiolink_io__service.cc,v 1.1 2025/01/15 06:05:14 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/isc-projects/kea/pull/143
+
+--- src/lib/asiolink/io_service.cc.orig 2024-07-25 08:50:58.000000000 +0000
++++ src/lib/asiolink/io_service.cc
+@@ -30,7 +30,7 @@ public:
+ /// @brief The constructor.
+ IOServiceImpl() :
+ io_service_(),
+- work_(new boost::asio::io_service::work(io_service_)) {
++ work_(boost::asio::make_work_guard(io_service_)) {
+ };
+
+ /// @brief The destructor.
+@@ -92,7 +92,7 @@ public:
+
+ /// @brief Restarts the IOService in preparation for a subsequent @ref run() invocation.
+ void restart() {
+- io_service_.reset();
++ io_service_.restart();
+ }
+
+ /// @brief Removes IO service work object to let it finish running
+@@ -115,12 +115,12 @@ public:
+ ///
+ /// @param callback The callback to be run on the IO service.
+ void post(const std::function<void ()>& callback) {
+- io_service_.post(callback);
++ boost::asio::post(io_service_, callback);
+ }
+
+ private:
+ boost::asio::io_service io_service_;
+- boost::shared_ptr<boost::asio::io_service::work> work_;
++ boost::asio::executor_work_guard<boost::asio::io_service::executor_type> work_;
+ };
+
+ IOService::IOService() : io_impl_(new IOServiceImpl()) {
Index: pkgsrc/net/kea/patches/patch-src_lib_asiolink_tcp__endpoint.h
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_asiolink_tcp__endpoint.h:1.1
--- /dev/null Wed Jan 15 06:05:14 2025
+++ pkgsrc/net/kea/patches/patch-src_lib_asiolink_tcp__endpoint.h Wed Jan 15 06:05:14 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_asiolink_tcp__endpoint.h,v 1.1 2025/01/15 06:05:14 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/isc-projects/kea/pull/143
+
+--- src/lib/asiolink/tcp_endpoint.h.orig 2024-07-25 08:50:58.000000000 +0000
++++ src/lib/asiolink/tcp_endpoint.h
+@@ -42,7 +42,7 @@ public:
+ /// \param port The TCP port number of the endpoint.
+ TCPEndpoint(const IOAddress& address, const unsigned short port) :
+ asio_endpoint_placeholder_(
+- new boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address.toText()),
++ new boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(address.toText()),
+ port)),
+ asio_endpoint_(*asio_endpoint_placeholder_)
+ {}
Index: pkgsrc/net/kea/patches/patch-src_lib_asiolink_udp__endpoint.h
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_asiolink_udp__endpoint.h:1.1
--- /dev/null Wed Jan 15 06:05:14 2025
+++ pkgsrc/net/kea/patches/patch-src_lib_asiolink_udp__endpoint.h Wed Jan 15 06:05:14 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_asiolink_udp__endpoint.h,v 1.1 2025/01/15 06:05:14 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/isc-projects/kea/pull/143
+
+--- src/lib/asiolink/udp_endpoint.h.orig 2024-07-25 08:50:58.000000000 +0000
++++ src/lib/asiolink/udp_endpoint.h
+@@ -42,7 +42,7 @@ public:
+ /// \param port The UDP port number of the endpoint.
+ UDPEndpoint(const IOAddress& address, const unsigned short port) :
+ asio_endpoint_placeholder_(
+- new boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(address.toText()),
++ new boost::asio::ip::udp::endpoint(boost::asio::ip::make_address(address.toText()),
+ port)),
+ asio_endpoint_(*asio_endpoint_placeholder_)
+ {}
Index: pkgsrc/net/kea/patches/patch-src_lib_asiolink_unix__domain__socket.cc
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_asiolink_unix__domain__socket.cc:1.1
--- /dev/null Wed Jan 15 06:05:14 2025
+++ pkgsrc/net/kea/patches/patch-src_lib_asiolink_unix__domain__socket.cc Wed Jan 15 06:05:14 2025
@@ -0,0 +1,79 @@
+$NetBSD: patch-src_lib_asiolink_unix__domain__socket.cc,v 1.1 2025/01/15 06:05:14 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/isc-projects/kea/pull/143
+
+--- src/lib/asiolink/unix_domain_socket.cc.orig 2024-07-25 08:50:58.000000000 +0000
++++ src/lib/asiolink/unix_domain_socket.cc
+@@ -83,7 +83,7 @@ public:
+ /// @param buffer Buffers holding the data to be sent.
+ /// @param handler User supplied callback to be invoked when data have
+ /// been sent or sending error is signalled.
+- void doSend(const boost::asio::const_buffers_1& buffer,
++ void doSend(const boost::asio::const_buffer& buffer,
+ const UnixDomainSocket::Handler& handler);
+
+
+@@ -103,7 +103,7 @@ public:
+ /// @param ec Error code returned as a result of sending the data.
+ /// @param length Length of the data sent.
+ void sendHandler(const UnixDomainSocket::Handler& remote_handler,
+- const boost::asio::const_buffers_1& buffer,
++ const boost::asio::const_buffer& buffer,
+ const boost::system::error_code& ec,
+ size_t length);
+
+@@ -127,7 +127,7 @@ public:
+ /// @param buffer A buffer into which the data should be received.
+ /// @param handler User supplied callback invoked when data have been
+ /// received on an error is signalled.
+- void doReceive(const boost::asio::mutable_buffers_1& buffer,
++ void doReceive(const boost::asio::mutable_buffer& buffer,
+ const UnixDomainSocket::Handler& handler);
+
+ /// @brief Local handler invoked as a result of asynchronous receive.
+@@ -146,7 +146,7 @@ public:
+ /// @param ec Error code returned as a result of asynchronous receive.
+ /// @param length Size of the received data.
+ void receiveHandler(const UnixDomainSocket::Handler& remote_handler,
+- const boost::asio::mutable_buffers_1& buffer,
++ const boost::asio::mutable_buffer& buffer,
+ const boost::system::error_code& ec,
+ size_t length);
+
+@@ -197,7 +197,7 @@ UnixDomainSocketImpl::asyncSend(const vo
+ }
+
+ void
+-UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer,
++UnixDomainSocketImpl::doSend(const boost::asio::const_buffer& buffer,
+ const UnixDomainSocket::Handler& handler) {
+ auto local_handler = std::bind(&UnixDomainSocketImpl::sendHandler,
+ shared_from_this(),
+@@ -207,7 +207,7 @@ UnixDomainSocketImpl::doSend(const boost
+
+ void
+ UnixDomainSocketImpl::sendHandler(const UnixDomainSocket::Handler& remote_handler,
+- const boost::asio::const_buffers_1& buffer,
++ const boost::asio::const_buffer& buffer,
+ const boost::system::error_code& ec,
+ size_t length) {
+ // The asynchronous send may return EWOULDBLOCK or EAGAIN on some
+@@ -230,7 +230,7 @@ UnixDomainSocketImpl::asyncReceive(void*
+ }
+
+ void
+-UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer,
++UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffer& buffer,
+ const UnixDomainSocket::Handler& handler) {
+ auto local_handler = std::bind(&UnixDomainSocketImpl::receiveHandler,
+ shared_from_this(),
+@@ -240,7 +240,7 @@ UnixDomainSocketImpl::doReceive(const bo
+
+ void
+ UnixDomainSocketImpl::receiveHandler(const UnixDomainSocket::Handler& remote_handler,
+- const boost::asio::mutable_buffers_1& buffer,
++ const boost::asio::mutable_buffer& buffer,
+ const boost::system::error_code& ec,
+ size_t length) {
+ // The asynchronous receive may return EWOULDBLOCK or EAGAIN on some
Index: pkgsrc/net/kea/patches/patch-src_lib_dhcp_iface__mgr.cc
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_dhcp_iface__mgr.cc:1.1
--- /dev/null Wed Jan 15 06:05:14 2025
+++ pkgsrc/net/kea/patches/patch-src_lib_dhcp_iface__mgr.cc Wed Jan 15 06:05:14 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_dhcp_iface__mgr.cc,v 1.1 2025/01/15 06:05:14 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/isc-projects/kea/pull/143
+
+--- src/lib/dhcp/iface_mgr.cc.orig 2024-07-25 08:50:58.000000000 +0000
++++ src/lib/dhcp/iface_mgr.cc
+@@ -1034,7 +1034,7 @@ IfaceMgr::getLocalAddress(const IOAddres
+ }
+
+ // Create socket that will be used to connect to remote endpoint.
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_service;
+ boost::asio::ip::udp::socket sock(io_service);
+
+ boost::system::error_code err_code;
Home |
Main Index |
Thread Index |
Old Index