commit
2579d320a4
|
|
@ -0,0 +1,357 @@
|
|||
From 37fec38ff97604f964122cd2d33f5d503f319b10 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@rohde-schwarz.com>
|
||||
Date: Thu, 19 Dec 2024 10:28:40 +0100
|
||||
Subject: [PATCH] Backport: Remove usage of deprecated asio API
|
||||
|
||||
These were all finally dropped with boost 1.87, so this fixes
|
||||
build with boost 1.87.
|
||||
|
||||
Co-Authored-By: Jack Lloyd <jack@randombit.net>
|
||||
Co-Authored-By: q66 <q66@chimera-linux.org>
|
||||
---
|
||||
src/cli/tls_http_server.cpp | 16 +++++-----
|
||||
src/cli/tls_proxy.cpp | 46 ++++++++++++++++-------------
|
||||
src/lib/utils/socket/socket.cpp | 18 +++++------
|
||||
src/lib/utils/socket/socket_udp.cpp | 18 +++++------
|
||||
4 files changed, 50 insertions(+), 48 deletions(-)
|
||||
|
||||
diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp
|
||||
index fc0b5bbb77e..67ab126b145 100644
|
||||
--- a/src/cli/tls_http_server.cpp
|
||||
+++ b/src/cli/tls_http_server.cpp
|
||||
@@ -176,7 +176,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio
|
||||
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 : public std::enable_shared_from_this<TLS_Asio
|
||||
}
|
||||
|
||||
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)
|
||||
@@ -230,7 +230,8 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio
|
||||
|
||||
m_client_socket.async_read_some(
|
||||
boost::asio::buffer(&m_c2s[0], m_c2s.size()),
|
||||
- m_strand.wrap(
|
||||
+ boost::asio::bind_executor(
|
||||
+ m_strand,
|
||||
boost::bind(
|
||||
&TLS_Asio_HTTP_Session::client_read, shared_from_this(),
|
||||
boost::asio::placeholders::error,
|
||||
@@ -332,7 +333,8 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio
|
||||
boost::asio::async_write(
|
||||
m_client_socket,
|
||||
boost::asio::buffer(&m_s2c[0], m_s2c.size()),
|
||||
- m_strand.wrap(
|
||||
+ boost::asio::bind_executor(
|
||||
+ m_strand,
|
||||
boost::bind(
|
||||
&TLS_Asio_HTTP_Session::handle_client_write_completion,
|
||||
shared_from_this(),
|
||||
@@ -406,7 +408,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio
|
||||
}
|
||||
}
|
||||
|
||||
- boost::asio::io_service::strand m_strand;
|
||||
+ boost::asio::io_context::strand m_strand;
|
||||
|
||||
tcp::socket m_client_socket;
|
||||
|
||||
@@ -427,7 +429,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 +553,7 @@ class TLS_HTTP_Server final : public Command
|
||||
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);
|
||||
|
||||
diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
|
||||
index bd96530c202..853be08161c 100644
|
||||
--- a/src/cli/tls_proxy.cpp
|
||||
+++ b/src/cli/tls_proxy.cpp
|
||||
@@ -98,11 +98,11 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
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 std::enable_shared_from_this<tls_proxy_se
|
||||
|
||||
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)
|
||||
@@ -184,7 +184,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
|
||||
m_client_socket.async_read_some(
|
||||
boost::asio::buffer(&m_c2p[0], m_c2p.size()),
|
||||
- m_strand.wrap(
|
||||
+ boost::asio::bind_executor(
|
||||
+ m_strand,
|
||||
boost::bind(
|
||||
&tls_proxy_session::client_read, shared_from_this(),
|
||||
boost::asio::placeholders::error,
|
||||
@@ -245,7 +246,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
boost::asio::async_write(
|
||||
m_client_socket,
|
||||
boost::asio::buffer(&m_p2c[0], m_p2c.size()),
|
||||
- m_strand.wrap(
|
||||
+ boost::asio::bind_executor(
|
||||
+ m_strand,
|
||||
boost::bind(
|
||||
&tls_proxy_session::handle_client_write_completion,
|
||||
shared_from_this(),
|
||||
@@ -270,11 +272,11 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
boost::asio::async_write(
|
||||
m_server_socket,
|
||||
boost::asio::buffer(&m_p2s[0], m_p2s.size()),
|
||||
- m_strand.wrap(
|
||||
- boost::bind(
|
||||
- &tls_proxy_session::handle_server_write_completion,
|
||||
- shared_from_this(),
|
||||
- boost::asio::placeholders::error)));
|
||||
+ boost::asio::bind_executor(m_strand,
|
||||
+ boost::bind(
|
||||
+ &tls_proxy_session::handle_server_write_completion,
|
||||
+ shared_from_this(),
|
||||
+ boost::asio::placeholders::error)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,7 +310,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
|
||||
m_server_socket.async_read_some(
|
||||
boost::asio::buffer(&m_s2p[0], m_s2p.size()),
|
||||
- m_strand.wrap(
|
||||
+ boost::asio::bind_executor(
|
||||
+ m_strand,
|
||||
boost::bind(&tls_proxy_session::server_read, shared_from_this(),
|
||||
boost::asio::placeholders::error,
|
||||
boost::asio::placeholders::bytes_transferred)));
|
||||
@@ -318,7 +321,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
{
|
||||
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,
|
||||
+ const boost::asio::ip::tcp::resolver::results_type::iterator& /*endpoint*/)
|
||||
{
|
||||
if(ec)
|
||||
{
|
||||
@@ -328,7 +332,7 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
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 +345,9 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se
|
||||
}
|
||||
}
|
||||
|
||||
- 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 +373,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 +432,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 +483,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;
|
||||
|
||||
diff --git a/src/lib/utils/socket/socket.cpp b/src/lib/utils/socket/socket.cpp
|
||||
index bc632259a64..0ce4e85830f 100644
|
||||
--- a/src/lib/utils/socket/socket.cpp
|
||||
+++ b/src/lib/utils/socket/socket.cpp
|
||||
@@ -48,19 +48,17 @@ class Asio_Socket final : public OS::Socket
|
||||
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 endpoints = resolver.resolve(hostname, 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::async_connect(m_tcp, dns_iter, connect_cb);
|
||||
+ const boost::asio::ip::tcp::resolver::results_type::iterator&) { ec = e; };
|
||||
+ boost::asio::async_connect(m_tcp, endpoints.begin(), endpoints.end(), connect_cb);
|
||||
|
||||
while(ec == boost::asio::error::would_block)
|
||||
{
|
||||
@@ -75,7 +73,7 @@ class Asio_Socket final : public OS::Socket
|
||||
|
||||
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 +90,7 @@ class Asio_Socket final : public OS::Socket
|
||||
|
||||
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 +113,7 @@ class Asio_Socket final : public OS::Socket
|
||||
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 +123,7 @@ class Asio_Socket final : public OS::Socket
|
||||
}
|
||||
|
||||
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;
|
||||
};
|
||||
diff --git a/src/lib/utils/socket/socket_udp.cpp b/src/lib/utils/socket/socket_udp.cpp
|
||||
index fbbdd9abbcc..82a25b49cda 100644
|
||||
--- a/src/lib/utils/socket/socket_udp.cpp
|
||||
+++ b/src/lib/utils/socket/socket_udp.cpp
|
||||
@@ -48,19 +48,17 @@ class Asio_SocketUDP final : public OS::SocketUDP
|
||||
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 endpoints = resolver.resolve(hostname, 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::async_connect(m_udp, dns_iter, connect_cb);
|
||||
+ const boost::asio::ip::udp::resolver::results_type::iterator&) { ec = e; };
|
||||
+ boost::asio::async_connect(m_udp, endpoints.begin(), endpoints.end(), connect_cb);
|
||||
|
||||
while(ec == boost::asio::error::would_block)
|
||||
{
|
||||
@@ -75,7 +73,7 @@ class Asio_SocketUDP final : public OS::SocketUDP
|
||||
|
||||
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 +93,7 @@ class Asio_SocketUDP final : public OS::SocketUDP
|
||||
|
||||
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 +119,7 @@ class Asio_SocketUDP final : public OS::SocketUDP
|
||||
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 +129,7 @@ class Asio_SocketUDP final : public OS::SocketUDP
|
||||
}
|
||||
|
||||
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;
|
||||
};
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
From f765f0b312f2998498f629d93369babfb2c975b4 Mon Sep 17 00:00:00 2001
|
||||
From: Lauri Nurmi <lanurmi@iki.fi>
|
||||
Date: Wed, 22 Jan 2025 13:03:33 +0200
|
||||
Subject: [PATCH] Fix compilation on GCC 15
|
||||
|
||||
<cstdint> is needed for uint8_t.
|
||||
---
|
||||
src/cli/cli.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/cli/cli.h b/src/cli/cli.h
|
||||
index 6ddf34d025a..0eb8420bb10 100644
|
||||
--- a/src/cli/cli.h
|
||||
+++ b/src/cli/cli.h
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#include <cstdint>
|
||||
#include "cli_exceptions.h"
|
||||
|
||||
namespace Botan {
|
||||
|
|
@ -0,0 +1,399 @@
|
|||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.7.3)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 8;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
%global major_version 2
|
||||
|
||||
Name: botan2
|
||||
Version: 2.19.5
|
||||
Release: %autorelease
|
||||
Summary: Crypto and TLS for C++11
|
||||
|
||||
License: BSD-2-Clause
|
||||
URL: https://botan.randombit.net/
|
||||
Source0: https://botan.randombit.net/releases/Botan-%{version}.tar.xz
|
||||
|
||||
# Backport: Remove usage of deprecated asio API
|
||||
Patch0: 37fec38ff97604f964122cd2d33f5d503f319b10.patch
|
||||
# Fix compilation on GCC 15
|
||||
Patch1: f765f0b312f2998498f629d93369babfb2c975b4.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
Botan is a BSD-licensed crypto library written in C++. It provides a
|
||||
wide variety of basic cryptographic algorithms, X.509 certificates and
|
||||
CRLs, PKCS \#10 certificate requests, a filter/pipe message processing
|
||||
system, and a wide variety of other features, all written in portable
|
||||
C++. The API reference, tutorial, and examples may help impart the
|
||||
flavor of the library. This is the current stable release branch 2.x
|
||||
of Botan.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for %{name}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
%{summary}
|
||||
|
||||
This package contains HTML documentation for %{name}.
|
||||
|
||||
|
||||
%package -n python3-%{name}
|
||||
Summary: Python3 bindings for %{name}
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
|
||||
%description -n python3-%{name}
|
||||
%{summary}
|
||||
|
||||
This package contains the Python3 binding for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n Botan-%{version} -p1
|
||||
|
||||
|
||||
%build
|
||||
export CXXFLAGS="${CXXFLAGS:-%{optflags}}"
|
||||
|
||||
# we have the necessary prerequisites, so enable optional modules
|
||||
%global enable_modules bzip2,zlib
|
||||
|
||||
%{__python3} ./configure.py \
|
||||
--prefix=%{_prefix} \
|
||||
--libdir=%{_lib} \
|
||||
--docdir=%{_docdir} \
|
||||
--cc=gcc \
|
||||
--os=linux \
|
||||
--cpu=%{_arch} \
|
||||
--enable-modules=%{enable_modules} \
|
||||
--with-python-version=%{python3_version} \
|
||||
--with-sphinx \
|
||||
--with-rst2man \
|
||||
--distribution-info="$(source /etc/os-release ; echo "$NAME")" \
|
||||
--disable-static-library \
|
||||
--with-debug-info
|
||||
|
||||
# work around https://github.com/randombit/botan/issues/2130
|
||||
%make_build PYTHON_EXE=%{__python3}
|
||||
|
||||
%install
|
||||
make install PYTHON_EXE=%{__python3} DESTDIR=%{buildroot}
|
||||
|
||||
sed -e '1{/^#!/d}' -i %{buildroot}%{python3_sitearch}/botan2.py
|
||||
%if "%{python3_sitelib}" != "%{python3_sitearch}"
|
||||
mkdir -p %{buildroot}%{python3_sitelib}
|
||||
mv %{buildroot}%{python3_sitearch}/botan2.py %{buildroot}%{python3_sitelib}/botan2.py
|
||||
%endif
|
||||
|
||||
# doc installation fixups
|
||||
mv %{buildroot}%{_docdir}/botan-%{version} %{buildroot}%{_pkgdocdir}
|
||||
rm -r %{buildroot}%{_pkgdocdir}/handbook/{.doctrees,.buildinfo}
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%license license.txt
|
||||
%dir %{_pkgdocdir}
|
||||
%{_pkgdocdir}/*.txt
|
||||
%{_libdir}/libbotan-%{major_version}.so.19*
|
||||
%{_bindir}/botan
|
||||
%{_mandir}/man1/botan.1*
|
||||
|
||||
|
||||
%files devel
|
||||
%license license.txt
|
||||
%{_includedir}/*
|
||||
%{_libdir}/libbotan-%{major_version}.so
|
||||
%{_libdir}/pkgconfig/botan-%{major_version}.pc
|
||||
|
||||
|
||||
%files doc
|
||||
%license license.txt
|
||||
%dir %{_pkgdocdir}
|
||||
%{_pkgdocdir}/handbook
|
||||
|
||||
|
||||
%files -n python3-%{name}
|
||||
%license license.txt
|
||||
%pycached %{python3_sitelib}/%{name}.py
|
||||
|
||||
|
||||
%check
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./botan-test
|
||||
|
||||
|
||||
%changelog
|
||||
## START: Generated by rpmautospec
|
||||
* Fri Feb 14 2025 Frantisek Sumsal <frantisek@sumsal.cz> - 2.19.5-8
|
||||
- Fix FTBFS with gcc-15 (rhbz#2339942)
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.5-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Oct 04 2024 Frantisek Sumsal <frantisek@sumsal.cz> - 2.19.5-6
|
||||
- Update license SPDX identifier
|
||||
|
||||
* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 2.19.5-5
|
||||
- convert license to SPDX
|
||||
|
||||
* Wed Jul 31 2024 Carl George <carlwgeorge@fedoraproject.org> - 2.19.5-4
|
||||
- Move Python module to correct location rhbz#2299798
|
||||
- Mark package as architecture-independent (noarch)
|
||||
|
||||
* Wed Jul 24 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.19.5-3
|
||||
- Fix python dependency
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2024 Frantisek Sumsal <frantisek@sumsal.cz> - 2.19.5-1
|
||||
- Rebase to v2.19.5
|
||||
|
||||
* Mon Jun 17 2024 Frantisek Sumsal <frantisek@sumsal.cz> - 2.19.4-3
|
||||
- Fix intermittent assertions when running tests on with newer gcc
|
||||
|
||||
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.19.4-2
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Thu Apr 4 2024 Thomas Moschny <thomas.moschny@gmx.de> - 2.19.4-1
|
||||
- Update to 2.19.4.
|
||||
|
||||
* Sun Feb 11 2024 Frantisek Sumsal <frantisek@sumsal.cz> - 2.19.3-8
|
||||
- Fix test_compress with zlib-ng (rhbz#2261019)
|
||||
|
||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Sep 04 2023 Frantisek Sumsal <frantisek@sumsal.cz> - 2.19.3-5
|
||||
- Fix FTI/FTBFS (#2219948, #2225727)
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 2.19.3-3
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Nov 28 2022 Ben Kircher <bkircher@0xadd.de> - 2.19.3-1
|
||||
- Bump botan2 to 2.19.3 (RHBZ #2143417, #2143418)
|
||||
|
||||
* Wed Aug 17 2022 Ben Kircher <bkircher@0xadd.de> - 2.19.2-2
|
||||
- Drop support for OpenSSL provider
|
||||
|
||||
* Wed Aug 17 2022 Ben Kircher <bkircher@0xadd.de> - 2.19.2-1
|
||||
- Update to 2.19.2
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.19.1-2
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed Jan 26 2022 Ben Kircher <bkircher@0xadd.de> - 2.19.1-1
|
||||
- Bump to 2.19.1
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Nov 1 2021 Benjamin Kircher <bkircher@0xadd.de> - 2.18.2-2
|
||||
- Switch to openssl1.1 package
|
||||
|
||||
* Mon Nov 1 2021 Benjamin Kircher <bkircher@0xadd.de> - 2.18.2-1
|
||||
- Update to 2.18.2
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.18.1-2
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Sun Aug 1 2021 Benjamin Kircher <bkircher@0xadd.de> - 2.18.1-1
|
||||
- Update to 2.18.1
|
||||
- Fix a FTBFS (#1987388)
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.18.0-2
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Mon Apr 19 2021 Benjamin Kircher <bkircher@0xadd.de> - 2.18.0-1
|
||||
- Update to 2.18.0
|
||||
|
||||
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 2.17.3-3
|
||||
- Rebuilt for removed libstdc++ symbol (#1937698)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Dec 26 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.17.3-1
|
||||
- Update to 2.17.3.
|
||||
|
||||
* Sat Dec 12 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.17.2-1
|
||||
- Update to 2.17.2.
|
||||
|
||||
* Wed Nov 11 2020 Benjamin Kircher <bkircher@0xadd.de> - 2.17.1-1
|
||||
- Update to 2.17.1
|
||||
|
||||
* Mon Oct 12 2020 Benjamin Kircher <bkircher@0xadd.de> - 2.16.0-1
|
||||
- Update to 2.16
|
||||
|
||||
* Fri Oct 02 2020 Jeff Law <law@redhat.com> - 2.15.0-5
|
||||
- Re-enable LTO
|
||||
|
||||
* Thu Aug 13 2020 Jeff Law <law@redhat.com> - 2.15.0-4
|
||||
- Temporarily disable LTO on armv7hl
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 13 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.15.0-1
|
||||
- Update to 2.15.0.
|
||||
|
||||
* Sat Jun 27 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.14.0-1
|
||||
- Update to 2.14.0.
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.13.0-3
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jan 24 2020 Benjamin Kircher <bkircher@0xadd.de> - 2.13.0-1
|
||||
- Update to 2.13
|
||||
|
||||
* Wed Oct 16 2019 Benjamin Kircher <bkircher@0xadd.de> - 2.12.1-1
|
||||
- Update to 2.12.1
|
||||
|
||||
* Sat Oct 5 2019 Thomas Moschny <thomas.moschny@gmx.de> - 2.11.0-5
|
||||
- Allow building on CentOS8 fixing a quoting and a Python path issue.
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.11.0-4
|
||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.11.0-3
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jul 08 2019 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.11.0-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Mar 31 2019 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.10.0-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Feb 09 2019 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.9.0-1
|
||||
- Update to 2.9.0
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Oct 01 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.8.0-1
|
||||
- Update to 2.8.0
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.0-2
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Mon Jul 2 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.7.0-1
|
||||
- Update to 2.7.0.
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.6.0-2
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Thu Apr 12 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.6.0-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Apr 01 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.4.0-10
|
||||
- Add patch to fix test suite failure due to expired test certificate
|
||||
|
||||
* Mon Mar 19 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.4.0-9
|
||||
- Update empty patch file with the real patch contents.
|
||||
|
||||
* Sat Mar 17 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.4.0-8
|
||||
- Add patch to fix test suite failures on ppc64le (see gh#1498).
|
||||
- Add patch to fix test suite if SIMD instructions are not available (see gh#1495).
|
||||
|
||||
* Thu Mar 15 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.4.0-7
|
||||
- Add patch to the Python module, supporting loading via
|
||||
libbotan-2.so.X.
|
||||
|
||||
* Thu Mar 15 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.4.0-6
|
||||
- Set CXXFLAGS before calling configure.py.
|
||||
- Patch for building on armv7hl (see gh#1495).
|
||||
- Make dependency on rst2man explicit.
|
||||
- Don't use Python2 at all.
|
||||
- Remove shebang from botan2.py.
|
||||
- Don't build a static library.
|
||||
- Switch to %%ldconfig_scriptlets.
|
||||
|
||||
* Tue Mar 13 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.4.0-5
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Tue Mar 06 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.4.0-4
|
||||
- Exclude ppc64le arch, fix linter warnings
|
||||
|
||||
* Tue Mar 06 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.4.0-3
|
||||
- Fix macro expansion in changelog section
|
||||
|
||||
* Sat Jan 13 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.4.0-2
|
||||
- Remove INSTALL_ variables, not used anymore
|
||||
|
||||
* Thu Jan 11 2018 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.4.0-1
|
||||
- New upstream version; add new man page for botan command line utility
|
||||
|
||||
* Fri Dec 15 2017 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.3.0-1
|
||||
- New upstream version
|
||||
|
||||
* Thu Sep 07 2017 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.2.0-4
|
||||
- Backport upstream fix for broken GOST on i686
|
||||
|
||||
* Wed Sep 06 2017 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.2.0-3
|
||||
- Fix %%check section after rpath removal, generate debug symbols
|
||||
|
||||
* Thu Aug 31 2017 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.2.0-2
|
||||
- Fix issues that came up in review, see RH Bugzilla #1487067
|
||||
|
||||
* Sat Aug 12 2017 Benjamin Kircher <benjamin.kircher@gmail.com> - 2.2.0-1
|
||||
- New package. No need for compat-openssl10-devel anymore with 2.2.0 release
|
||||
|
||||
## END: Generated by rpmautospec
|
||||
Loading…
Reference in New Issue