diff --git a/.cvsignore b/.cvsignore index 9c8172c..78fb1c1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Botan-1.8.8.tbz +Botan-1.8.9.tbz diff --git a/botan-1.8.8-binutils_lea_offset.patch b/botan-1.8.8-binutils_lea_offset.patch deleted file mode 100644 index 2028a6f..0000000 --- a/botan-1.8.8-binutils_lea_offset.patch +++ /dev/null @@ -1,28 +0,0 @@ -# -# -# patch "src/hash/sha1_amd64/sha1_amd64_imp.S" -# from [dd263db10309950dec501dd9257a8df43cf6c6aa] -# to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962] -# -============================================================ ---- src/hash/sha1_amd64/sha1_amd64_imp.S dd263db10309950dec501dd9257a8df43cf6c6aa -+++ src/hash/sha1_amd64/sha1_amd64_imp.S ab1db7a394b41a1d3b9a63a6e8e1571e4671b962 -@@ -103,10 +103,16 @@ ALIGN; - - 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 diff --git a/botan.spec b/botan.spec index 476abd4..e749bfc 100644 --- a/botan.spec +++ b/botan.spec @@ -1,13 +1,12 @@ Name: botan -Version: 1.8.8 -Release: 2%{?dist} +Version: 1.8.9 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries License: BSD URL: http://botan.randombit.net/ Source0: http://files.randombit.net/botan/Botan-%{version}.tbz -Patch0: botan-1.8.8-binutils_lea_offset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -46,7 +45,6 @@ developing applications that use %{name}. %prep %setup -q -n Botan-%{version} -%patch0 -p0 %build @@ -112,6 +110,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jun 16 2010 Thomas Moschny - 1.8.9-1 +- Update to 1.8.9. +- Drop patch applied upstream. + * Thu Nov 19 2009 Thomas Moschny - 1.8.8-2 - Add patch from upstream to build with binutils-2.20.51.0.2. Fixes bz 538949 (ftbfs). diff --git a/import.log b/import.log index 03e8ae1..e45069d 100644 --- a/import.log +++ b/import.log @@ -8,3 +8,4 @@ botan-1_8_6-1_fc11:HEAD:botan-1.8.6-1.fc11.src.rpm:1250178270 botan-1_8_7-1_fc11:HEAD:botan-1.8.7-1.fc11.src.rpm:1252614441 botan-1_8_8-1_fc12:HEAD:botan-1.8.8-1.fc12.src.rpm:1257410078 botan-1_8_8-2_fc12:HEAD:botan-1.8.8-2.fc12.src.rpm:1258663811 +botan-1_8_9-1_fc13:HEAD:botan-1.8.9-1.fc13.src.rpm:1276713816 diff --git a/sources b/sources index fddfa1e..c781008 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb7cf79c34414cdf1f7a25569d7b82ac Botan-1.8.8.tbz +2c1c55ae4f5bae9f6ad516e1ada2100f Botan-1.8.9.tbz