Update to 1.8.15.
- Remove patch applied upstream. - Remove %defattr directives.
This commit is contained in:
parent
97b101615b
commit
0a1517fcd9
|
@ -5,3 +5,4 @@
|
||||||
/Botan-1.8.12.stripped.tbz
|
/Botan-1.8.12.stripped.tbz
|
||||||
/Botan-1.8.13.stripped.tbz
|
/Botan-1.8.13.stripped.tbz
|
||||||
/Botan-1.8.14.stripped.tbz
|
/Botan-1.8.14.stripped.tbz
|
||||||
|
/Botan-1.8.15.stripped.tar.gz
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
============================================================
|
|
||||||
--- src/math/numbertheory/numthry.cpp e810b1dace1f2f07c3fceabddb59844a8807d58f
|
|
||||||
+++ src/math/numbertheory/numthry.cpp 03df310d0075893ff7b86ca57867fa0f0293c22e
|
|
||||||
@@ -285,9 +285,9 @@ bool passes_mr_tests(RandomNumberGenerat
|
|
||||||
|
|
||||||
u32bit tests = miller_rabin_test_iterations(n.bits(), verify);
|
|
||||||
|
|
||||||
- BigInt nonce;
|
|
||||||
for(u32bit i = 0; i != tests; ++i)
|
|
||||||
{
|
|
||||||
+ BigInt nonce;
|
|
||||||
if(!verify && PRIMES[i] < (n-1))
|
|
||||||
nonce = PRIMES[i];
|
|
||||||
else
|
|
|
@ -1,19 +0,0 @@
|
||||||
#
|
|
||||||
# old_revision [adcf24b7e258c125f78aaff4ef2d3557f1183c3e]
|
|
||||||
#
|
|
||||||
# patch "configure.py"
|
|
||||||
# from [b43917e0e74e7ef1ff0024542da0dabe104a1582]
|
|
||||||
# to [ba82e657a585f31e9ba20056a57c5f597c0f0297]
|
|
||||||
#
|
|
||||||
============================================================
|
|
||||||
--- configure.py b43917e0e74e7ef1ff0024542da0dabe104a1582
|
|
||||||
+++ configure.py ba82e657a585f31e9ba20056a57c5f597c0f0297
|
|
||||||
@@ -38,7 +38,7 @@ class BuildConfigurationInformation(obje
|
|
||||||
version_major = 1
|
|
||||||
version_minor = 8
|
|
||||||
version_patch = 14
|
|
||||||
- version_so_patch = 13
|
|
||||||
+ version_so_patch = 2
|
|
||||||
version_suffix = ''
|
|
||||||
|
|
||||||
version_string = '%d.%d.%d%s' % (
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up Botan-1.8.15/configure.py.orig Botan-1.8.15/configure.py
|
||||||
|
--- Botan-1.8.15/configure.py.orig 2016-02-13 17:52:52.000000000 +0100
|
||||||
|
+++ Botan-1.8.15/configure.py 2016-02-13 19:42:13.768986406 +0100
|
||||||
|
@@ -38,7 +38,7 @@ class BuildConfigurationInformation(obje
|
||||||
|
version_major = 1
|
||||||
|
version_minor = 8
|
||||||
|
version_patch = 15
|
||||||
|
- version_so_patch = 13
|
||||||
|
+ version_so_patch = 2
|
||||||
|
version_suffix = ''
|
||||||
|
|
||||||
|
version_string = '%d.%d.%d%s' % (
|
23
botan.spec
23
botan.spec
|
@ -1,20 +1,17 @@
|
||||||
Name: botan
|
Name: botan
|
||||||
Version: 1.8.14
|
Version: 1.8.15
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Crypto library written in C++
|
Summary: Crypto library written in C++
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://botan.randombit.net/
|
URL: http://botan.randombit.net/
|
||||||
# tarfile is stripped using repack.sh. original tarfile to be found
|
# tarfile is stripped using repack.sh. original tarfile to be found
|
||||||
# here: http://files.randombit.net/botan/Botan-%%{version}.tbz
|
# here: http://botan.randombit.net/releases/Botan-%%{version}.tgz
|
||||||
Source0: Botan-%{version}.stripped.tbz
|
Source0: Botan-%{version}.stripped.tar.gz
|
||||||
Source1: README.fedora
|
Source1: README.fedora
|
||||||
# soname was changed unintentionally upstream, revert it.
|
# soname was changed unintentionally upstream, revert it.
|
||||||
Patch0: botan-1.8.14-soname.patch
|
Patch0: botan-1.8.15-soname.patch
|
||||||
# patch to fix prime testing, see also
|
|
||||||
# http://botan.randombit.net/relnotes/1_10_8.html
|
|
||||||
Patch1: botan-1.8.14-fix_prime_testing.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
@ -53,8 +50,7 @@ developing applications that use %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n Botan-%{version}
|
%setup -q -n Botan-%{version}
|
||||||
%patch0 -p0
|
%patch0 -p1
|
||||||
%patch1 -p0
|
|
||||||
cp -av %{SOURCE1} .
|
cp -av %{SOURCE1} .
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -97,7 +93,6 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/libbotan*-*.so
|
%{_libdir}/libbotan*-*.so
|
||||||
%doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt
|
%doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt
|
||||||
%doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc
|
%doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc
|
||||||
|
@ -105,7 +100,6 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc doc/examples
|
%doc doc/examples
|
||||||
%doc _doc/api* _doc/tutorial*
|
%doc _doc/api* _doc/tutorial*
|
||||||
%{_bindir}/botan-config
|
%{_bindir}/botan-config
|
||||||
|
@ -126,6 +120,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 13 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.15-1
|
||||||
|
- Update to 1.8.15.
|
||||||
|
- Remove patch applied upstream.
|
||||||
|
- Remove %%defattr directives.
|
||||||
|
|
||||||
* Sat May 10 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.14-2
|
* Sat May 10 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.14-2
|
||||||
- Add patch to fix prime testing.
|
- Add patch to fix prime testing.
|
||||||
|
|
||||||
|
|
34
repack.sh
34
repack.sh
|
@ -1,23 +1,23 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
|
||||||
version=1.8.14
|
name=Botan-1.8.15
|
||||||
name=Botan-${version}
|
src=${name}.tgz
|
||||||
suffix=.tbz
|
dst=${name}.stripped.tar.gz
|
||||||
newsuffix=.stripped.tbz
|
|
||||||
compr=bzip2
|
|
||||||
|
|
||||||
trap '${tmpfile:+rm ${tmpfile}}' EXIT
|
rm -f ${dst} ${dst%.gz}
|
||||||
tmpfile=$(mktemp)
|
cp -av ${src} ${dst}
|
||||||
|
|
||||||
${compr} -cd ${name}${suffix} > ${tmpfile}
|
gzip -d ${dst}
|
||||||
|
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/block/idea
|
tar --delete --file=${dst%.gz} \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/block/rc6
|
${name}/src/block/idea \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/block/rc5
|
${name}/src/block/rc6 \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/math/gfpmath
|
${name}/src/block/rc5 \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/ec_dompar
|
${name}/src/math/gfpmath \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/ecc_key
|
${name}/src/pubkey/ec_dompar \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/ecdsa
|
${name}/src/pubkey/ecc_key \
|
||||||
tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/eckaeg
|
${name}/src/pubkey/ecdsa \
|
||||||
|
${name}/src/pubkey/eckaeg
|
||||||
|
touch -m -r ${src} ${dst%.gz}
|
||||||
|
|
||||||
${compr} -c ${tmpfile} > ${name}${newsuffix}
|
gzip ${dst%.gz}
|
||||||
|
|
Loading…
Reference in New Issue