From f3877e62a7a67f9dd7552e3b447ebdcf60817e5e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 22 Jan 2023 13:07:34 +0100 Subject: [PATCH] Add patch to fix FTBFS. --- botan-1.10.17-u64bit.patch | 12 ++++++++++++ botan.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 botan-1.10.17-u64bit.patch diff --git a/botan-1.10.17-u64bit.patch b/botan-1.10.17-u64bit.patch new file mode 100644 index 0000000..ea90706 --- /dev/null +++ b/botan-1.10.17-u64bit.patch @@ -0,0 +1,12 @@ +diff -up Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp~ Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp +--- Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp~ 2017-10-02 08:00:00.000000000 +0200 ++++ Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp 2023-01-22 13:01:38.984150336 +0100 +@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte i + // P transformation + for(size_t k = 0; k != 4; ++k) + { +- const uint64_t UVk = U[k] ^ V[k]; ++ const u64bit UVk = U[k] ^ V[k]; + for(size_t l = 0; l != 8; ++l) + key[4*l+k] = get_byte(l, UVk); + } diff --git a/botan.spec b/botan.spec index aa0211b..9967eb6 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Crypto library written in C++ License: BSD @@ -19,6 +19,8 @@ Patch1: botan-boost_python.patch Patch2: botan-1.10.13-python-init.patch # 2to3 doc/conf.py Patch3: botan-1.10.17-doc-conf-2to3.patch +# Fix FTBFS +Patch4: botan-1.10.17-u64bit.patch BuildRequires: gcc-c++ BuildRequires: python3 @@ -193,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun Jan 22 2023 Thomas Moschny - 1.10.17-35 +- Add patch to fix FTBFS. + * Wed Jan 18 2023 Fedora Release Engineering - 1.10.17-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild