From 73ce913dff8959d8e49dc44457f2115f7921580537c05dd4f693171815761866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 18 Mar 2013 14:19:03 +0000
Subject: [PATCH] Accepting request 159650 from
 home:cgiboudeaux:branches:devel:libraries:c_c++

Update to 1.10.5

OBS-URL: https://build.opensuse.org/request/show/159650
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=39
---
 Botan-1.10.3.tar.bz2     |  3 ---
 Botan-1.10.5.tbz         |  3 +++
 Botan.changes            |  9 +++++++++
 Botan.spec               |  8 ++++----
 dont-set-mach-value.diff | 10 +++++-----
 5 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100644 Botan-1.10.3.tar.bz2
 create mode 100644 Botan-1.10.5.tbz

diff --git a/Botan-1.10.3.tar.bz2 b/Botan-1.10.3.tar.bz2
deleted file mode 100644
index 681deb9..0000000
--- a/Botan-1.10.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95bc62e9ac08d26f5672cf469bfd0b83b42f4c7295c49c1a81dabcf4504d6767
-size 2218471
diff --git a/Botan-1.10.5.tbz b/Botan-1.10.5.tbz
new file mode 100644
index 0000000..ac78d46
--- /dev/null
+++ b/Botan-1.10.5.tbz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3
+size 2214817
diff --git a/Botan.changes b/Botan.changes
index fa52c7c..b43b492 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Mar 16 13:44:43 UTC 2013 - cgiboudeaux@gmx.com
+
+- Update to 1.10.5
+  * A potential crash in the AES-NI implementation of the AES-192 key schedule
+    (caused by misaligned loads) has been fixed.
+  * A previously conditional operation in Montgomery multiplication and
+    squaring is now always performed, removing a possible timing channel.
+
 -------------------------------------------------------------------
 Sun Mar 10 21:35:25 UTC 2013 - schwab@suse.de
 
diff --git a/Botan.spec b/Botan.spec
index 2c4803b..6b87ec7 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -20,19 +20,19 @@
 %define short_version 1.10
 
 Name:           Botan
-Version:        1.10.3
+Version:        1.10.5
 Release:        0
 Url:            http://botan.randombit.net
 Summary:        A C++ Crypto Library
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Source:         Botan-%{version}.tar.bz2
+Source:         http://botan.randombit.net/files/%{name}-%{version}.tbz
 Source2:        baselibs.conf
 Patch0:         Botan-inttypes.patch
 Patch1:         Botan-ull_constants.patch.bz2
 Patch2:         Botan-fix_install_paths.patch
 Patch4:         Botan-no-buildtime.patch
-Patch6:         Botan-fix_pkgconfig.patch 
+Patch6:         Botan-fix_pkgconfig.patch
 Patch7:         dont-set-mach-value.diff
 Patch8:         aarch64-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -88,7 +88,7 @@ programs that use the Botan library.
 %patch2
 %patch4
 %patch6
-%patch7
+%patch7 -p1
 %patch8
 
 %build
diff --git a/dont-set-mach-value.diff b/dont-set-mach-value.diff
index faf7353..7fca58f 100644
--- a/dont-set-mach-value.diff
+++ b/dont-set-mach-value.diff
@@ -1,8 +1,8 @@
-We don't want any fiddling with -march, our flags via %optflags are always right
-
---- configure.py
-+++ configure.py
-@@ -1081,7 +1081,7 @@
+diff --git a/configure.py b/configure.py
+index b606e06..f184939 100755
+--- a/configure.py
++++ b/configure.py
+@@ -1135,7 +1135,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
                                       options.cpu, options.debug_build),
  
          'lib_opt': cc.library_opt_flags(options),