diff --git a/Botan.changes b/Botan.changes index 7bef5d5..aa3bf64 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 10 01:01:48 CET 2010 - ro@suse.de + +- add patch from fedora to fix build on x86_64 + (botan-1.8.8-binutils_lea_offset.patch) + ------------------------------------------------------------------- Sun Jan 10 04:27:38 CET 2010 - jengelh@medozas.de diff --git a/Botan.spec b/Botan.spec index 2f0387c..1bc688d 100644 --- a/Botan.spec +++ b/Botan.spec @@ -21,7 +21,7 @@ Name: Botan Version: 1.8.8 -Release: 4 +Release: 5 Url: http://botan.randombit.net Summary: A C++ Crypto Library License: BSD3c @@ -32,6 +32,7 @@ Source: %{name}-%{version}.tar.bz2 Patch0: Botan-inttypes.patch Patch1: Botan-ull_constants.patch.bz2 Patch2: Botan-fix_install_paths.patch +Patch3: botan-1.8.8-binutils_lea_offset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1 BuildRequires: bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel @@ -92,6 +93,7 @@ Authors: %patch0 %patch1 %patch2 +%patch3 %build export RPM_OPT_FLAGS diff --git a/botan-1.8.8-binutils_lea_offset.patch b/botan-1.8.8-binutils_lea_offset.patch new file mode 100644 index 0000000..378371f --- /dev/null +++ b/botan-1.8.8-binutils_lea_offset.patch @@ -0,0 +1,28 @@ +# +# +# patch "src/hash/sha1_amd64/sha1_amd64_imp.S" +# from [dd263db10309950dec501dd9257a8df43cf6c6aa] +# to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962] +# +================================================================================ +--- src/hash/sha1_amd64/sha1_amd64_imp.S ++++ src/hash/sha1_amd64/sha1_amd64_imp.S +@@ -103,10 +103,16 @@ + + subq $320, W + ++/* ++* Using negative values for SHA-1 constants > 2^31 to work around ++* a bug in binutils not accepting large lea displacements. ++* -0x70E44324 == 0x8F1BBCDC ++* -0x359D3E2A == 0xCA62C1D6 ++*/ + #define MAGIC1 0x5A827999 + #define MAGIC2 0x6ED9EBA1 +-#define MAGIC3 0x8F1BBCDC +-#define MAGIC4 0xCA62C1D6 ++#define MAGIC3 -0x70E44324 ++#define MAGIC4 -0x359D3E2A + + #define T %esi + #define T2 %eax