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

Accepting request 487615 from home:dmolkentin:branches:devel:libraries:c_c++

Browse Source 
- Add patch to build SLES11 (allows for simplified backporting, e.g. bsc#968030)
- Clean up spec file

- Update to 1.10.16 (bsc#1013209, bsc#974521, bsc#968030, bsc#968026,
    bsc#968025, bsc#965621, bsc#965620)

OBS-URL: https://build.opensuse.org/request/show/487615
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=65
This commit is contained in:
Daniel Molkentin 2017-04-12 15:18:32 +00:00 committed by Git OBS Bridge
parent e3c9096077
commit 9ab8e8e450
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Botan.changes
View File

@ -1,7 +1,14 @@
-------------------------------------------------------------------
Wed Apr 12 14:52:45 UTC 2017 - daniel.molkentin@suse.com
- Add patch to build SLES11 (allows for simplified backporting, e.g. bsc#968030)
- Clean up spec file
-------------------------------------------------------------------
Tue Apr 11 11:57:53 UTC 2017 - daniel.molkentin@suse.com
- Update to 1.10.16
- Update to 1.10.16 (bsc#1013209, bsc#974521, bsc#968030, bsc#968026,
bsc#968025, bsc#965621, bsc#965620)
* Fix a bug in X509 DN string comparisons that could result in out of bound
reads. This could result in information leakage, denial of service, or
potentially incorrect certificate validation results. (CVE-2017-2801)
@ -16,7 +23,6 @@ Tue Apr 11 11:57:53 UTC 2017 - daniel.molkentin@suse.com
* Enable use of readdir on Cygwin, which allows the tests to run (GH #824)
* Switch to readthedocs Sphinx theme by default (GH #822 #823)
-------------------------------------------------------------------
Wed Dec 28 12:02:11 CET 2016 - pth@suse.de

7
Botan.spec
View File

@ -37,9 +37,9 @@ Patch6: Botan-fix_pkgconfig.patch
Patch7: dont-set-mach-value.diff
Patch8: aarch64-support.patch
Patch9: ppc64le-support.patch
Patch10: no-cpuid-header.patch
BuildRequires: bzip2 >= 1.0.2
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: gmp-devel >= 4.1
BuildRequires: libbz2-devel
BuildRequires: openssl-devel
@ -71,7 +71,7 @@ supported, including RSA, DSA, DES, AES, MD5, and SHA-1.
%define botan_docdir %{_docdir}/%{name}-%{version}
Summary: Development files for Botan
Group: Development/Libraries/C and C++
Requires: gmp-devel
Requires: gmp-devel >= 4.1
Requires: libbotan-%{version_suffix} = %{version}
Requires: libbz2-devel
Provides: Botan-devel = %{version}
@ -91,6 +91,9 @@ programs that use the Botan library.
%patch7 -p1
%patch8
%patch9
%if 0%{?suse_version} == 1110
%patch10 -p1
%endif
%build
export RPM_OPT_FLAGS

13
no-cpuid-header.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index f6581f09c..ae087fac3 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -36,7 +36,7 @@
#include <ia32intrin.h>
#define CALL_CPUID(type, out) do { __cpuid(out, type); } while(0)
-#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 430)
+#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && 0
// Only available starting in GCC 4.3
#include <cpuid.h>