Compare commits
No commits in common. "rawhide" and "f33" have entirely different histories.
4 changed files with 12 additions and 161 deletions
|
|
@ -1,7 +0,0 @@
|
|||
diff --git a/src/build-data/arch/riscv64.txt b/src/build-data/arch/riscv64.txt
|
||||
new file mode 100644
|
||||
index 0000000..6e5e0ff
|
||||
--- /dev/null
|
||||
+++ b/src/build-data/arch/riscv64.txt
|
||||
@@ -0,0 +1 @@
|
||||
+endian little
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff -up Botan-1.10.17/doc/conf.py.orig Botan-1.10.17/doc/conf.py
|
||||
--- Botan-1.10.17/doc/conf.py.orig 2017-10-02 08:00:00.000000000 +0200
|
||||
+++ Botan-1.10.17/doc/conf.py 2021-09-11 17:57:38.159934955 +0200
|
||||
@@ -40,10 +40,10 @@ version.
|
||||
def check_sphinx_version():
|
||||
import sphinx
|
||||
|
||||
- version = map(int, sphinx.__version__.split('.'))
|
||||
+ version = list(map(int, sphinx.__version__.split('.')))
|
||||
if version[0] == 1 and version[1] == 0 and version[2] < 7:
|
||||
# Exit rather than throwing to avoid a confusing backtrace
|
||||
- print "This Sphinx is too old - upgrade to at least 1.0.7"
|
||||
+ print("This Sphinx is too old - upgrade to at least 1.0.7")
|
||||
import sys
|
||||
sys.exit(1)
|
||||
|
||||
@@ -66,8 +66,8 @@ source_suffix = '.txt'
|
||||
master_doc = 'contents'
|
||||
|
||||
# General information about the project.
|
||||
-project = u'botan'
|
||||
-copyright = u'2000-2011, Jack Lloyd'
|
||||
+project = 'botan'
|
||||
+copyright = '2000-2011, Jack Lloyd'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
@@ -214,8 +214,8 @@ htmlhelp_basename = 'botandoc'
|
||||
# Grouping the document tree into LaTeX files. List of tuples
|
||||
# (source start file, target name, title, author, documentclass [howto/manual]).
|
||||
latex_documents = [
|
||||
- ('contents', 'botan.tex', u'botan Reference Manual',
|
||||
- u'Jack Lloyd', 'manual'),
|
||||
+ ('contents', 'botan.tex', 'botan Reference Manual',
|
||||
+ 'Jack Lloyd', 'manual'),
|
||||
]
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top of
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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);
|
||||
}
|
||||
116
botan.spec
116
botan.spec
|
|
@ -2,11 +2,10 @@
|
|||
|
||||
Name: botan
|
||||
Version: %{major_version}.17
|
||||
Release: 51%{?dist}
|
||||
Release: 21%{?dist}
|
||||
Summary: Crypto library written in C++
|
||||
|
||||
# Automatically converted from old format: BSD - review is highly recommended.
|
||||
License: LicenseRef-Callaway-BSD
|
||||
License: BSD
|
||||
URL: http://botan.randombit.net/
|
||||
# tarfile is stripped using repack.sh. original tarfile to be found
|
||||
# here: http://botan.randombit.net/releases/Botan-%%{version}.tgz
|
||||
|
|
@ -18,23 +17,14 @@ Patch0: botan-1.10.5-ecc-fix.patch
|
|||
Patch1: botan-boost_python.patch
|
||||
# Fix wrong path
|
||||
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
|
||||
# Add RISC-V (riscv64)
|
||||
# Upstream in later versions:
|
||||
# https://github.com/randombit/botan/blob/master/src/build-data/arch/riscv64.txt
|
||||
Patch9: Botan-1.10.17-add-riscv64.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: boost-python3-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: make
|
||||
|
||||
# do not check .so files in the python_sitelib directories
|
||||
%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$
|
||||
|
|
@ -87,12 +77,20 @@ interfaces may change in the future.
|
|||
|
||||
%prep
|
||||
%setup -q -n Botan-%{version}
|
||||
%autosetup -p1 -n Botan-%{version}
|
||||
%patch0 -p1 -b .eccfix
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# These tests will fail.
|
||||
rm -rf checks/ec_tests.cpp
|
||||
|
||||
%build
|
||||
# This package fails to build on armv7 with LTO due to the usual problems
|
||||
# with NEON instructions. After we figure out the root cause of the failure
|
||||
# we'll hopefully be able to remove this opt-out
|
||||
%ifarch armv7hl
|
||||
%define _lto_cflags %{nil}
|
||||
%endif
|
||||
|
||||
# we have the necessary prerequisites, so enable optional modules
|
||||
%global enable_modules bzip2,zlib
|
||||
|
|
@ -200,96 +198,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 1.10.17-51
|
||||
- Rebuilt for Boost 1.90
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.10.17-50
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.10.17-49
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-48
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1.10.17-47
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-46
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 1.10.17-45
|
||||
- convert license to SPDX
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1.10.17-43
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Sat Feb 24 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1.10.17-42
|
||||
- Add support for riscv64
|
||||
|
||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-39
|
||||
- Rebuilt for Boost 1.83
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-38
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 1.10.17-37
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-36
|
||||
- Rebuilt for Boost 1.81
|
||||
|
||||
* Sun Jan 22 2023 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.17-35
|
||||
- Add patch to fix FTBFS.
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jun 24 2022 Jonathan Wakely <jwakely@redhat.com> - .17-32
|
||||
- Replace obsolete boost-python3-devel build dependency (#2100748)
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.10.17-31
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 1.10.17-30
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Sep 11 2021 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.17-28
|
||||
- Fix FTBFS on F35 and later.
|
||||
|
||||
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-27
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.10.17-25
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-23
|
||||
- Rebuilt for Boost 1.75
|
||||
|
||||
* Thu Oct 01 2020 Jeff Law <law@redhat.com> - 1.10.17-22
|
||||
- Re-enable LTO
|
||||
|
||||
* Mon Aug 10 2020 Jeff Law <law@redhat.com> - 1.10.17-21
|
||||
- Disable LTO on armv7hl for now.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue