Hello community,
here is the log from the commit of package Botan
checked in at Thu Jun 21 22:06:21 CEST 2007.
--------
--- Botan/Botan.changes 2007-04-23 18:41:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/Botan/Botan.changes 2007-06-21 01:02:58.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 21 01:02:20 CEST 2007 - dmueller@suse.de
+
+- update to 1.6.2:
+ * Remove a call to abort() that crept into production
+
+-------------------------------------------------------------------
Old:
----
Botan-1.6.1.tar.bz2
New:
----
Botan-1.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Botan.spec ++++++
--- /var/tmp/diff_new_pack.Pg2202/_old 2007-06-21 22:06:14.000000000 +0200
+++ /var/tmp/diff_new_pack.Pg2202/_new 2007-06-21 22:06:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package Botan (Version 1.6.1)
+# spec file for package Botan (Version 1.6.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -42,8 +42,8 @@
BuildRequires: gcc-c++ gmp-devel libbz2-devel
URL: http://botan.randombit.net
Summary: A C++ Crypto Library
-Version: 1.6.1
-Release: 8
+Version: 1.6.2
+Release: 1
License: BSD License and BSD-like
Autoreqprov: on
Prefix: /usr
@@ -149,6 +149,9 @@
%{_bindir}/botan-config
%changelog
+* Thu Jun 21 2007 - dmueller@suse.de
+- update to 1.6.2:
+ * Remove a call to abort() that crept into production
* Mon Apr 23 2007 - dmueller@suse.de
- fix -devel package requires
* Sat Mar 24 2007 - aj@suse.de
++++++ Botan-1.6.1.tar.bz2 -> Botan-1.6.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/configure.pl new/Botan-1.6.2/configure.pl
--- old/Botan-1.6.1/configure.pl 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/configure.pl 2007-03-24 19:51:37.000000000 +0100
@@ -9,7 +9,7 @@
my $MAJOR_VERSION = 1;
my $MINOR_VERSION = 6;
-my $PATCH_VERSION = 1;
+my $PATCH_VERSION = 2;
my $VERSION_STRING = "$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION";
@@ -1583,8 +1583,9 @@
$cpu = 'core2duo' if($cpuinfo =~ /intel\(r\) core\(tm\)2/);
- $cpu = 'amd64' if($cpuinfo =~ /athlon64/);
- $cpu = 'amd64' if($cpuinfo =~ /opteron/);
+ $cpu = 'athlon64' if($cpuinfo =~ /athlon64/);
+ $cpu = 'athlon64' if($cpuinfo =~ /athlon\(tm\) 64/);
+ $cpu = 'opteron' if($cpuinfo =~ /opteron/);
# The 32-bit SPARC stuff is impossible to match to arch type easily, and
# anyway the uname stuff will pick up that it's a SPARC so it doesn't
Files old/Botan-1.6.1/doc/api.pdf and new/Botan-1.6.2/doc/api.pdf differ
Files old/Botan-1.6.1/doc/building.pdf and new/Botan-1.6.2/doc/building.pdf differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/doc/credits.txt new/Botan-1.6.2/doc/credits.txt
--- old/Botan-1.6.1/doc/credits.txt 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/doc/credits.txt 2007-03-24 19:51:37.000000000 +0100
@@ -33,7 +33,7 @@
W: http://www.randombit.net/
P: 3F69 2E64 6D92 3BBE E7AE 9258 5C0F 96E8 4EC1 6D6B
D: Original author
-S: Washington DC, USA
+S: New York, NY
N: Luca Piccarreta
E: luca.piccarreta@gmail.com
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/doc/log.txt new/Botan-1.6.2/doc/log.txt
--- old/Botan-1.6.1/doc/log.txt 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/doc/log.txt 2007-03-24 19:51:37.000000000 +0100
@@ -1,4 +1,9 @@
+* 1.6.2, March 24, 2007
+ - Fix autodection on Athlon64s running Linux
+ - Fix builds on QNX and compilers using STLport
+ - Remove a call to abort() that crept into production
+
* 1.6.1, January 20, 2007
- Fix some base64 decoder bugs
- Add a new option to base64 encoding, to always append a newline
Files old/Botan-1.6.1/doc/tutorial.pdf and new/Botan-1.6.2/doc/tutorial.pdf differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/misc/Botan-1.6.1.spec new/Botan-1.6.2/misc/Botan-1.6.1.spec
--- old/Botan-1.6.1/misc/Botan-1.6.1.spec 2007-01-20 11:57:36.000000000 +0100
+++ new/Botan-1.6.2/misc/Botan-1.6.1.spec 1970-01-01 01:00:00.000000000 +0100
@@ -1,175 +0,0 @@
-# Botan base spec file
-
-# Note that some of the commands in here assume a GNU toolset, which is
-# unfortunate and should probably be fixed.
-
-##################################################
-# Version numbers and config options #
-##################################################
-%define MAJOR 1
-%define MINOR 6
-%define PATCH 1
-
-%define ONLY_BASE_MODS 0
-
-##################################################
-# Hardware restrictions on various modules #
-##################################################
-%define USE_TM_HARD i586 i686 athlon x86_64 ppc ppc64 alpha sparcv9 sparc64
-%define MP64_ARCH alpha ppc64 ia64 sparc64
-
-##################################################
-# Module settings #
-##################################################
-%define BASE_MODS alloc_mmap,ml_unix,es_egd,es_ftw,es_unix,fd_unix,tm_unix
-%define EXTRA_MODS comp_bzip2,comp_zlib,mux_pthr,tm_posix,eng_gmp
-
-%ifarch %{USE_TM_HARD}
- %{expand: %%define EXTRA_MODS %{EXTRA_MODS},tm_hard}
-%endif
-
-%ifarch %{USE_MP64}
- %{expand: %%define EXTRA_MODS %{EXTRA_MODS},mp_asm64}
-%endif
-
-%ifarch x86
- %{expand: %%define EXTRA_MODS %{EXTRA_MODS},mp_ia32,alg_ia32}
-%endif
-
-%ifarch x86_64
- %{expand: %%define EXTRA_MODS %{EXTRA_MODS},mp_amd64,alg_amd64}
-%endif
-
-%if %{ONLY_BASE_MODS}
- %define MODULES %{BASE_MODS}
-%else
- %define MODULES %{BASE_MODS},%{EXTRA_MODS}
-%endif
-
-##################################################
-# Descriptions #
-##################################################
-%define VERSION %{MAJOR}.%{MINOR}.%{PATCH}
-
-Name: Botan
-Summary: A C++ crypto library
-Version: %{VERSION}
-Release: 1
-License: BSD
-Group: System Environment/Libraries
-Source: http://botan.randombit.net/files/%{name}-%{VERSION}.tgz
-URL: http://botan.randombit.net/
-Packager: Jack Lloyd
-Prefix: /usr
-BuildRequires: perl make
-
-%if ! %{ONLY_BASE_MODS}
-Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1
-BuildRequires: zlib-devel, bzip2-devel >= 1.0.2, gmp-devel >= 4.1
-%endif
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-Botan is a C++ library which provides support for many common
-cryptographic operations, including encryption, authentication, and
-X.509v3 certificates and CRLs. A wide variety of algorithms is
-supported, including RSA, DSA, DES, AES, MD5, and SHA-1.
-
-%package devel
-Summary: Development files for Botan
-Group: Development/Libraries
-Requires: Botan = %{VERSION}
-%description devel
-This package contains the header files and libraries needed to develop
-programs that use the Botan library.
-
-##################################################
-# Main Logic #
-##################################################
-%prep
-%setup -n Botan-%{VERSION}
-
-%build
-./configure.pl --noauto --modules=%{MODULES} gcc-%{_target_os}-%{_target_cpu}
-make shared static
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%install
-ROOT="$RPM_BUILD_ROOT/usr"
-make OWNER=`id -u` GROUP=`id -g` INSTALLROOT="$ROOT" install
-
-# Need this since we're installing shared libs...
-%post
-if ! grep "^$RPM_INSTALL_PREFIX/lib$" /etc/ld.so.conf 2>&1 >/dev/null
-then
- echo "$RPM_INSTALL_PREFIX/lib" >>/etc/ld.so.conf
-fi
-/sbin/ldconfig -X
-
-%postun
-RMDIR_IGNORE_NONEMPTY="rmdir --ignore-fail-on-non-empty"
-/sbin/ldconfig -X
-if [ -d $RPM_INSTALL_PREFIX/share/doc/Botan-%{VERSION} ]; then
- $RMDIR_IGNORE_NONEMPTY $RPM_INSTALL_PREFIX/share/doc/Botan-%{VERSION}
-fi
-
-%postun devel
-RMDIR_IGNORE_NONEMPTY="rmdir --ignore-fail-on-non-empty"
-if [ -d $RPM_INSTALL_PREFIX/include/botan ]; then
- $RMDIR_IGNORE_NONEMPTY $RPM_INSTALL_PREFIX/include/botan
-fi
-
-##################################################
-# File Lists #
-##################################################
-%files
-%defattr(-,root,root)
-%docdir /usr/share/doc/Botan-%{VERSION}/
-/usr/share/doc/Botan-%{VERSION}/license.txt
-/usr/share/doc/Botan-%{VERSION}/readme.txt
-/usr/share/doc/Botan-%{VERSION}/log.txt
-/usr/share/doc/Botan-%{VERSION}/thanks.txt
-/usr/share/doc/Botan-%{VERSION}/credits.txt
-/usr/share/doc/Botan-%{VERSION}/pgpkeys.asc
-/usr/share/doc/Botan-%{VERSION}/info.txt
-/usr/lib/libbotan-%{MAJOR}.%{MINOR}.%{PATCH}.so
-
-%files devel
-%defattr(-,root,root)
-%docdir /usr/share/doc/Botan-%{VERSION}/
-/usr/share/doc/Botan-%{VERSION}/api.tex
-/usr/share/doc/Botan-%{VERSION}/api.pdf
-/usr/share/doc/Botan-%{VERSION}/tutorial.tex
-/usr/share/doc/Botan-%{VERSION}/tutorial.pdf
-/usr/share/doc/Botan-%{VERSION}/todo.txt
-/usr/lib/libbotan.so
-/usr/lib/libbotan.a
-/usr/include/botan/
-/usr/bin/botan-config
-
-##################################################
-# Changelog #
-##################################################
-%changelog
-* Wed Mar 17 2004 lloyd@randombit.net
- - Changed EXTRA_MODS to include eng_gmp, not mp_gmp
- - Requires: included uneeded stuff if ONLY_BASE_MODS was used
-
-* Sun Feb 1 2004 lloyd@randombit.net
- - The Source: tag pointed to nowhere
- - Removed the FIPS 140 stuff, it was messy and broken
-
-* Mon Dec 1 2003 lloyd@randombit.net
- - Cleaned up module handling
- - Added a preliminary FIPS 140-2 toggle
- - Use %defattr
-
-* Tue Nov 30 2003 lloyd@randombit.net
- - Default to installing into /usr instead of /usr/local
- - Use tm_hard on sparcv9
-
-* Tue Nov 23 2003 lloyd@randombit.net
- - Cleaned up the declaration of TIMERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/misc/Botan-1.6.2.spec new/Botan-1.6.2/misc/Botan-1.6.2.spec
--- old/Botan-1.6.1/misc/Botan-1.6.2.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/Botan-1.6.2/misc/Botan-1.6.2.spec 2007-03-24 19:51:40.000000000 +0100
@@ -0,0 +1,175 @@
+# Botan base spec file
+
+# Note that some of the commands in here assume a GNU toolset, which is
+# unfortunate and should probably be fixed.
+
+##################################################
+# Version numbers and config options #
+##################################################
+%define MAJOR 1
+%define MINOR 6
+%define PATCH 2
+
+%define ONLY_BASE_MODS 0
+
+##################################################
+# Hardware restrictions on various modules #
+##################################################
+%define USE_TM_HARD i586 i686 athlon x86_64 ppc ppc64 alpha sparcv9 sparc64
+%define MP64_ARCH alpha ppc64 ia64 sparc64
+
+##################################################
+# Module settings #
+##################################################
+%define BASE_MODS alloc_mmap,ml_unix,es_egd,es_ftw,es_unix,fd_unix,tm_unix
+%define EXTRA_MODS comp_bzip2,comp_zlib,mux_pthr,tm_posix,eng_gmp
+
+%ifarch %{USE_TM_HARD}
+ %{expand: %%define EXTRA_MODS %{EXTRA_MODS},tm_hard}
+%endif
+
+%ifarch %{USE_MP64}
+ %{expand: %%define EXTRA_MODS %{EXTRA_MODS},mp_asm64}
+%endif
+
+%ifarch x86
+ %{expand: %%define EXTRA_MODS %{EXTRA_MODS},mp_ia32,alg_ia32}
+%endif
+
+%ifarch x86_64
+ %{expand: %%define EXTRA_MODS %{EXTRA_MODS},mp_amd64,alg_amd64}
+%endif
+
+%if %{ONLY_BASE_MODS}
+ %define MODULES %{BASE_MODS}
+%else
+ %define MODULES %{BASE_MODS},%{EXTRA_MODS}
+%endif
+
+##################################################
+# Descriptions #
+##################################################
+%define VERSION %{MAJOR}.%{MINOR}.%{PATCH}
+
+Name: Botan
+Summary: A C++ crypto library
+Version: %{VERSION}
+Release: 1
+License: BSD
+Group: System Environment/Libraries
+Source: http://botan.randombit.net/files/%{name}-%{VERSION}.tgz
+URL: http://botan.randombit.net/
+Packager: Jack Lloyd
+Prefix: /usr
+BuildRequires: perl make
+
+%if ! %{ONLY_BASE_MODS}
+Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1
+BuildRequires: zlib-devel, bzip2-devel >= 1.0.2, gmp-devel >= 4.1
+%endif
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+Botan is a C++ library which provides support for many common
+cryptographic operations, including encryption, authentication, and
+X.509v3 certificates and CRLs. A wide variety of algorithms is
+supported, including RSA, DSA, DES, AES, MD5, and SHA-1.
+
+%package devel
+Summary: Development files for Botan
+Group: Development/Libraries
+Requires: Botan = %{VERSION}
+%description devel
+This package contains the header files and libraries needed to develop
+programs that use the Botan library.
+
+##################################################
+# Main Logic #
+##################################################
+%prep
+%setup -n Botan-%{VERSION}
+
+%build
+./configure.pl --noauto --modules=%{MODULES} gcc-%{_target_os}-%{_target_cpu}
+make shared static
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%install
+ROOT="$RPM_BUILD_ROOT/usr"
+make OWNER=`id -u` GROUP=`id -g` INSTALLROOT="$ROOT" install
+
+# Need this since we're installing shared libs...
+%post
+if ! grep "^$RPM_INSTALL_PREFIX/lib$" /etc/ld.so.conf 2>&1 >/dev/null
+then
+ echo "$RPM_INSTALL_PREFIX/lib" >>/etc/ld.so.conf
+fi
+/sbin/ldconfig -X
+
+%postun
+RMDIR_IGNORE_NONEMPTY="rmdir --ignore-fail-on-non-empty"
+/sbin/ldconfig -X
+if [ -d $RPM_INSTALL_PREFIX/share/doc/Botan-%{VERSION} ]; then
+ $RMDIR_IGNORE_NONEMPTY $RPM_INSTALL_PREFIX/share/doc/Botan-%{VERSION}
+fi
+
+%postun devel
+RMDIR_IGNORE_NONEMPTY="rmdir --ignore-fail-on-non-empty"
+if [ -d $RPM_INSTALL_PREFIX/include/botan ]; then
+ $RMDIR_IGNORE_NONEMPTY $RPM_INSTALL_PREFIX/include/botan
+fi
+
+##################################################
+# File Lists #
+##################################################
+%files
+%defattr(-,root,root)
+%docdir /usr/share/doc/Botan-%{VERSION}/
+/usr/share/doc/Botan-%{VERSION}/license.txt
+/usr/share/doc/Botan-%{VERSION}/readme.txt
+/usr/share/doc/Botan-%{VERSION}/log.txt
+/usr/share/doc/Botan-%{VERSION}/thanks.txt
+/usr/share/doc/Botan-%{VERSION}/credits.txt
+/usr/share/doc/Botan-%{VERSION}/pgpkeys.asc
+/usr/share/doc/Botan-%{VERSION}/info.txt
+/usr/lib/libbotan-%{MAJOR}.%{MINOR}.%{PATCH}.so
+
+%files devel
+%defattr(-,root,root)
+%docdir /usr/share/doc/Botan-%{VERSION}/
+/usr/share/doc/Botan-%{VERSION}/api.tex
+/usr/share/doc/Botan-%{VERSION}/api.pdf
+/usr/share/doc/Botan-%{VERSION}/tutorial.tex
+/usr/share/doc/Botan-%{VERSION}/tutorial.pdf
+/usr/share/doc/Botan-%{VERSION}/todo.txt
+/usr/lib/libbotan.so
+/usr/lib/libbotan.a
+/usr/include/botan/
+/usr/bin/botan-config
+
+##################################################
+# Changelog #
+##################################################
+%changelog
+* Wed Mar 17 2004 lloyd@randombit.net
+ - Changed EXTRA_MODS to include eng_gmp, not mp_gmp
+ - Requires: included uneeded stuff if ONLY_BASE_MODS was used
+
+* Sun Feb 1 2004 lloyd@randombit.net
+ - The Source: tag pointed to nowhere
+ - Removed the FIPS 140 stuff, it was messy and broken
+
+* Mon Dec 1 2003 lloyd@randombit.net
+ - Cleaned up module handling
+ - Added a preliminary FIPS 140-2 toggle
+ - Use %defattr
+
+* Tue Nov 30 2003 lloyd@randombit.net
+ - Default to installing into /usr instead of /usr/local
+ - Use tm_hard on sparcv9
+
+* Tue Nov 23 2003 lloyd@randombit.net
+ - Cleaned up the declaration of TIMERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/misc/config/cc/gcc new/Botan-1.6.2/misc/config/cc/gcc
--- old/Botan-1.6.1/misc/config/cc/gcc 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/misc/config/cc/gcc 2007-03-24 19:51:37.000000000 +0100
@@ -79,7 +79,7 @@
openbsd -> "-pthread"
freebsd -> "-pthread"
netbsd -> "-pthread"
-qnx -> "-fexceptions"
+qnx -> "-fexceptions -D_QNX_SOURCE"
<os>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/readme.txt new/Botan-1.6.2/readme.txt
--- old/Botan-1.6.1/readme.txt 2007-01-20 11:57:31.000000000 +0100
+++ new/Botan-1.6.2/readme.txt 2007-03-24 19:51:37.000000000 +0100
@@ -1,5 +1,5 @@
-This is Botan 1.6.1.
+This is Botan 1.6.2
Botan 1.6 is mostly compatible with Botan 1.4, and many applications
written against 1.4 will work against 1.6 without any modifications.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/src/libstate.cpp new/Botan-1.6.2/src/libstate.cpp
--- old/Botan-1.6.1/src/libstate.cpp 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/src/libstate.cpp 2007-03-24 19:51:37.000000000 +0100
@@ -31,10 +31,7 @@
Library_State& global_state()
{
if(!global_lib_state)
- {
- abort();
throw Invalid_State("Library was not initialized correctly");
- }
return (*global_lib_state);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/src/pkcs8.cpp new/Botan-1.6.2/src/pkcs8.cpp
--- old/Botan-1.6.1/src/pkcs8.cpp 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/src/pkcs8.cpp 2007-03-24 19:51:37.000000000 +0100
@@ -24,23 +24,17 @@
* Get info from an EncryptedPrivateKeyInfo *
*************************************************/
SecureVector<byte> PKCS8_extract(DataSource& source,
- AlgorithmIdentifier& alg_id)
+ AlgorithmIdentifier& pbe_alg_id)
{
- SecureVector<byte> enc_pkcs8_key;
+ SecureVector<byte> key_data;
- try {
- BER_Decoder decoder(source);
- BER_Decoder sequence = decoder.start_cons(SEQUENCE);
- sequence.decode(alg_id);
- sequence.decode(enc_pkcs8_key, OCTET_STRING);
- sequence.verify_end();
- }
- catch(Decoding_Error)
- {
- throw PKCS8_Exception("Private key decoding failed");
- }
+ BER_Decoder(source)
+ .start_cons(SEQUENCE)
+ .decode(pbe_alg_id)
+ .decode(key_data, OCTET_STRING)
+ .verify_end();
- return enc_pkcs8_key;
+ return key_data;
}
/*************************************************
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Botan-1.6.1/src/x509_ca.cpp new/Botan-1.6.2/src/x509_ca.cpp
--- old/Botan-1.6.1/src/x509_ca.cpp 2007-01-20 11:57:30.000000000 +0100
+++ new/Botan-1.6.2/src/x509_ca.cpp 2007-03-24 19:51:37.000000000 +0100
@@ -15,6 +15,7 @@
#include
#include <algorithm>
#include <typeinfo>
+#include <iterator>
#include <memory>
#include <set>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org