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

Accepting request 74320 from devel:libraries:c_c++

Browse Source 
Update to 1.10.0

OBS-URL: https://build.opensuse.org/request/show/74320
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Botan?expand=0&rev=15
This commit is contained in:
Sascha Peilicke 2011-06-23 09:44:04 +00:00 committed by Git OBS Bridge
commit 5dce1d2904
9 changed files with 158 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Botan-1.10.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65669a2ba74e07e1fa9ec5435c4785a5d901e4b5ca504701e9ec561513448aeb
size 2188918

3
Botan-1.8.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9da2d0f6a107f2a2032a5a1dcd27091f4a6ed428d896def5c91b4908be5fb6d
size 2828431

54
Botan-fix_install_paths.patch
View File

@ -1,26 +1,44 @@
Index: src/build-data/makefile/unix.in Index: src/build-data/makefile/unix.in
=================================================================== ===================================================================
--- src/build-data/makefile/unix.in.orig 2009-11-03 19:02:17.000000000 +0100 --- src/build-data/makefile/unix.in.orig 2011-06-21 17:33:59.550471797 +0200
+++ src/build-data/makefile/unix.in 2009-12-11 19:10:50.687527483 +0100 +++ src/build-data/makefile/unix.in 2011-06-21 17:35:52.643901474 +0200
@@ -19,7 +19,7 @@ VERSION = %{version} @@ -12,12 +12,12 @@ VERSION = %{version}
################################################## SERIES = %{version_major}.%{version_minor}
DESTDIR = %{prefix}
# Installation Settings
-DESTDIR = %{prefix}
+DESTDIR =
-BINDIR = $(DESTDIR)/bin -BINDIR = $(DESTDIR)/bin
+BINDIR = $(DESTDIR)/%{prefix}/bin -LIBDIR = $(DESTDIR)/%{libdir}
LIBDIR = $(DESTDIR)/%{libdir} -HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
HEADERDIR = $(DESTDIR)/%{includedir}/botan -DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION)
DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) +BINDIR = $(DESTDIR)%{prefix}/bin
+LIBDIR = $(DESTDIR)%{libdir}
+HEADERDIR = $(DESTDIR)%{includedir}/botan-$(SERIES)/botan
+DOCDIR = $(DESTDIR)%{docdir}/Botan-$(VERSION)
PKGCONF_DIR = $(LIBDIR)/pkgconfig
CONFIG_SCRIPT = %{botan_config}
Index: src/build-data/makefile/unix_shr.in Index: src/build-data/makefile/unix_shr.in
=================================================================== ===================================================================
--- src/build-data/makefile/unix_shr.in.orig 2009-11-03 19:02:17.000000000 +0100 --- src/build-data/makefile/unix_shr.in.orig 2011-06-21 17:33:59.550471797 +0200
+++ src/build-data/makefile/unix_shr.in 2009-12-11 19:10:40.239524087 +0100 +++ src/build-data/makefile/unix_shr.in 2011-06-21 17:35:50.812926900 +0200
@@ -22,7 +22,7 @@ SO_VERSION = %{so_version} @@ -14,12 +14,12 @@ VERSION = %{version}
################################################## SERIES = %{version_major}.%{version_minor}
DESTDIR = %{prefix}
# Installation Settings
-DESTDIR = %{prefix}
+DESTDIR =
-BINDIR = $(DESTDIR)/bin -BINDIR = $(DESTDIR)/bin
+BINDIR = $(DESTDIR)/%{prefix}/bin -LIBDIR = $(DESTDIR)/%{libdir}
LIBDIR = $(DESTDIR)/%{libdir} -HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
HEADERDIR = $(DESTDIR)/%{includedir}/botan -DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION)
DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) +BINDIR = $(DESTDIR)%{prefix}/bin
+LIBDIR = $(DESTDIR)%{libdir}
+HEADERDIR = $(DESTDIR)%{includedir}/botan-$(SERIES)/botan
+DOCDIR = $(DESTDIR)%{docdir}/Botan-$(VERSION)
PKGCONF_DIR = $(LIBDIR)/pkgconfig
CONFIG_SCRIPT = %{botan_config}

