Compare commits

...

12 Commits
master ... el5

Author SHA1 Message Date
Thomas Moschny 0a1517fcd9 Update to 1.8.15.
- Remove patch applied upstream.
- Remove %defattr directives.
2016-02-15 19:05:53 +01:00
Thomas Moschny 97b101615b Add patch to fix prime testing. 2014-05-10 16:41:38 +02:00
Thomas Moschny 1eed74820e Merge branch 'master' into el5 2012-08-25 15:21:17 +02:00
Thomas Moschny a9d68405b1 Merge branch 'master' into el5 2011-07-21 18:09:34 +02:00
Thomas Moschny ca6522e5e4 Merge branch 'master' into el5 2011-07-20 23:35:19 +02:00
Thomas Moschny 2c757b1128 Merge branch 'master' into el5 2011-07-02 13:28:44 +02:00
Thomas Moschny 23bb4aa358 Merge branch 'master' into el5 2010-11-06 15:03:18 +01:00
Thomas Moschny da76b24b6a Merge branch 'master' into el5 2010-09-17 00:24:46 +02:00
Thomas Moschny 5d6ca9cb99 Merge branch 'master' into el5
Conflicts:
	.gitignore
2010-08-29 12:30:10 +02:00
Fedora Release Engineering 8cbc64c2e9 dist-git conversion 2010-07-28 11:13:28 +00:00
Bill Nottingham 07681937bd Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:23:02 +00:00
Kevin Fenzi 6975d27e60 Initialize branch EL-5 for botan 2009-01-23 23:40:00 +00:00
6 changed files with 44 additions and 44 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/Botan-1.8.12.stripped.tbz
/Botan-1.8.13.stripped.tbz
/Botan-1.8.14.stripped.tbz
/Botan-1.8.15.stripped.tar.gz

View File

@ -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' % (

12
botan-1.8.15-soname.patch Normal file
View File

@ -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' % (

View File

@ -1,5 +1,5 @@
Name: botan
Version: 1.8.14
Version: 1.8.15
Release: 1%{?dist}
Summary: Crypto library written in C++
@ -7,11 +7,11 @@ Group: System Environment/Libraries
License: BSD
URL: http://botan.randombit.net/
# 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
# here: http://botan.randombit.net/releases/Botan-%%{version}.tgz
Source0: Botan-%{version}.stripped.tar.gz
Source1: README.fedora
# soname was changed unintentionally upstream, revert it.
Patch0: botan-1.8.14-soname.patch
Patch0: botan-1.8.15-soname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-c++
@ -50,7 +50,7 @@ developing applications that use %{name}.
%prep
%setup -q -n Botan-%{version}
%patch0 -p0
%patch0 -p1
cp -av %{SOURCE1} .
%build
@ -93,7 +93,6 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_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
@ -101,7 +100,6 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
%doc doc/examples
%doc _doc/api* _doc/tutorial*
%{_bindir}/botan-config
@ -122,6 +120,14 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
%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
- Add patch to fix prime testing.
* Sat Aug 25 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.14-1
- Update to 1.8.14.

View File

@ -1,23 +1,23 @@
#! /bin/bash
version=1.8.14
name=Botan-${version}
suffix=.tbz
newsuffix=.stripped.tbz
compr=bzip2
name=Botan-1.8.15
src=${name}.tgz
dst=${name}.stripped.tar.gz
trap '${tmpfile:+rm ${tmpfile}}' EXIT
tmpfile=$(mktemp)
rm -f ${dst} ${dst%.gz}
cp -av ${src} ${dst}
${compr} -cd ${name}${suffix} > ${tmpfile}
gzip -d ${dst}
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
tar --delete --file=${dst%.gz} \
${name}/src/block/idea \
${name}/src/block/rc6 \
${name}/src/block/rc5 \
${name}/src/math/gfpmath \
${name}/src/pubkey/ec_dompar \
${name}/src/pubkey/ecc_key \
${name}/src/pubkey/ecdsa \
${name}/src/pubkey/eckaeg
touch -m -r ${src} ${dst%.gz}
${compr} -c ${tmpfile} > ${name}${newsuffix}
gzip ${dst%.gz}

View File

@ -1 +1 @@
4b5ce78b1cfc0735eb7ec4f6903068ca Botan-1.8.14.stripped.tbz
9206a5cb467cd9c8f81be72a52a2d4f8 Botan-1.8.15.stripped.tar.gz