Hello community,
here is the log from the commit of package Botan for openSUSE:Factory
checked in at Wed Dec 16 16:54:15 CET 2009.
--------
--- Botan/Botan.changes 2008-04-07 16:46:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/Botan/Botan.changes 2009-12-16 13:13:59.000000000 +0100
@@ -1,0 +2,15 @@
+Wed Dec 16 13:13:16 CET 2009 - pth@suse.de
+
+- Remove patches that aren't needed anymore.
+
+-------------------------------------------------------------------
+Fri Dec 11 19:43:25 CET 2009 - pth@suse.de
+
+- Update to Botan-1.8.8:
+ - Alter Skein-512 to match the tweaked 1.2 specification
+ - Fix use of inline asm for access to x86 bswap function
+ - Allow building the library without AES enabled
+ - For the complete changes since 1.6.4 see log.txt in
+ /usr/share/doc/packages/Botan.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
Botan-1.6.4.tar.bz2
Botan-missing_sentinel.patch
Botan-no_cpu_tuning.patch
Botan-no_executable_stack.patch
Botan-no_fpermissive.patch
New:
----
Botan-1.8.8.tar.bz2
Botan-fix_install_paths.patch
Botan-use_rpm_opt_flags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Botan.spec ++++++
--- /var/tmp/diff_new_pack.A20Ba7/_old 2009-12-16 16:53:35.000000000 +0100
+++ /var/tmp/diff_new_pack.A20Ba7/_new 2009-12-16 16:53:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package Botan (Version 1.6.4)
+# spec file for package Botan (Version 1.8.8)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,58 +17,26 @@
# norootforbuild
-%define lib_pkg_name libbotan-1_6_4
+%define version_suffix 1_8_2
Name: Botan
-Version: 1.6.4
-Release: 4
-%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
+Version: 1.8.8
+Release: 1
Url: http://botan.randombit.net
Summary: A C++ Crypto Library
-License: BSD 3-Clause
+License: BSD3c
AutoReqProv: on
Prefix: /usr
Group: Development/Libraries/C and C++
Source: %{name}-%{version}.tar.bz2
+Source1: Botan-use_rpm_opt_flags.patch
Patch0: Botan-inttypes.patch
Patch1: Botan-ull_constants.patch.bz2
-Patch2: Botan-no_fpermissive.patch
-Patch3: Botan-no_cpu_tuning.patch
-Patch4: Botan-no_executable_stack.patch
-Patch5: Botan-missing_sentinel.patch
+Patch2: Botan-fix_install_paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if ! %{ONLY_BASE_MODS}
Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1
BuildRequires: bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel
-BuildRequires: gcc-c++ gmp-devel libbz2-devel
-%endif
+BuildRequires: gcc-c++ gmp-devel libbz2-devel openssl-devel python
%description
Botan is a C++ library that provides support for many common
@@ -82,15 +50,12 @@
--------
Jack Lloyd
-%package -n libbotan-1_6_4
-License: BSD 3-Clause
+%package -n libbotan-1_8_2
+License: BSD3c
Summary: A C++ Crypto Library
Group: Development/Libraries/C and C++
-#Rename done for openSUSE 11.0
-Provides: Botan = %{version}
-Obsoletes: Botan < %{version}
-%description -n libbotan-1_6_4
+%description -n libbotan-%{version_suffix}
Botan is a C++ library that provides support for many common
cryptographic operations, including encryption, authentication, and
X.509v3 certificates and CRLs. A wide variety of algorithms is
@@ -103,13 +68,15 @@
Jack Lloyd
%package -n libbotan-devel
-License: BSD 3-Clause
+License: BSD3c
Summary: Development files for Botan
Group: Development/Libraries/C and C++
Requires: libbotan-1_6_4 = %{version}
Requires: gmp-devel libbz2-devel
Provides: Botan-devel = %{version}
Obsoletes: Botan-devel < %{version}
+Requires: libbotan-%{version_suffix} = %{version}
+%define botan_docdir %{_defaultdocdir}/%{name}
%description -n libbotan-devel
This package contains the header files and libraries needed to develop
@@ -126,33 +93,33 @@
%patch0
%patch1
%patch2
-%patch3
-%patch4
-%patch5
%build
-%define botan_docdir %{_defaultdocdir}/%{name}
-%define common_config_flags --libdir=%{_lib} --noauto --modules=%{MODULES}
-%ifarch %arm
-./configure.pl %{common_config_flags} gcc-%{_target_os}-arm3
-%else
-./configure.pl %{common_config_flags} gcc-%{_target_os}-%{_target_cpu}
-%endif
-make LANG_FLAGS+="%{optflags}" DOCDIR=%{_defaultdocdir}/%{name} shared static
+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} \
+ --includedir=%{_includedir} \
+ --with-bzip2 \
+ --with-zlib \
+ --with-gnump \
+ --with-openssl \
+ --with-tr1-implementation=system
+patch -p0 -i %{S:1}
+make %{?_smp_mflags}
%install
-make DOCDIR=%{buildroot}/%{botan_docdir} OWNER=$(id -u) GROUP=$(id -g) INSTALLROOT="%{buildroot}%{prefix}" install
-rm -rf %{buildroot}/usr/share/doc/Botan-1.6.1
+%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
-%clean
-rm -rf %{buildroot}
-
-%post -n libbotan-1_6_4 -p /sbin/ldconfig
+%post -n libbotan-%{version_suffix} -p /sbin/ldconfig
-%postun -n libbotan-1_6_4 -p /sbin/ldconfig
+%postun -n libbotan-%{version_suffix} -p /sbin/ldconfig
-%files -n libbotan-1_6_4
+%files -n libbotan-%{version_suffix}
%defattr(-,root,root)
%docdir %{botan_docdir}
%{botan_docdir}/license.txt
@@ -161,7 +128,7 @@
%{botan_docdir}/thanks.txt
%{botan_docdir}/credits.txt
%{botan_docdir}/pgpkeys.asc
-%{botan_docdir}/info.txt
+#%{botan_docdir}/info.txt
%{_libdir}/libbotan-*.so
%files -n libbotan-devel
@@ -172,9 +139,8 @@
%{botan_docdir}/api.tex
%{botan_docdir}/tutorial.pdf
%{botan_docdir}/tutorial.tex
-%{botan_docdir}/todo.txt
%{_libdir}/libbotan.so
-%{_libdir}/libbotan.a
+%{_libdir}/pkgconfig/botan-1.8.pc
%{_includedir}/botan/
%{_bindir}/botan-config
++++++ Botan-1.6.4.tar.bz2 -> Botan-1.8.8.tar.bz2 ++++++
++++ 185396 lines of diff (skipped)
++++++ Botan-fix_install_paths.patch ++++++
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}
-BINDIR = $(DESTDIR)/bin
+BINDIR = $(DESTDIR)/%{prefix}/bin
LIBDIR = $(DESTDIR)/%{libdir}
HEADERDIR = $(DESTDIR)/%{includedir}/botan
DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
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}
-BINDIR = $(DESTDIR)/bin
+BINDIR = $(DESTDIR)/%{prefix}/bin
LIBDIR = $(DESTDIR)/%{libdir}
HEADERDIR = $(DESTDIR)/%{includedir}/botan
DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
++++++ Botan-inttypes.patch ++++++
--- /var/tmp/diff_new_pack.A20Ba7/_old 2009-12-16 16:53:36.000000000 +0100
+++ /var/tmp/diff_new_pack.A20Ba7/_new 2009-12-16 16:53:36.000000000 +0100
@@ -1,6 +1,8 @@
---- include/types.h
-+++ include/types.h
-@@ -7,21 +7,22 @@
+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 @@
#define BOTAN_TYPES_H__
#include
++++++ Botan-ull_constants.patch.bz2 ++++++
++++ 2197 lines (skipped)
++++ between Botan/Botan-ull_constants.patch.bz2
++++ and /mounts/work_src_done/STABLE/Botan/Botan-ull_constants.patch.bz2
++++++ Botan-use_rpm_opt_flags.patch ++++++
Index: Makefile
===================================================================
--- Makefile.orig 2009-11-27 15:09:06.000000000 +0100
+++ Makefile 2009-11-27 16:14:16.117516962 +0100
@@ -5,7 +5,7 @@ CXX = g++ -m64
LIB_OPT = -O2 -finline-functions
CHECK_OPT = -O2
MACH_OPT =
-LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long
+LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long $(RPM_OPT_FLAGS)
WARN_FLAGS = -W -Wall
SO_OBJ_FLAGS = -fPIC
SO_LINK_CMD = $(CXX) -shared -fPIC -Wl,-soname,$(SONAME)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org