Hello community, here is the log from the commit of package Botan for openSUSE:Factory checked in at Thu Jun 23 11:44:10 CEST 2011.
-------- --- Botan/Botan.changes 2010-09-02 12:07:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/Botan/Botan.changes 2011-06-22 16:10:56.000000000 +0200 @@ -1,0 +2,41 @@ +Wed Jun 22 16:10:32 CEST 2011 - p...@suse.de + +- Fix Requires for devel package. + +------------------------------------------------------------------- +Tue Jun 21 16:53:15 CEST 2011 - p...@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. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Botan-1.8.10.tar.bz2 New: ---- Botan-1.10.0.tar.bz2 Botan-fix_pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Botan.spec ++++++ --- /var/tmp/diff_new_pack.QKfJJN/_old 2011-06-23 11:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.QKfJJN/_new 2011-06-23 11:42:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package Botan (Version 1.8.10) +# spec file for package Botan # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,11 @@ # norootforbuild -%define version_suffix 1_8_2 +%define version_suffix 1_10-0 +%define short_version 1.10 Name: Botan -Version: 1.8.10 +Version: 1.10.0 Release: 1 Url: http://botan.randombit.net Summary: A C++ Crypto Library @@ -28,12 +29,13 @@ AutoReqProv: on Prefix: /usr Group: Development/Libraries/C and C++ -Source: %{name}-%{version}.tar.bz2 +Source: Botan-1.10.0.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 +Patch6: Botan-fix_pkgconfig.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 @@ -54,6 +56,7 @@ %package -n libbotan-%{version_suffix} + License: BSD3c Summary: A C++ Crypto Library Group: Development/Libraries/C and C++ @@ -70,18 +73,19 @@ -------- Jack Lloyd <ll...@randombit.net> -%package -n libbotan-devel +%package %{short_version}-devel + License: BSD3c Summary: Development files for Botan Group: Development/Libraries/C and C++ -Requires: libbotan-1_8_2 = %{version} Requires: gmp-devel libbz2-devel -Provides: Botan-devel = %{version} -Obsoletes: Botan-devel < %{version} +Provides: Botan-devel = %{version}, libbotan-devel = %{version} +Obsoletes: Botan-devel < %{version}, libbotan-devel < %{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 programs that use the Botan library. @@ -98,12 +102,13 @@ %patch2 %patch4 %patch5 +%patch6 %build export RPM_OPT_FLAGS %define common_config_flags --libdir=%{_lib} --with-bzip2 --with-zlib --with-gnump --with-openssl ./configure.py --prefix=/usr --libdir=%{_libdir} \ - --docdir=%{_defaultdocdir}/%{name} \ + --docdir=%{_defaultdocdir} \ --includedir=%{_includedir} \ --with-bzip2 \ --with-zlib \ @@ -116,10 +121,7 @@ %install %makeinstall -mv %{buildroot}/%{botan_docdir}/%{name}-%{version}/* %{buildroot}/%{botan_docdir}/ -rm -rf %{buildroot}/usr/share/doc/Botan-%{version} -rm -f %{buildroot}/%{botan_docdir}/fips140.tex -rm -f %{buildroot}/%{_libdir}/libbotan.a +rm -f %{buildroot}/%{_libdir}/libbotan*.a %post -n libbotan-%{version_suffix} -p /sbin/ldconfig @@ -128,26 +130,14 @@ %files -n libbotan-%{version_suffix} %defattr(-,root,root) %docdir %{botan_docdir} -%{botan_docdir}/license.txt -%{botan_docdir}/readme.txt -%{botan_docdir}/log.txt -%{botan_docdir}/thanks.txt -%{botan_docdir}/credits.txt -%{botan_docdir}/pgpkeys.asc -#%{botan_docdir}/info.txt -%{_libdir}/libbotan-*.so +%{botan_docdir}/* +%{_libdir}/libbotan-%{short_version}.so.* -%files -n libbotan-devel +%files %{short_version}-devel %defattr(-,root,root) -%docdir %{botan_docdir} -%dir %{botan_docdir} -%{botan_docdir}/api.pdf -%{botan_docdir}/api.tex -%{botan_docdir}/tutorial.pdf -%{botan_docdir}/tutorial.tex -%{_libdir}/libbotan.so -%{_libdir}/pkgconfig/botan-1.8.pc -%{_includedir}/botan/ -%{_bindir}/botan-config +%{_libdir}/libbotan-%{short_version}.so +%{_libdir}/pkgconfig/botan-%{short_version}.pc +%{_includedir}/botan-%{short_version} +%{_bindir}/botan-config-%{short_version} %changelog ++++++ Botan-1.8.10.tar.bz2 -> Botan-1.10.0.tar.bz2 ++++++ ++++ 194194 lines of diff (skipped) ++++++ Botan-fix_install_paths.patch ++++++ --- /var/tmp/diff_new_pack.QKfJJN/_old 2011-06-23 11:42:34.000000000 +0200 +++ /var/tmp/diff_new_pack.QKfJJN/_new 2011-06-23 11:42:35.000000000 +0200 @@ -1,26 +1,44 @@ 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 2009-12-11 19:10:50.687527483 +0100 -@@ -19,7 +19,7 @@ VERSION = %{version} - ################################################## - DESTDIR = %{prefix} +--- src/build-data/makefile/unix.in.orig 2011-06-21 17:33:59.550471797 +0200 ++++ src/build-data/makefile/unix.in 2011-06-21 17:35:52.643901474 +0200 +@@ -12,12 +12,12 @@ VERSION = %{version} + SERIES = %{version_major}.%{version_minor} + + # Installation Settings +-DESTDIR = %{prefix} ++DESTDIR = -BINDIR = $(DESTDIR)/bin -+BINDIR = $(DESTDIR)/%{prefix}/bin - LIBDIR = $(DESTDIR)/%{libdir} - HEADERDIR = $(DESTDIR)/%{includedir}/botan - DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) +-LIBDIR = $(DESTDIR)/%{libdir} +-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan +-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 =================================================================== ---- src/build-data/makefile/unix_shr.in.orig 2009-11-03 19:02:17.000000000 +0100 -+++ src/build-data/makefile/unix_shr.in 2009-12-11 19:10:40.239524087 +0100 -@@ -22,7 +22,7 @@ SO_VERSION = %{so_version} - ################################################## - DESTDIR = %{prefix} +--- src/build-data/makefile/unix_shr.in.orig 2011-06-21 17:33:59.550471797 +0200 ++++ src/build-data/makefile/unix_shr.in 2011-06-21 17:35:50.812926900 +0200 +@@ -14,12 +14,12 @@ VERSION = %{version} + SERIES = %{version_major}.%{version_minor} + + # Installation Settings +-DESTDIR = %{prefix} ++DESTDIR = -BINDIR = $(DESTDIR)/bin -+BINDIR = $(DESTDIR)/%{prefix}/bin - LIBDIR = $(DESTDIR)/%{libdir} - HEADERDIR = $(DESTDIR)/%{includedir}/botan - DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) +-LIBDIR = $(DESTDIR)/%{libdir} +-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan +-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} ++++++ Botan-fix_pkgconfig.patch ++++++ 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 ++++++ Botan-inttypes.patch ++++++ --- /var/tmp/diff_new_pack.QKfJJN/_old 2011-06-23 11:42:35.000000000 +0200 +++ /var/tmp/diff_new_pack.QKfJJN/_new 2011-06-23 11:42:35.000000000 +0200 @@ -1,27 +1,46 @@ Index: src/utils/types.h =================================================================== ---- src/utils/types.h.orig 2009-11-03 19:02:17.000000000 +0100 -+++ src/utils/types.h 2009-11-23 18:18:51.924780607 +0100 -@@ -9,21 +9,22 @@ +--- src/utils/types.h.orig 2011-06-20 15:52:09.000000000 +0200 ++++ src/utils/types.h 2011-06-21 16:48:39.324325773 +0200 +@@ -9,8 +9,8 @@ #define BOTAN_TYPES_H__ #include <botan/build.h> +-#include <stddef.h> +- ++#include <cstddef> +#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 short u16bit; --typedef unsigned int u32bit; +typedef uint8_t byte; + + /** + * Typedef representing an unsigned 16-bit quantity + */ +-typedef unsigned short u16bit; +typedef uint16_t u16bit; + + /** + * Typedef representing an unsigned 32-bit quantity + */ +-typedef unsigned int u32bit; +typedef uint32_t u32bit; + /** + * Typedef representing a signed 32-bit quantity + */ -typedef signed int 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) typedef unsigned __long_long u64bit; #elif defined(__GNUG__) ++++++ Botan-no-buildtime.patch ++++++ --- /var/tmp/diff_new_pack.QKfJJN/_old 2011-06-23 11:42:35.000000000 +0200 +++ /var/tmp/diff_new_pack.QKfJJN/_new 2011-06-23 11:42:35.000000000 +0200 @@ -1,22 +1,15 @@ 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__ +--- src/build-data/buildh.in.orig 2011-06-20 15:52:09.000000000 +0200 ++++ src/build-data/buildh.in 2011-06-21 14:54:51.287402063 +0200 +@@ -3,8 +3,8 @@ #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 - ------- +-* This file was automatically generated %{timestamp} UTC by +-* %{user}@%{hostname} running '%{command_line}' ++* This file was automatically generated by ++* %{user} running '%{command_line}' + * + * Target + * - Compiler: %{cc} %{lib_opt} %{mach_opt} ++++++ Botan-qt_thread_support.patch ++++++ --- /var/tmp/diff_new_pack.QKfJJN/_old 2011-06-23 11:42:35.000000000 +0200 +++ /var/tmp/diff_new_pack.QKfJJN/_new 2011-06-23 11:42:35.000000000 +0200 @@ -1,9 +1,9 @@ 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 +--- src/mutex/qt_mutex/mux_qt.cpp.orig 2011-06-20 15:52:09.000000000 +0200 ++++ src/mutex/qt_mutex/mux_qt.cpp 2011-06-21 14:56:14.738269417 +0200 @@ -9,7 +9,7 @@ - #include <botan/mux_qt.h> + #include <botan/internal/mux_qt.h> #include <qmutex.h> -#if !defined(QT_THREAD_SUPPORT) @@ -13,9 +13,9 @@ 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 +--- src/mutex/qt_mutex/info.txt.orig 2011-06-20 15:52:09.000000000 +0200 ++++ src/mutex/qt_mutex/info.txt 2011-06-21 14:55:17.957040061 +0200 +@@ -13,5 +13,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. <libs> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
