From 89956fd8c978afead36c29872098e537bfc8872c Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Tue, 3 Sep 2013 19:53:33 +0200
Subject: [PATCH] Re-enable IDEA (rhbz#1003052) and SRP-6.

---
 README.fedora | 2 --
 botan.spec    | 7 +++++--
 repack.sh     | 3 ---
 sources       | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/README.fedora b/README.fedora
index 1a10d12..038f1bf 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,7 +1,6 @@
 For legal reasons, the following modules have been completely removed
 from the Botan package in Fedora:
 
-* IDEA Block Cipher [src/block/idea, src/block/idea_sse2]
 * RC5 Block Cipher [src/block/rc5]
 * RC6 Block Cipher [src/block/rc6]
 * GF(p) Math [src/math/ec_gfp]
@@ -10,4 +9,3 @@ from the Botan package in Fedora:
 * ECDH [src/pubkey/ecdh]
 * ECDSA [src/pubkey/ecdsa]
 * GOST 34.10 [src/pubkey/gost_3410]
-* SRP-6 [src/constructs/srp6]
diff --git a/botan.spec b/botan.spec
index 6ef9849..119020e 100644
--- a/botan.spec
+++ b/botan.spec
@@ -2,7 +2,7 @@
 
 Name:           botan
 Version:        %{major_version}.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -159,12 +159,15 @@ 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}' \
+awk '/\[.*\]/{f=0} /\[(RC5.*|RC6)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \
     checks/validate.dat.orig > checks/validate.dat
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Tue Sep  3 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.5-4
+- Re-enable IDEA (rhbz#1003052) and SRP-6.
+
 * Sat Jul 27 2013 pmachata@redhat.com - 1.10.5-3
 - Rebuild for boost 1.54.0
 
diff --git a/repack.sh b/repack.sh
index c74ea1b..33e7bdd 100755
--- a/repack.sh
+++ b/repack.sh
@@ -11,8 +11,6 @@ tmpfile=$(mktemp)
 
 ${compr} -cd ${name}${suffix} > ${tmpfile}
 
-tar --delete --file=${tmpfile} Botan-${version}/src/block/idea
-tar --delete --file=${tmpfile} Botan-${version}/src/block/idea_sse2
 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/ec_gfp
@@ -21,6 +19,5 @@ tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdh
 tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdsa
 tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ec_group
 tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/gost_3410
-tar --delete --file=${tmpfile} Botan-${version}/src/constructs/srp6
 
 ${compr} -c ${tmpfile} > ${name}${newsuffix}
diff --git a/sources b/sources
index f334e98..3fc6f5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcc2a74f56c617add323df4ae175c1a5  Botan-1.10.5.stripped.tbz
+ac941b269bd6c73ab40b63577482b163  Botan-1.10.5.stripped.tbz