parent
d2d8099106
commit
26ada87302
|
@ -1,50 +0,0 @@
|
|||
diff -Naur Botan-1.10.8.orig/src/build-data/arch/ppc64le.txt Botan-1.10.8/src/build-data/arch/ppc64le.txt
|
||||
--- Botan-1.10.8.orig/src/build-data/arch/ppc64le.txt 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ Botan-1.10.8/src/build-data/arch/ppc64le.txt 2014-05-25 12:59:22.030001491 -0500
|
||||
@@ -0,0 +1,16 @@
|
||||
+
|
||||
+endian little
|
||||
+family ppc64le
|
||||
+
|
||||
+<aliases>
|
||||
+ppc64el # For Debian
|
||||
+</aliases>
|
||||
+
|
||||
+<submodels>
|
||||
+</submodels>
|
||||
+
|
||||
+<submodel_aliases>
|
||||
+</submodel_aliases>
|
||||
+
|
||||
+<isa_extn>
|
||||
+</isa_extn>
|
||||
diff -Naur Botan-1.10.8.orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt
|
||||
--- Botan-1.10.8.orig/src/build-data/cc/gcc.txt 2014-05-25 12:44:19.580001491 -0500
|
||||
+++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-05-25 12:55:57.750001491 -0500
|
||||
@@ -83,6 +83,7 @@
|
||||
mips64 -> "-mips3 -mcpu=SUBMODEL" mips64-
|
||||
ppc32 -> "-mcpu=SUBMODEL" ppc
|
||||
ppc64 -> "-mcpu=SUBMODEL" ppc
|
||||
+ppc64le -> "-mcpu=SUBMODEL"
|
||||
sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32-
|
||||
sparc64 -> "-mcpu=v9 -mtune=SUBMODEL"
|
||||
x86_32 -> "-march=SUBMODEL -momit-leaf-frame-pointer"
|
||||
@@ -98,6 +99,7 @@
|
||||
sparc32 -> "-m32 -mno-app-regs"
|
||||
sparc64 -> "-m64 -mno-app-regs"
|
||||
ppc64 -> "-m64"
|
||||
+ppc64le -> "-m64"
|
||||
|
||||
# This should probably be used on most/all targets, but the docs are unclear
|
||||
openbsd -> "-pthread"
|
||||
diff -Naur Botan-1.10.8.orig/src/math/mp/mp_asm64/info.txt Botan-1.10.8/src/math/mp/mp_asm64/info.txt
|
||||
--- Botan-1.10.8.orig/src/math/mp/mp_asm64/info.txt 2014-05-25 12:44:19.620001491 -0500
|
||||
+++ Botan-1.10.8/src/math/mp/mp_asm64/info.txt 2014-05-25 12:45:01.580001491 -0500
|
||||
@@ -13,6 +13,7 @@
|
||||
mips64
|
||||
ppc64
|
||||
sparc64
|
||||
+ppc64le
|
||||
</arch>
|
||||
|
||||
# The inline asm only works with gcc, but it looks like (at least on
|
|
@ -1,21 +0,0 @@
|
|||
Index: Botan-1.10.8/src/build-data/arch/aarch64.txt
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ Botan-1.10.8/src/build-data/arch/aarch64.txt
|
||||
@@ -0,0 +1,16 @@
|
||||
+
|
||||
+endian little
|
||||
+family aarch64
|
||||
+
|
||||
+<aliases>
|
||||
+arm64 # For Debian
|
||||
+</aliases>
|
||||
+
|
||||
+<submodels>
|
||||
+</submodels>
|
||||
+
|
||||
+<submodel_aliases>
|
||||
+</submodel_aliases>
|
||||
+
|
||||
+<isa_extn>
|
||||
+</isa_extn>
|
|
@ -1,16 +0,0 @@
|
|||
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);
|
25
botan.spec
25
botan.spec
|
@ -5,8 +5,8 @@
|
|||
%endif
|
||||
|
||||
Name: botan
|
||||
Version: %{major_version}.16
|
||||
Release: 2%{?dist}
|
||||
Version: %{major_version}.17
|
||||
Release: 1%{?dist}
|
||||
Summary: Crypto library written in C++
|
||||
|
||||
Group: System Environment/Libraries
|
||||
|
@ -16,16 +16,12 @@ URL: http://botan.randombit.net/
|
|||
# here: http://botan.randombit.net/releases/Botan-%%{version}.tgz
|
||||
Source0: Botan-%{version}.stripped.tar.gz
|
||||
Source1: README.fedora
|
||||
Patch0: botan-aarch64.patch
|
||||
Patch1: botan-1.10-add-ppc64le.patch
|
||||
# Enable only cleared ECC algorithms
|
||||
Patch2: botan-1.10.5-ecc-fix.patch
|
||||
Patch0: botan-1.10.5-ecc-fix.patch
|
||||
# Make boost_python selectable
|
||||
Patch3: botan-boost_python.patch
|
||||
Patch1: 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
|
||||
Patch2: botan-1.10.13-python-init.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python2
|
||||
|
@ -126,12 +122,9 @@ interfaces may change in the future.
|
|||
|
||||
%prep
|
||||
%setup -q -n Botan-%{version}
|
||||
%patch0 -p1
|
||||
%patch0 -p1 -b .eccfix
|
||||
%patch1 -p1
|
||||
%patch2 -p1 -b .eccfix
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# These tests will fail.
|
||||
rm -rf checks/ec_tests.cpp
|
||||
|
@ -268,6 +261,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Oct 2 2017 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.17-1
|
||||
- Update to 1.10.17.
|
||||
- Remove obsolete patches.
|
||||
|
||||
* Fri Sep 08 2017 Troy Dawson <tdawson@redhat.com> - 1.10.16-2
|
||||
- Cleanup spec file conditionals
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/bash
|
||||
|
||||
name=Botan-1.10.16
|
||||
name=Botan-1.10.17
|
||||
src=${name}.tgz
|
||||
dst=${name}.stripped.tar.gz
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (Botan-1.10.16.stripped.tar.gz) = 67b5cb788903e20cd555d6ed2aa62b646b17d9b0df59d52f04c48d9d60e05531549f05a4d2679b865ca4517797f3b9e2b5c37181c0815c0975e28b9df5c8c817
|
||||
SHA512 (Botan-1.10.17.stripped.tar.gz) = 9fc356ae042af56667ceb8430006658fe8a0c8ef2d00eb1961645bf3082e41c6850a781cc0e0672d68da1e9094532018a51465e5b2e84115c9f0af75910a9eac
|
||||
|
|
Loading…
Reference in New Issue