pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/botan2
Module Name: pkgsrc
Committed By: he
Date: Sat Feb 1 22:01:38 UTC 2025
Modified Files:
pkgsrc/security/botan2: Makefile distinfo
Added Files:
pkgsrc/security/botan2/patches: patch-src_cli_tls__http__server.cpp
patch-src_cli_tls__proxy.cpp patch-src_lib_utils_socket_socket.cpp
patch-src_lib_utils_socket_socket__udp.cpp
Log Message:
security/botan2: backport patches so this builds w/boost-libs 1.87.0.
Part of this is taken from security/botan2.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/botan2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/botan2/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/botan2/patches/patch-src_cli_tls__http__server.cpp \
pkgsrc/security/botan2/patches/patch-src_cli_tls__proxy.cpp \
pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket.cpp \
pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket__udp.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/botan2/Makefile
diff -u pkgsrc/security/botan2/Makefile:1.12 pkgsrc/security/botan2/Makefile:1.13
--- pkgsrc/security/botan2/Makefile:1.12 Sun Dec 29 15:09:58 2024
+++ pkgsrc/security/botan2/Makefile Sat Feb 1 22:01:38 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2024/12/29 15:09:58 adam Exp $
+# $NetBSD: Makefile,v 1.13 2025/02/01 22:01:38 he Exp $
DISTNAME= Botan-2.19.4
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= https://botan.randombit.net/releases/
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/security/botan2/distinfo
diff -u pkgsrc/security/botan2/distinfo:1.5 pkgsrc/security/botan2/distinfo:1.6
--- pkgsrc/security/botan2/distinfo:1.5 Mon Feb 26 21:01:13 2024
+++ pkgsrc/security/botan2/distinfo Sat Feb 1 22:01:38 2025
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.5 2024/02/26 21:01:13 nros Exp $
+$NetBSD: distinfo,v 1.6 2025/02/01 22:01:38 he Exp $
BLAKE2s (Botan-2.19.4.tar.xz) = 7a865e592c497bfff1035d52415cc044c070e4c77a57797f129d08974bd4970a
SHA512 (Botan-2.19.4.tar.xz) = 2fab4347367703dce8302b7710698ed228c6cc6dd609c39829ba17ad580407ed40d822862d467aa7aea4bfd633c1f1d1c0d437e86376f453845cc609596335d8
Size (Botan-2.19.4.tar.xz) = 6099528 bytes
SHA1 (patch-configure.py) = 2688fe59474bf3de425b49d2e0c9c1f4ecccfd16
SHA1 (patch-src_build-data_os_openbsd.txt) = 7858a819d457e0cb18a5b9d608c386bee36813ee
+SHA1 (patch-src_cli_tls__http__server.cpp) = f99030de233a8221f9c33ecb22987cd5b7690c89
+SHA1 (patch-src_cli_tls__proxy.cpp) = 713900a5c01a518577071637207d7d34ecd17546
SHA1 (patch-src_lib_utils_os__utils.cpp) = cf914c9566e7c0f376b045c85bb39fb6a573b225
+SHA1 (patch-src_lib_utils_socket_socket.cpp) = 3e9125cd94d5b4a77ab836a5928c256163248acb
+SHA1 (patch-src_lib_utils_socket_socket__udp.cpp) = c7201c57e8c2d64f449b3386ec9fc52e4be3d39f
Added files:
Index: pkgsrc/security/botan2/patches/patch-src_cli_tls__http__server.cpp
diff -u /dev/null pkgsrc/security/botan2/patches/patch-src_cli_tls__http__server.cpp:1.1
--- /dev/null Sat Feb 1 22:01:38 2025
+++ pkgsrc/security/botan2/patches/patch-src_cli_tls__http__server.cpp Sat Feb 1 22:01:38 2025
@@ -0,0 +1,51 @@
+$NetBSD: patch-src_cli_tls__http__server.cpp,v 1.1 2025/02/01 22:01:38 he Exp $
+
+Adapt to newer boost.
+
+--- src/cli/tls_http_server.cpp.orig 2025-01-29 14:06:52.004694953 +0000
++++ src/cli/tls_http_server.cpp
+@@ -176,7 +176,7 @@ class TLS_Asio_HTTP_Session final : publ
+ typedef std::shared_ptr<TLS_Asio_HTTP_Session> pointer;
+
+ static pointer create(
+- boost::asio::io_service& io,
++ boost::asio::io_context& io,
+ Botan::TLS::Session_Manager& session_manager,
+ Botan::Credentials_Manager& credentials,
+ Botan::TLS::Policy& policy)
+@@ -201,7 +201,7 @@ class TLS_Asio_HTTP_Session final : publ
+ }
+
+ private:
+- TLS_Asio_HTTP_Session(boost::asio::io_service& io,
++ TLS_Asio_HTTP_Session(boost::asio::io_context& io,
+ Botan::TLS::Session_Manager& session_manager,
+ Botan::Credentials_Manager& credentials,
+ Botan::TLS::Policy& policy)
+@@ -406,7 +406,7 @@ class TLS_Asio_HTTP_Session final : publ
+ }
+ }
+
+- boost::asio::io_service::strand m_strand;
++ boost::asio::io_context::strand m_strand;
+
+ tcp::socket m_client_socket;
+
+@@ -427,7 +427,7 @@ class TLS_Asio_HTTP_Server final
+ typedef TLS_Asio_HTTP_Session session;
+
+ TLS_Asio_HTTP_Server(
+- boost::asio::io_service& io, unsigned short port,
++ boost::asio::io_context& io, unsigned short port,
+ Botan::Credentials_Manager& creds,
+ Botan::TLS::Policy& policy,
+ Botan::TLS::Session_Manager& session_mgr,
+@@ -551,7 +551,7 @@ class TLS_HTTP_Server final : public Com
+ session_mgr.reset(new Botan::TLS::Session_Manager_In_Memory(rng()));
+ }
+
+- boost::asio::io_service io;
++ boost::asio::io_context io;
+
+ TLS_Asio_HTTP_Server server(io, listen_port, creds, *policy, *session_mgr, max_clients);
+
Index: pkgsrc/security/botan2/patches/patch-src_cli_tls__proxy.cpp
diff -u /dev/null pkgsrc/security/botan2/patches/patch-src_cli_tls__proxy.cpp:1.1
--- /dev/null Sat Feb 1 22:01:38 2025
+++ pkgsrc/security/botan2/patches/patch-src_cli_tls__proxy.cpp Sat Feb 1 22:01:38 2025
@@ -0,0 +1,99 @@
+$NetBSD: patch-src_cli_tls__proxy.cpp,v 1.1 2025/02/01 22:01:38 he Exp $
+
+Adapt patch from botan3, originally from
+
+https://github.com/randombit/botan/commit/2a406beab449a2cb310fa543451a7087ca7b4b1a
+
+--- src/cli/tls_proxy.cpp.orig 2025-01-23 11:05:38.438228429 +0000
++++ src/cli/tls_proxy.cpp
+@@ -98,11 +98,11 @@ class tls_proxy_session final : public s
+ typedef std::shared_ptr<tls_proxy_session> pointer;
+
+ static pointer create(
+- boost::asio::io_service& io,
++ boost::asio::io_context& io,
+ Botan::TLS::Session_Manager& session_manager,
+ Botan::Credentials_Manager& credentials,
+ Botan::TLS::Policy& policy,
+- tcp::resolver::iterator endpoints)
++ tcp::resolver::results_type endpoints)
+ {
+ return pointer(
+ new tls_proxy_session(
+@@ -141,11 +141,11 @@ class tls_proxy_session final : public s
+
+ private:
+ tls_proxy_session(
+- boost::asio::io_service& io,
++ boost::asio::io_context& io,
+ Botan::TLS::Session_Manager& session_manager,
+ Botan::Credentials_Manager& credentials,
+ Botan::TLS::Policy& policy,
+- tcp::resolver::iterator endpoints)
++ tcp::resolver::results_type endpoints)
+ : m_strand(io)
+ , m_server_endpoints(endpoints)
+ , m_client_socket(io)
+@@ -318,7 +318,7 @@ class tls_proxy_session final : public s
+ {
+ m_hostname = session.server_info().hostname();
+
+- auto onConnect = [this](boost::system::error_code ec, tcp::resolver::iterator /*endpoint*/)
++ auto onConnect = [this](boost::system::error_code ec, tcp::resolver::results_type::iterator /*endpoint*/)
+ {
+ if(ec)
+ {
+@@ -328,7 +328,7 @@ class tls_proxy_session final : public s
+ server_read(boost::system::error_code(), 0); // start read loop
+ proxy_write_to_server(nullptr, 0);
+ };
+- async_connect(m_server_socket, m_server_endpoints, onConnect);
++ async_connect(m_server_socket, m_server_endpoints.begin(), m_server_endpoints.end(), onConnect);
+ return true;
+ }
+
+@@ -341,9 +341,9 @@ class tls_proxy_session final : public s
+ }
+ }
+
+- boost::asio::io_service::strand m_strand;
++ boost::asio::io_context::strand m_strand;
+
+- tcp::resolver::iterator m_server_endpoints;
++ tcp::resolver::results_type m_server_endpoints;
+
+ tcp::socket m_client_socket;
+ tcp::socket m_server_socket;
+@@ -369,8 +369,8 @@ class tls_proxy_server final
+ typedef tls_proxy_session session;
+
+ tls_proxy_server(
+- boost::asio::io_service& io, unsigned short port,
+- tcp::resolver::iterator endpoints,
++ boost::asio::io_context& io, unsigned short port,
++ tcp::resolver::results_type endpoints,
+ Botan::Credentials_Manager& creds,
+ Botan::TLS::Policy& policy,
+ Botan::TLS::Session_Manager& session_mgr,
+@@ -428,7 +428,7 @@ class tls_proxy_server final
+ }
+
+ tcp::acceptor m_acceptor;
+- tcp::resolver::iterator m_server_endpoints;
++ tcp::resolver::results_type m_server_endpoints;
+
+ Botan::Credentials_Manager& m_creds;
+ Botan::TLS::Policy& m_policy;
+@@ -479,10 +479,10 @@ class TLS_Proxy final : public Command
+
+ auto policy = load_tls_policy(get_arg("policy"));
+
+- boost::asio::io_service io;
++ boost::asio::io_context io;
+
+ tcp::resolver resolver(io);
+- auto server_endpoint_iterator = resolver.resolve({ target, target_port });
++ auto server_endpoint_iterator = resolver.resolve(target, target_port);
+
+ std::unique_ptr<Botan::TLS::Session_Manager> session_mgr;
+
Index: pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket.cpp
diff -u /dev/null pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket.cpp:1.1
--- /dev/null Sat Feb 1 22:01:38 2025
+++ pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket.cpp Sat Feb 1 22:01:38 2025
@@ -0,0 +1,68 @@
+$NetBSD: patch-src_lib_utils_socket_socket.cpp,v 1.1 2025/02/01 22:01:38 he Exp $
+
+Adapt patch from botan3 to work with newer boost, originally from
+
+https://github.com/randombit/botan/commit/2a406beab449a2cb310fa543451a7087ca7b4b1a
+
+--- src/lib/utils/socket/socket.cpp.orig 2025-01-23 11:13:43.055705480 +0000
++++ src/lib/utils/socket/socket.cpp
+@@ -48,19 +48,18 @@ class Asio_Socket final : public OS::Soc
+ std::chrono::milliseconds timeout) :
+ m_timeout(timeout), m_timer(m_io), m_tcp(m_io)
+ {
+- m_timer.expires_from_now(m_timeout);
++ m_timer.expires_after(m_timeout);
+ check_timeout();
+
+ boost::asio::ip::tcp::resolver resolver(m_io);
+- boost::asio::ip::tcp::resolver::query query(hostname, service);
+- boost::asio::ip::tcp::resolver::iterator dns_iter = resolver.resolve(query);
++ boost::asio::ip::tcp::resolver::results_type dns_iter = resolver.resolve(std::string{hostname}, std::string{service});
+
+ boost::system::error_code ec = boost::asio::error::would_block;
+
+ auto connect_cb = [&ec](const boost::system::error_code& e,
+- boost::asio::ip::tcp::resolver::iterator) { ec = e; };
++ boost::asio::ip::tcp::resolver::results_type::iterator) { ec = e; };
+
+- boost::asio::async_connect(m_tcp, dns_iter, connect_cb);
++ boost::asio::async_connect(m_tcp, dns_iter.begin(), dns_iter.end(), connect_cb);
+
+ while(ec == boost::asio::error::would_block)
+ {
+@@ -75,7 +74,7 @@ class Asio_Socket final : public OS::Soc
+
+ void write(const uint8_t buf[], size_t len) override
+ {
+- m_timer.expires_from_now(m_timeout);
++ m_timer.expires_after(m_timeout);
+
+ boost::system::error_code ec = boost::asio::error::would_block;
+
+@@ -92,7 +91,7 @@ class Asio_Socket final : public OS::Soc
+
+ size_t read(uint8_t buf[], size_t len) override
+ {
+- m_timer.expires_from_now(m_timeout);
++ m_timer.expires_after(m_timeout);
+
+ boost::system::error_code ec = boost::asio::error::would_block;
+ size_t got = 0;
+@@ -115,7 +114,7 @@ class Asio_Socket final : public OS::Soc
+ private:
+ void check_timeout()
+ {
+- if(m_tcp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now())
++ if(m_tcp.is_open() && m_timer.expiry() < std::chrono::system_clock::now())
+ {
+ boost::system::error_code err;
+ m_tcp.close(err);
+@@ -125,7 +124,7 @@ class Asio_Socket final : public OS::Soc
+ }
+
+ const std::chrono::milliseconds m_timeout;
+- boost::asio::io_service m_io;
++ boost::asio::io_context m_io;
+ boost::asio::system_timer m_timer;
+ boost::asio::ip::tcp::socket m_tcp;
+ };
Index: pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket__udp.cpp
diff -u /dev/null pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket__udp.cpp:1.1
--- /dev/null Sat Feb 1 22:01:38 2025
+++ pkgsrc/security/botan2/patches/patch-src_lib_utils_socket_socket__udp.cpp Sat Feb 1 22:01:38 2025
@@ -0,0 +1,68 @@
+$NetBSD: patch-src_lib_utils_socket_socket__udp.cpp,v 1.1 2025/02/01 22:01:38 he Exp $
+
+Adapt patch from botan3 to work with newer boost. Original from
+
+https://github.com/randombit/botan/commit/2a406beab449a2cb310fa543451a7087ca7b4b1a
+
+--- src/lib/utils/socket/socket_udp.cpp.orig 2025-01-23 11:19:22.203504617 +0000
++++ src/lib/utils/socket/socket_udp.cpp
+@@ -48,19 +48,18 @@ class Asio_SocketUDP final : public OS::
+ std::chrono::microseconds timeout) :
+ m_timeout(timeout), m_timer(m_io), m_udp(m_io)
+ {
+- m_timer.expires_from_now(m_timeout);
++ m_timer.expires_after(m_timeout);
+ check_timeout();
+
+ boost::asio::ip::udp::resolver resolver(m_io);
+- boost::asio::ip::udp::resolver::query query(hostname, service);
+- boost::asio::ip::udp::resolver::iterator dns_iter = resolver.resolve(query);
++ boost::asio::ip::udp::resolver::results_type dns_iter = resolver.resolve(std::string{hostname}, std::string{service});
+
+ boost::system::error_code ec = boost::asio::error::would_block;
+
+ auto connect_cb = [&ec](const boost::system::error_code& e,
+- boost::asio::ip::udp::resolver::iterator) { ec = e; };
++ boost::asio::ip::udp::resolver::results_type::iterator) { ec = e; };
+
+- boost::asio::async_connect(m_udp, dns_iter, connect_cb);
++ boost::asio::async_connect(m_udp, dns_iter.begin(), dns_iter.end(), connect_cb);
+
+ while(ec == boost::asio::error::would_block)
+ {
+@@ -75,7 +74,7 @@ class Asio_SocketUDP final : public OS::
+
+ void write(const uint8_t buf[], size_t len) override
+ {
+- m_timer.expires_from_now(m_timeout);
++ m_timer.expires_after(m_timeout);
+
+ boost::system::error_code ec = boost::asio::error::would_block;
+
+@@ -95,7 +94,7 @@ class Asio_SocketUDP final : public OS::
+
+ size_t read(uint8_t buf[], size_t len) override
+ {
+- m_timer.expires_from_now(m_timeout);
++ m_timer.expires_after(m_timeout);
+
+ boost::system::error_code ec = boost::asio::error::would_block;
+ size_t got = 0;
+@@ -121,7 +120,7 @@ class Asio_SocketUDP final : public OS::
+ private:
+ void check_timeout()
+ {
+- if(m_udp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now())
++ if(m_udp.is_open() && m_timer.expiry() < std::chrono::system_clock::now())
+ {
+ boost::system::error_code err;
+ m_udp.close(err);
+@@ -131,7 +130,7 @@ class Asio_SocketUDP final : public OS::
+ }
+
+ const std::chrono::microseconds m_timeout;
+- boost::asio::io_service m_io;
++ boost::asio::io_context m_io;
+ boost::asio::system_timer m_timer;
+ boost::asio::ip::udp::socket m_udp;
+ };
Home |
Main Index |
Thread Index |
Old Index