From 16f0c7206088ea0c5749d2e6c32f006a9fd4bbb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 1/8] Rebuild for Python 3.6 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index f4af8fe..59b6162 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.10.14-4 +- Rebuild for Python 3.6 + * Sat Dec 10 2016 Thomas Moschny - 1.10.14-3 - Add -std=c++11 to the compilerflags (needed on EPEL7). From e9cbd68f6b1a9577f5beed7be3fd1adb6e058b7f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 18:00:56 +0000 Subject: [PATCH 2/8] Rebuilt for Boost 1.63 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 59b6162..9029444 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jan 27 2017 Jonathan Wakely - 1.10.14-5 +- Rebuilt for Boost 1.63 + * Mon Dec 19 2016 Miro Hrončok - 1.10.14-4 - Rebuild for Python 3.6 From 22ea44d6b13afa39da6cc8b9b5254506884daaa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:01:38 +0000 Subject: [PATCH 3/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 9029444..52ad87d 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.10.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 1.10.14-5 - Rebuilt for Boost 1.63 From 5b3d5c814c1080237de6c273e6e1be7ce54e87c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:42:25 +0000 Subject: [PATCH 4/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 52ad87d..372d5bb 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon May 15 2017 Fedora Release Engineering - 1.10.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.10.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ac6f1cb70a80bf4f5f7f108274b8e9ce2ca6c329 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 3 Jul 2017 16:59:12 +0100 Subject: [PATCH 5/8] Rebuilt for Boost 1.64 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 372d5bb..502f78c 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Jul 03 2017 Jonathan Wakely - 1.10.14-8 +- Rebuilt for Boost 1.64 + * Mon May 15 2017 Fedora Release Engineering - 1.10.14-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From fd263d946c54e4decc80e4eb51fd3235082ad8eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 04:11:06 +0000 Subject: [PATCH 6/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 502f78c..a1b1a47 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.10.14-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 03 2017 Jonathan Wakely - 1.10.14-8 - Rebuilt for Boost 1.64 From 1b5794187d9d36630c9895f550cb0117cad76202 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 18:24:07 +0000 Subject: [PATCH 7/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index a1b1a47..32afc84 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.10.14-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.10.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c5907002c3c2c12c453ba69c2cf51b2f5ac9ee38 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 13 Aug 2017 17:01:49 +0200 Subject: [PATCH 8/8] Update to 1.10.16. --- botan-avoid-gcc7-miscompilation.patch | 16 ++++++++++++++++ botan.spec | 12 +++++++++--- repack.sh | 2 +- sources | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 botan-avoid-gcc7-miscompilation.patch diff --git a/botan-avoid-gcc7-miscompilation.patch b/botan-avoid-gcc7-miscompilation.patch new file mode 100644 index 0000000..23ef69d --- /dev/null +++ b/botan-avoid-gcc7-miscompilation.patch @@ -0,0 +1,16 @@ +diff -up Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp.orig Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp +--- Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp.orig 2017-04-05 03:06:45.000000000 +0200 ++++ Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp 2017-08-13 16:29:34.720567939 +0200 +@@ -90,8 +90,11 @@ 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]; + for(size_t l = 0; l != 8; ++l) +- key[4*l+k] = get_byte(l, U[k]) ^ get_byte(l, V[k]); ++ key[4*l+k] = get_byte(l, UVk); ++ } + + cipher.set_key(key, 32); + cipher.encrypt(&hash[8*j], S + 8*j); diff --git a/botan.spec b/botan.spec index 32afc84..cd4bfa8 100644 --- a/botan.spec +++ b/botan.spec @@ -5,8 +5,8 @@ %endif Name: botan -Version: %{major_version}.14 -Release: 10%{?dist} +Version: %{major_version}.16 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -24,6 +24,8 @@ Patch2: botan-1.10.5-ecc-fix.patch Patch3: botan-boost_python.patch # Fix wrong path Patch4: botan-1.10.13-python-init.patch +# See https://github.com/randombit/botan/issues/882 +Patch5: botan-avoid-gcc7-miscompilation.patch BuildRequires: gcc-c++ BuildRequires: python2 @@ -35,7 +37,7 @@ BuildRequires: python3-devel BuildRequires: boost-python3-devel %endif # with_python3 -BuildRequires: python-sphinx +BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: zlib-devel %if 0%{?fedora} >=26 @@ -129,6 +131,7 @@ interfaces may change in the future. %patch2 -p1 -b .eccfix %patch3 -p1 %patch4 -p1 +%patch5 -p1 # These tests will fail. rm -rf checks/ec_tests.cpp @@ -265,6 +268,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun Aug 13 2017 Thomas Moschny - 1.10.16-1 +- Update to 1.10.16. + * Wed Aug 02 2017 Fedora Release Engineering - 1.10.14-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/repack.sh b/repack.sh index af5cd56..e38d5a4 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -name=Botan-1.10.14 +name=Botan-1.10.16 src=${name}.tgz dst=${name}.stripped.tar.gz diff --git a/sources b/sources index bbe1e99..7d505fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55fb6734ce039c79ddac939af9a176dc Botan-1.10.14.stripped.tar.gz +SHA512 (Botan-1.10.16.stripped.tar.gz) = 67b5cb788903e20cd555d6ed2aa62b646b17d9b0df59d52f04c48d9d60e05531549f05a4d2679b865ca4517797f3b9e2b5c37181c0815c0975e28b9df5c8c817