ayankov/Botan
SHA256
1
0
Fork 0
forked from pool/Botan
Code Pull Requests Activity

Accepting request 34490 from devel:libraries:c_c++

Browse Source 
Copy from devel:libraries:c_c++/Botan based on submit request 34490 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Botan?expand=0&rev=9
This commit is contained in:
OBS User autobuild 2010-03-12 00:10:59 +00:00 committed by Git OBS Bridge
parent a2caa1db4c
commit d30cb112cd
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Botan.changes
View File

@ -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 Sun Jan 10 04:27:38 CET 2010 - jengelh@medozas.de

4
Botan.spec
View File

@ -21,7 +21,7 @@
Name: Botan Name: Botan
Version: 1.8.8 Version: 1.8.8
Release: 4 Release: 5
Url: http://botan.randombit.net Url: http://botan.randombit.net
Summary: A C++ Crypto Library Summary: A C++ Crypto Library
License: BSD3c License: BSD3c
@ -32,6 +32,7 @@ Source: %{name}-%{version}.tar.bz2
Patch0: Botan-inttypes.patch Patch0: Botan-inttypes.patch
Patch1: Botan-ull_constants.patch.bz2 Patch1: Botan-ull_constants.patch.bz2
Patch2: Botan-fix_install_paths.patch Patch2: Botan-fix_install_paths.patch
Patch3: botan-1.8.8-binutils_lea_offset.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1 Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1
BuildRequires: bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel BuildRequires: bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel
@ -92,6 +93,7 @@ Authors:
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2
%patch3
%build %build
export RPM_OPT_FLAGS export RPM_OPT_FLAGS

28
botan-1.8.8-binutils_lea_offset.patch Normal file
View File

@ -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