From 597962b510a5cd5c6bf089f3931e595e6468b459 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 9 Jan 2025 14:41:44 +0100 Subject: [PATCH] kea: update to 2.6.1. --- common/shlibs | 40 ++-- ...-3696-Update-asiolink-for-boost-1.87.patch | 191 ++++++++++++++++++ srcpkgs/kea/template | 4 +- 3 files changed, 211 insertions(+), 24 deletions(-) create mode 100644 srcpkgs/kea/patches/0001-3696-Update-asiolink-for-boost-1.87.patch diff --git a/common/shlibs b/common/shlibs index 339b3b3f9e6030..5b93b53883c754 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2996,28 +2996,24 @@ libkj-http-0.10.2.so capnproto-0.10.2_1 libkj-async-0.10.2.so capnproto-0.10.2_1 libkj-test-0.10.2.so capnproto-0.10.2_1 libkj-0.10.2.so capnproto-0.10.2_1 -libkea-asiodns.so.35 libkea-2.4.1_1 -libkea-asiolink.so.56 libkea-2.4.1_1 -libkea-cc.so.54 libkea-2.4.1_1 -libkea-cfgclient.so.51 libkea-2.4.1_1 -libkea-cryptolink.so.38 libkea-2.4.1_1 -libkea-d2srv.so.30 libkea-2.4.1_1 -libkea-database.so.48 libkea-2.4.1_1 -libkea-dhcp++.so.74 libkea-2.4.1_1 -libkea-dhcp_ddns.so.41 libkea-2.4.1_1 -libkea-dhcpsrv.so.90 libkea-2.4.1_1 -libkea-dns++.so.42 libkea-2.4.1_1 -libkea-eval.so.52 libkea-2.4.1_1 -libkea-exceptions.so.23 libkea-2.4.1_1 -libkea-hooks.so.78 libkea-2.4.1_1 -libkea-http.so.56 libkea-2.4.1_1 -libkea-log.so.48 libkea-2.4.1_1 -libkea-pgsql.so.53 libkea-2.4.1_1 -libkea-process.so.57 libkea-2.4.1_1 -libkea-stats.so.29 libkea-2.4.1_1 -libkea-tcp.so.5 libkea-2.4.1_1 -libkea-util-io.so.0 libkea-2.4.1_1 -libkea-util.so.68 libkea-2.4.1_1 +libkea-hooks.so.98 libkea-2.6.1_1 +libkea-cc.so.68 libkea-2.6.1_1 +libkea-asiolink.so.71 libkea-2.6.1_1 +libkea-log.so.61 libkea-2.6.1_1 +libkea-util.so.84 libkea-2.6.1_1 +libkea-exceptions.so.33 libkea-2.6.1_1 +libkea-dns++.so.56 libkea-2.6.1_1 +libkea-cryptolink.so.50 libkea-2.6.1_1 +libkea-dhcp++.so.90 libkea-2.6.1_1 +libkea-http.so.71 libkea-2.6.1_1 +libkea-process.so.72 libkea-2.6.1_1 +libkea-eval.so.69 libkea-2.6.1_1 +libkea-dhcp_ddns.so.56 libkea-2.6.1_1 +libkea-stats.so.41 libkea-2.6.1_1 +libkea-cfgclient.so.65 libkea-2.6.1_1 +libkea-pgsql.so.70 libkea-2.6.1_1 +libkea-database.so.61 libkea-2.6.1_1 +libkea-asiodns.so.48 libkea-2.6.1_1 libytnef.so.0 ytnef-1.8_1 libpisock.so.9 pilot-link-0.12.5_1 libpisync.so.1 pilot-link-0.12.5_1 diff --git a/srcpkgs/kea/patches/0001-3696-Update-asiolink-for-boost-1.87.patch b/srcpkgs/kea/patches/0001-3696-Update-asiolink-for-boost-1.87.patch new file mode 100644 index 00000000000000..495d0555623ccf --- /dev/null +++ b/srcpkgs/kea/patches/0001-3696-Update-asiolink-for-boost-1.87.patch @@ -0,0 +1,191 @@ +From 6bcfc9440152615ff73ee1102ddaad1dd9aa0dec Mon Sep 17 00:00:00 2001 +From: q66 +Date: Sun, 15 Dec 2024 03:04:53 +0100 +Subject: [PATCH] [#3696] Update asiolink for boost 1.87 + +--- + src/lib/asiolink/io_address.cc | 4 ++-- + src/lib/asiolink/io_service.cc | 8 ++++---- + src/lib/asiolink/tcp_endpoint.h | 2 +- + src/lib/asiolink/udp_endpoint.h | 2 +- + src/lib/asiolink/unix_domain_socket.cc | 16 ++++++++-------- + src/lib/dhcp/iface_mgr.cc | 2 +- + 6 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/src/lib/asiolink/io_address.cc b/src/lib/asiolink/io_address.cc +index 43459bfe5a..06b7d3d990 100644 +--- a/src/lib/asiolink/io_address.cc ++++ b/src/lib/asiolink/io_address.cc +@@ -37,7 +37,7 @@ IOAddress::Hash::operator()(const IOAddress &io_address) const { + // 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."); +diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc +index 411de64191..cc28d24c19 100644 +--- a/src/lib/asiolink/io_service.cc ++++ b/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& callback) { +- io_service_.post(callback); ++ boost::asio::post(io_service_, callback); + } + + private: + boost::asio::io_service io_service_; +- boost::shared_ptr work_; ++ boost::asio::executor_work_guard work_; + }; + + IOService::IOService() : io_impl_(new IOServiceImpl()) { +diff --git a/src/lib/asiolink/tcp_endpoint.h b/src/lib/asiolink/tcp_endpoint.h +index 8ebd57551d..7c8cb35535 100644 +--- a/src/lib/asiolink/tcp_endpoint.h ++++ b/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_) + {} +diff --git a/src/lib/asiolink/udp_endpoint.h b/src/lib/asiolink/udp_endpoint.h +index f960bf3ce9..2a3da9f046 100644 +--- a/src/lib/asiolink/udp_endpoint.h ++++ b/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_) + {} +diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc +index f43e1c9e9b..43ff3c8f24 100644 +--- a/src/lib/asiolink/unix_domain_socket.cc ++++ b/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 void* data, const size_t length, + } + + 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::asio::const_buffers_1& buffer, + + 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* data, const size_t length, + } + + 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 boost::asio::mutable_buffers_1& buffer, + + 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 +diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc +index 01a1d63da5..419268bfe5 100644 +--- a/src/lib/dhcp/iface_mgr.cc ++++ b/src/lib/dhcp/iface_mgr.cc +@@ -1034,7 +1034,7 @@ IfaceMgr::getLocalAddress(const IOAddress& remote_addr, const uint16_t port) { + } + + // 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; +-- +2.47.1 + diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 7e3647708fa392..b14ed46fc0331a 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,6 +1,6 @@ # Template file for 'kea' pkgname=kea -version=2.4.1 +version=2.6.1 revision=1 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr @@ -21,7 +21,7 @@ license="MPL-2.0, Apache-2.0" homepage="https://kea.isc.org" changelog="https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-${version}" distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz" -checksum=815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a +checksum=d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1 build_options="botan mysql pgsql" desc_option_botan="With Botan SSL support"