Merge branch 'master' into f13

Conflicts:
	.gitignore
	botan.spec
	sources

.gitignore

@@ -1 +1,2 @@
-Botan-1.8.9.tbz
+/Botan-1.8.9.tbz
+/Botan-1.8.9.stripped.tbz

README.fedora

@@ -0,0 +1,13 @@
+For legal reasons, the following modules have been completely removed
+from the Botan package in Fedora:
+
+ * Block Ciphers
+   * IDEA [src/block/idea]
+   * RC6 [src/block/rc6]
+ * Public Key Base
+   * ECC Public Key [src/pubkey/ecc_key]
+   * ECC Domain Parameters [src/pubkey/ec_dompar]
+   * ECDSA [src/pubkey/ecdsa]
+   * ECKAEG [src/pubkey/eckaeg]
+ * Math
+   * GF(p) Math [src/math/gfpmath]

botan.spec

@@ -1,12 +1,15 @@
 Name:           botan
 Version:        1.8.9
-Release:        1%{?dist}
+Release:        3%{?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}.tbz
+# tarfile is stripped using repack.sh. original tarfile to be found
+# here: http://files.randombit.net/botan/Botan-%{version}.tbz
+Source0:        Botan-%{version}.stripped.tbz
+Source1:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
@@ -45,7 +48,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n Botan-%{version}
-
+cp -av %{SOURCE1} .
 
 %build
 # we have the necessary prerequisites, so enable optional modules
@@ -91,6 +94,7 @@ rm -rf %{buildroot}
 %{_libdir}/libbotan*-*.so
 %doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt 
 %doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc
+%doc README.fedora
 
 
 %files devel
@@ -106,10 +110,23 @@ rm -rf %{buildroot}
 
 %check
 make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
+
+# these checks would fail
+mv checks/validate.dat{,.orig}
+awk '/\[.*\]/{f=0} /\[(RC5.*|RC6|IDEA)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \
+    checks/validate.dat.orig > checks/validate.dat
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Fri Aug 27 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.9-3
+- Also remove RC5 from the tarfile.
+- Comment out RC5, RC6 and IDEA validation tests.
+
+* Wed Aug  4 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.9-2
+- Remove IDEA, RC6, and ECC-related modules from the tarfile,
+  see bz 615372.
+
 * Wed Jun 16 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.9-1
 - Update to 1.8.9.
 - Drop patch applied upstream.

repack.sh

@@ -0,0 +1,23 @@
+#! /bin/bash
+
+version=1.8.9
+name=Botan-${version}
+suffix=.tbz
+newsuffix=.stripped.tbz
+compr=bzip2
+
+trap '${tmpfile:+rm ${tmpfile}}' EXIT
+tmpfile=$(mktemp)
+
+${compr} -cd ${name}${suffix} > ${tmpfile}
+
+tar --delete --file=${tmpfile} Botan-${version}/src/block/idea
+tar --delete --file=${tmpfile} Botan-${version}/src/block/rc6
+tar --delete --file=${tmpfile} Botan-${version}/src/block/rc5
+tar --delete --file=${tmpfile} Botan-${version}/src/math/gfpmath
+tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ec_dompar
+tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecc_key
+tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdsa
+tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/eckaeg
+
+${compr} -c ${tmpfile} > ${name}${newsuffix}

sources

@@ -1 +1 @@
-2c1c55ae4f5bae9f6ad516e1ada2100f  Botan-1.8.9.tbz
+6854af078d7e751bd76ffafe7a60e447  Botan-1.8.9.stripped.tbz