12
Botan-fix_pkgconfig.patch Normal file
View File

@ -0,0 +1,12 @@
Index: src/build-data/botan.pc.in
===================================================================
--- src/build-data/botan.pc.in.orig 2011-06-20 15:52:09.000000000 +0200
+++ src/build-data/botan.pc.in 2011-06-21 18:17:45.434985232 +0200
@@ -1,6 +1,6 @@
prefix=%{prefix}
exec_prefix=${prefix}
-libdir=${prefix}/%{libdir}
+libdir=${prefix}%{libdir}
includedir=${prefix}/include/botan-%{version_major}.%{version_minor}
Name: Botan

39
Botan-inttypes.patch
View File

@ -1,27 +1,46 @@
Index: src/utils/types.h Index: src/utils/types.h
=================================================================== ===================================================================
--- src/utils/types.h.orig 2009-11-03 19:02:17.000000000 +0100 --- src/utils/types.h.orig 2011-06-20 15:52:09.000000000 +0200
+++ src/utils/types.h 2009-11-23 18:18:51.924780607 +0100 +++ src/utils/types.h 2011-06-21 16:48:39.324325773 +0200
@@ -9,21 +9,22 @@ @@ -9,8 +9,8 @@
#define BOTAN_TYPES_H__ #define BOTAN_TYPES_H__
#include <botan/build.h> #include <botan/build.h>
-#include <stddef.h>
-
+#include <cstddef>
+#include <stdint.h> +#include <stdint.h>
/**
namespace Botan { * The primary namespace for the botan library
*/
@@ -19,22 +19,22 @@ namespace Botan {
/**
* Typedef representing an unsigned 8-bit quantity
*/
-typedef unsigned char byte; -typedef unsigned char byte;
-typedef unsigned short u16bit;
-typedef unsigned int u32bit;
+typedef uint8_t byte; +typedef uint8_t byte;
/**
* Typedef representing an unsigned 16-bit quantity
*/
-typedef unsigned short u16bit;
+typedef uint16_t u16bit; +typedef uint16_t u16bit;
/**
* Typedef representing an unsigned 32-bit quantity
*/
-typedef unsigned int u32bit;
+typedef uint32_t u32bit; +typedef uint32_t u32bit;
/**
* Typedef representing a signed 32-bit quantity
*/
-typedef signed int s32bit; -typedef signed int s32bit;
+typedef int32_t s32bit; +typedef int32_t s32bit;
#if defined(_MSC_VER) || defined(__BORLANDC__) /**
typedef unsigned __int64 u64bit; * Typedef representing an unsigned 64-bit quantity
@@ -44,7 +44,7 @@ typedef signed int s32bit;
#elif defined(__KCC) #elif defined(__KCC)
typedef unsigned __long_long u64bit; typedef unsigned __long_long u64bit;
#elif defined(__GNUG__) #elif defined(__GNUG__)

27
Botan-no-buildtime.patch
View File

@ -1,22 +1,15 @@
Index: src/build-data/buildh.in Index: src/build-data/buildh.in
=================================================================== ===================================================================
--- src/build-data/buildh.in.orig --- src/build-data/buildh.in.orig 2011-06-20 15:52:09.000000000 +0200
+++ src/build-data/buildh.in +++ src/build-data/buildh.in 2011-06-21 14:54:51.287402063 +0200
@@ -2,7 +2,7 @@ @@ -3,8 +3,8 @@
#ifndef BOTAN_BUILD_CONFIG_H__
#define 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}' -* This file was automatically generated %{timestamp} UTC by
+%{user} ran '%{command_line}' -* %{user}@%{hostname} running '%{command_line}'
+* This file was automatically generated by
Target +* %{user} running '%{command_line}'
------- *
* Target
* - Compiler: %{cc} %{lib_opt} %{mach_opt}

12
Botan-qt_thread_support.patch
View File

@ -1,9 +1,9 @@
Index: src/mutex/qt_mutex/mux_qt.cpp 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.orig 2011-06-20 15:52:09.000000000 +0200
+++ src/mutex/qt_mutex/mux_qt.cpp 2010-09-01 18:50:46.546845986 +0200 +++ src/mutex/qt_mutex/mux_qt.cpp 2011-06-21 14:56:14.738269417 +0200
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
#include <botan/mux_qt.h> #include <botan/internal/mux_qt.h>
#include <qmutex.h> #include <qmutex.h>
-#if !defined(QT_THREAD_SUPPORT) -#if !defined(QT_THREAD_SUPPORT)
@ -13,9 +13,9 @@ Index: src/mutex/qt_mutex/mux_qt.cpp
Index: src/mutex/qt_mutex/info.txt 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.orig 2011-06-20 15:52:09.000000000 +0200
+++ src/mutex/qt_mutex/info.txt 2010-09-01 20:07:41.039257575 +0200 +++ src/mutex/qt_mutex/info.txt 2011-06-21 14:55:17.957040061 +0200
@@ -14,5 +14,5 @@ mux_qt.h @@ -13,5 +13,5 @@ mux_qt.h
# I think we want to always use qt-mt, not qt -- not much point in supporting # I think we want to always use qt-mt, not qt -- not much point in supporting
# mutexes in a single threaded application, after all. # mutexes in a single threaded application, after all.
<libs> <libs>

41
Botan.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Jun 22 16:10:32 CEST 2011 - pth@suse.de
- Fix Requires for devel package.
-------------------------------------------------------------------
Tue Jun 21 16:53:15 CEST 2011 - pth@suse.de
- Devel package now is versioned so multiple devel packages may
be installed in parallel.
- Devel package renamed back to Botan-devel to keep rpmlint from
thinking it is a library package ...
- Update to 1.10.0:
New Features:
* SSL (SSLv3, TLS 1.0, and TLS 1.1 are currently supported)
* GOST 34.10-2001 signature scheme (a Russian ECC signature standard
analogous to ECDSA)
* The SHA-3 candidates Keccak and Blue Midnight Wish
* Bcrypt password hashing
* XSalsa20
* AES key wrapping
* Comb4P hash combinator.
Other Changes:
* The block cipher interface now exposes any possible parallelism
available to the implementation, and XTS, CTR, and CBC modes have been
changed to use them.
* SIMD implementations of Serpent, XTEA, Noekeon, and IDEA have been
added, as has an implementation of AES using SSSE3 which runs both in
constant time and, on recent processors, significantly faster than the
usual table based implementation. There have also been numerous
optimizations to elliptic curves.
* The documentation, previously written in LaTeX, is now in
reStructuredText, which is converted into HTML with Sphinx. This new
format is significantly easier to write, encouraging more documentation
to be written and updated. And, indeed, a number of features never
before documented are now described in the manual.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 1 16:38:40 CEST 2010 - pth@suse.de Wed Sep 1 16:38:40 CEST 2010 - pth@suse.de

54
Botan.spec
View File

@ -17,10 +17,11 @@
# norootforbuild # norootforbuild
%define version_suffix 1_8_2 %define version_suffix 1_10-0
%define short_version 1.10
Name: Botan Name: Botan
Version: 1.8.10 Version: 1.10.0
Release: 1 Release: 1
Url: http://botan.randombit.net Url: http://botan.randombit.net
Summary: A C++ Crypto Library Summary: A C++ Crypto Library
@ -28,12 +29,13 @@ License: BSD3c
AutoReqProv: on AutoReqProv: on
Prefix: /usr Prefix: /usr
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Source: %{name}-%{version}.tar.bz2 Source: Botan-1.10.0.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
Patch4: Botan-no-buildtime.patch Patch4: Botan-no-buildtime.patch
Patch5: Botan-qt_thread_support.patch Patch5: Botan-qt_thread_support.patch
Patch6: Botan-fix_pkgconfig.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
@ -70,18 +72,18 @@ Authors:
-------- --------
Jack Lloyd <lloyd@randombit.net> Jack Lloyd <lloyd@randombit.net>
%package -n libbotan-devel %package %{short_version}-devel
License: BSD3c License: BSD3c
Summary: Development files for Botan Summary: Development files for Botan
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libbotan-1_8_2 = %{version}
Requires: gmp-devel libbz2-devel Requires: gmp-devel libbz2-devel
Provides: Botan-devel = %{version} Provides: Botan-devel = %{version}, libbotan-devel = %{version}
Obsoletes: Botan-devel < %{version} Obsoletes: Botan-devel < %{version}, libbotan-devel < %{version}
Requires: libbotan-%{version_suffix} = %{version} Requires: libbotan-%{version_suffix} = %{version}
%define botan_docdir %{_defaultdocdir}/%{name}
%description -n libbotan-devel %define botan_docdir %{_datadir}/doc/packages/%{name}-%{version}
%description %{short_version}-devel
This package contains the header files and libraries needed to develop This package contains the header files and libraries needed to develop
programs that use the Botan library. programs that use the Botan library.
@ -98,12 +100,13 @@ Authors:
%patch2 %patch2
%patch4 %patch4
%patch5 %patch5
%patch6
%build %build
export RPM_OPT_FLAGS export RPM_OPT_FLAGS
%define common_config_flags --libdir=%{_lib} --with-bzip2 --with-zlib --with-gnump --with-openssl %define common_config_flags --libdir=%{_lib} --with-bzip2 --with-zlib --with-gnump --with-openssl
./configure.py --prefix=/usr --libdir=%{_libdir} \ ./configure.py --prefix=/usr --libdir=%{_libdir} \
--docdir=%{_defaultdocdir}/%{name} \ --docdir=%{_defaultdocdir} \
--includedir=%{_includedir} \ --includedir=%{_includedir} \
--with-bzip2 \ --with-bzip2 \
--with-zlib \ --with-zlib \
@ -116,10 +119,7 @@ make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS -I/usr/include/Qt"
%install %install
%makeinstall %makeinstall
mv %{buildroot}/%{botan_docdir}/%{name}-%{version}/* %{buildroot}/%{botan_docdir}/ rm -f %{buildroot}/%{_libdir}/libbotan*.a
rm -rf %{buildroot}/usr/share/doc/Botan-%{version}
rm -f %{buildroot}/%{botan_docdir}/fips140.tex
rm -f %{buildroot}/%{_libdir}/libbotan.a
%post -n libbotan-%{version_suffix} -p /sbin/ldconfig %post -n libbotan-%{version_suffix} -p /sbin/ldconfig
@ -128,26 +128,14 @@ rm -f %{buildroot}/%{_libdir}/libbotan.a
%files -n libbotan-%{version_suffix} %files -n libbotan-%{version_suffix}
%defattr(-,root,root) %defattr(-,root,root)
%docdir %{botan_docdir} %docdir %{botan_docdir}
%{botan_docdir}/license.txt %{botan_docdir}/*
%{botan_docdir}/readme.txt %{_libdir}/libbotan-%{short_version}.so.*
%{botan_docdir}/log.txt
%{botan_docdir}/thanks.txt
%{botan_docdir}/credits.txt
%{botan_docdir}/pgpkeys.asc
#%{botan_docdir}/info.txt
%{_libdir}/libbotan-*.so
%files -n libbotan-devel %files %{short_version}-devel
%defattr(-,root,root) %defattr(-,root,root)
%docdir %{botan_docdir} %{_libdir}/libbotan-%{short_version}.so
%dir %{botan_docdir} %{_libdir}/pkgconfig/botan-%{short_version}.pc
%{botan_docdir}/api.pdf %{_includedir}/botan-%{short_version}
%{botan_docdir}/api.tex %{_bindir}/botan-config-%{short_version}
%{botan_docdir}/tutorial.pdf
%{botan_docdir}/tutorial.tex
%{_libdir}/libbotan.so
%{_libdir}/pkgconfig/botan-1.8.pc
%{_includedir}/botan/
%{_bindir}/botan-config
%changelog %changelog