dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-Botan-1.8.1.tgz

.gitignore

@@ -0,0 +1 @@
+Botan-1.8.8.tbz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: botan
-# $Id$
-NAME := botan
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

botan-1.8.8-binutils_lea_offset.patch

@@ -0,0 +1,28 @@
+#
+#
+# patch "src/hash/sha1_amd64/sha1_amd64_imp.S"
+#  from [dd263db10309950dec501dd9257a8df43cf6c6aa]
+#    to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962]
+#
+============================================================
+--- src/hash/sha1_amd64/sha1_amd64_imp.S	dd263db10309950dec501dd9257a8df43cf6c6aa
++++ src/hash/sha1_amd64/sha1_amd64_imp.S	ab1db7a394b41a1d3b9a63a6e8e1571e4671b962
+@@ -103,10 +103,16 @@ ALIGN;
+ 
+    subq $320, W
+ 
++/*
++* Using negative values for SHA-1 constants > 2^31 to work around
++* a bug in binutils not accepting large lea displacements.
++*   -0x70E44324 == 0x8F1BBCDC
++*   -0x359D3E2A == 0xCA62C1D6
++*/
+ #define MAGIC1 0x5A827999
+ #define MAGIC2 0x6ED9EBA1
+-#define MAGIC3 0x8F1BBCDC
+-#define MAGIC4 0xCA62C1D6
++#define MAGIC3 -0x70E44324
++#define MAGIC4 -0x359D3E2A
+ 
+ #define T %esi
+ #define T2 %eax

botan.spec

@@ -1,16 +1,17 @@
 Name:           botan
-Version:        1.8.1
-Release:        4%{?dist}
+Version:        1.8.8
+Release:        2%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
-Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
+Source0:        http://files.randombit.net/botan/Botan-%{version}.tbz
+Patch0:         botan-1.8.8-binutils_lea_offset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
-BuildRequires:  perl
+BuildRequires:  python
 
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
@@ -45,6 +46,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n Botan-%{version}
+%patch0 -p0
 
 
 %build
@@ -54,7 +56,7 @@ developing applications that use %{name}.
 # fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
-./configure.pl \
+./configure.py \
         --prefix=%{_prefix} \
         --libdir=%{_lib} \
         --cc=gcc \
@@ -110,6 +112,37 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Thu Nov 19 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.8-2
+- Add patch from upstream to build with binutils-2.20.51.0.2.
+  Fixes bz 538949 (ftbfs).
+
+* Thu Nov  5 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.8-1
+- Update to 1.8.8, a bugfix release.
+
+* Thu Sep 10 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.7-1
+- Update to 1.8.7. This is mainly a bugfix release.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.8.6-2
+- rebuilt with new openssl
+
+* Thu Aug 13 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.6-1
+- Update to 1.8.6, which contains new features as well as bugfixes,
+  e.g. concerning the /proc-walking entropy source.
+
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.5-2
+- Fix changelog.
+
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.5-1
+- Update to 1.8.5.
+- Use .tbz source file.
+- Configuration script uses python now.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.2-1
+- Update to 1.8.2.
+
 * Mon Mar 16 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.1-4
 - Add missing requirements to -devel package.
 

import.log

@@ -1,3 +0,0 @@
-botan-1_8_0-2_fc10:HEAD:botan-1.8.0-2.fc10.src.rpm:1232354502
-botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc10.src.rpm:1232633562
-botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc10.src.rpm:1237195036

sources

@@ -1 +1 @@
-ff5ddc348cc306d4e5674b8be12ac836  Botan-1.8.1.tgz
+cb7cf79c34414cdf1f7a25569d7b82ac  Botan-1.8.8.tbz