diff --git a/Botan-1.8.10.tar.bz2 b/Botan-1.8.10.tar.bz2 deleted file mode 100644 index 9976a1f..0000000 --- a/Botan-1.8.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9da2d0f6a107f2a2032a5a1dcd27091f4a6ed428d896def5c91b4908be5fb6d -size 2828431 diff --git a/Botan-1.8.8.tar.bz2 b/Botan-1.8.8.tar.bz2 new file mode 100644 index 0000000..89ef2e7 --- /dev/null +++ b/Botan-1.8.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73c8731368140a951ae03899d651dc1b9b94e27c1125e41cdf3c32d6881ec4eb +size 2557313 diff --git a/Botan-no-buildtime.patch b/Botan-no-buildtime.patch deleted file mode 100644 index a462f54..0000000 --- a/Botan-no-buildtime.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/build-data/buildh.in -=================================================================== ---- src/build-data/buildh.in.orig -+++ src/build-data/buildh.in -@@ -2,7 +2,7 @@ - #ifndef BOTAN_BUILD_CONFIG_H__ - #define BOTAN_BUILD_CONFIG_H__ - --/* This file was automatically generated %{timestamp} UTC */ -+/* This file was automatically generated */ - - #define BOTAN_VERSION_MAJOR %{version_major} - #define BOTAN_VERSION_MINOR %{version_minor} -@@ -50,7 +50,7 @@ - %{local_config} - - /* --%{user}@%{hostname} ran '%{command_line}' -+%{user} ran '%{command_line}' - - Target - ------- diff --git a/Botan-qt_thread_support.patch b/Botan-qt_thread_support.patch deleted file mode 100644 index a2e980f..0000000 --- a/Botan-qt_thread_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/mutex/qt_mutex/mux_qt.cpp -=================================================================== ---- src/mutex/qt_mutex/mux_qt.cpp.orig 2010-08-31 18:39:00.000000000 +0200 -+++ src/mutex/qt_mutex/mux_qt.cpp 2010-09-01 18:50:46.546845986 +0200 -@@ -9,7 +9,7 @@ - #include - #include - --#if !defined(QT_THREAD_SUPPORT) -+#if !(defined(QT_THREAD_SUPPORT) || !defined(QT_NO_THREAD)) - #error Your version of Qt does not support threads or mutexes - #endif - -Index: src/mutex/qt_mutex/info.txt -=================================================================== ---- src/mutex/qt_mutex/info.txt.orig 2010-08-31 18:39:00.000000000 +0200 -+++ src/mutex/qt_mutex/info.txt 2010-09-01 20:07:41.039257575 +0200 -@@ -14,5 +14,5 @@ mux_qt.h - # I think we want to always use qt-mt, not qt -- not much point in supporting - # mutexes in a single threaded application, after all. - --all -> qt-mt -+all -> QtCore - diff --git a/Botan.changes b/Botan.changes index a769373..aa3bf64 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,42 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 1 16:38:40 CEST 2010 - pth@suse.de - -- Prefix last patch with Botan-. -- Enable building of the qt_mutex module. This means that from now - on libbotan requires libQtCore. -- Fix test for thread/mutex support to also work for Qt4. - -- Update to 1.8.10: - - * This release changes a number of aspects of how private keys are - encrypted. The default encryption algorithm has changed from 3DES - to AES-256 - - * The default iteration count for PBES1 and PBES2 encryption schemes - (which are used primarily to encrypt asymmetric keys like RSA or - DSA) has increased from 2048 to 10000, which should make brute - force key cracking substantially harder. - - * The first round of AES now uses a smaller set of lookup tables; - this only reduces performance slightly but some timing and cache - analysis attacks against AES are substantially harder when AES is - implemented this way. - - * The class known as S2K was renamed PBKDF in 1.9, with a typedef - for backwards compatibility. For providing an equivalent forward - compatibility path, 1.8.10 includes a typedef for PBKDF and a new - accessor function get_pbkdf. It also includes a new interface for - deriving keys with a passphrase which takes both the passphrase - and desired output length as well as the salt and iteration - count; in many cases this call is actually significantly more - convenient than the older API. - -------------------------------------------------------------------- -Tue Aug 31 09:22:59 UTC 2010 - aj@suse.de - -- Do not include build time and host in package to not trigger rebuilds. -- Add pkg-config build requires as suggested by rpmlint. - ------------------------------------------------------------------- Wed Mar 10 01:01:48 CET 2010 - ro@suse.de diff --git a/Botan.spec b/Botan.spec index d1f9d4d..1bc688d 100644 --- a/Botan.spec +++ b/Botan.spec @@ -1,5 +1,5 @@ # -# spec file for package Botan (Version 1.8.10) +# spec file for package Botan (Version 1.8.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ %define version_suffix 1_8_2 Name: Botan -Version: 1.8.10 +Version: 1.8.8 Release: 5 Url: http://botan.randombit.net Summary: A C++ Crypto Library @@ -32,13 +32,11 @@ Source: %{name}-%{version}.tar.bz2 Patch0: Botan-inttypes.patch Patch1: Botan-ull_constants.patch.bz2 Patch2: Botan-fix_install_paths.patch -Patch4: Botan-no-buildtime.patch -Patch5: Botan-qt_thread_support.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 BuildRequires: gcc-c++ gmp-devel libbz2-devel openssl-devel python -BuildRequires: pkg-config libqt4-devel %description Botan is a C++ library that provides support for many common @@ -52,7 +50,7 @@ Authors: -------- Jack Lloyd -%package -n libbotan-%{version_suffix} +%package -n libbotan-1_8_2 License: BSD3c Summary: A C++ Crypto Library Group: Development/Libraries/C and C++ @@ -95,8 +93,7 @@ Authors: %patch0 %patch1 %patch2 -%patch4 -%patch5 +%patch3 %build export RPM_OPT_FLAGS @@ -108,10 +105,9 @@ export RPM_OPT_FLAGS --with-zlib \ --with-gnump \ --with-openssl \ - --enable-modules=qt_mutex \ --with-tr1-implementation=system \ --cpu=%_target_cpu -make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS -I/usr/include/Qt" +make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS" %install %makeinstall 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