Compare commits

...

23 Commits

Author SHA1 Message Date
Jonathan Wakely d5a75da6b8 Rebuilt for Boost 1.81 2023-02-20 21:49:04 +00:00
Thomas Moschny f3877e62a7 Add patch to fix FTBFS. 2023-01-22 13:08:27 +01:00
Fedora Release Engineering e594e34ca9 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 23:06:17 +00:00
Fedora Release Engineering 4b4741f387 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 22:12:16 +00:00
Jonathan Wakely 0b2460631d Replace obsolete boost-python3-devel build dependency (#2100748) 2022-06-24 09:16:40 +01:00
Python Maint 14fb5a3b80 Rebuilt for Python 3.11 2022-06-13 19:53:12 +02:00
Thomas Rodgers a1881f2615 Rebuilt for Boost 1.78 2022-05-04 11:37:45 +02:00
Fedora Release Engineering 430ac8a435 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 22:32:44 +00:00
Thomas Moschny e3ac435d6f Fix FTBFS on F35 and later. 2021-09-11 18:13:20 +02:00
Jonathan Wakely acb4309eee Rebuilt for Boost 1.76 2021-08-06 22:25:12 +01:00
Fedora Release Engineering 27a64fc16c - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 18:49:07 +00:00
Fedora Release Engineering 6523c72781 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 13:51:53 +00:00
Python Maint 67e7949731 Rebuilt for Python 3.10 2021-06-04 20:00:38 +02:00
Fedora Release Engineering bf56908bdd - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 01:20:14 +00:00
Jonathan Wakely fc58ab3003 Rebuilt for Boost 1.75 2021-01-22 16:34:26 +00:00
Tom Stellard b0d203cd11 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-17 03:06:03 +00:00
Jeff Law af7c6ca96c Re-enable LTO 2020-10-01 17:39:29 -06:00
Jeff Law 2c6c52d214 Disable LTO on armv7hl for now 2020-08-10 21:01:10 -06:00
Fedora Release Engineering bc6b42a2dd - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 13:20:13 +00:00
Jonathan Wakely b718544bf2 Rebuilt for Boost 1.73 2020-05-29 23:37:02 +01:00
Miro Hrončok 53fff83a38 Rebuilt for Python 3.9 2020-05-26 02:41:44 +02:00
Fedora Release Engineering 133a171d1e - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 13:14:04 +00:00
Miro Hrončok c04ee98390 Rebuilt for Python 3.8.0rc1 (#1748018) 2019-10-03 13:51:15 +02:00
3 changed files with 122 additions and 5 deletions

View File

@ -0,0 +1,38 @@
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

View File

@ -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);
}

View File

@ -2,7 +2,7 @@
Name: botan
Version: %{major_version}.17
Release: 15%{?dist}
Release: 36%{?dist}
Summary: Crypto library written in C++
License: BSD
@ -17,14 +17,19 @@ 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
BuildRequires: gcc-c++
BuildRequires: python3
BuildRequires: python3-devel
BuildRequires: python3-sphinx
BuildRequires: boost-python3-devel
BuildRequires: boost-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)$
@ -77,14 +82,13 @@ interfaces may change in the future.
%prep
%setup -q -n Botan-%{version}
%patch0 -p1 -b .eccfix
%patch1 -p1
%patch2 -p1
%autosetup -p1 -n Botan-%{version}
# These tests will fail.
rm -rf checks/ec_tests.cpp
%build
# we have the necessary prerequisites, so enable optional modules
%global enable_modules bzip2,zlib
@ -191,6 +195,69 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
%changelog
* 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.
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 29 2020 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-19
- Rebuilt for Boost 1.73
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-18
- Rebuilt for Python 3.9
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-16
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-15
- Rebuilt for Python 3.8