From 2a9322cfb09d6e91f93fe9b084a2097fc36d9c8b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 19 Nov 2009 21:20:43 +0000 Subject: [PATCH 001/108] Update to 1.8.8. --- .cvsignore | 2 +- botan-1.8.8-binutils_lea_offset.patch | 28 +++++++++++++++++++++++++++ botan.spec | 13 +++++++++++-- import.log | 1 + sources | 2 +- 5 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 botan-1.8.8-binutils_lea_offset.patch diff --git a/.cvsignore b/.cvsignore index 55db4c0..9c8172c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Botan-1.8.7.tbz +Botan-1.8.8.tbz diff --git a/botan-1.8.8-binutils_lea_offset.patch b/botan-1.8.8-binutils_lea_offset.patch new file mode 100644 index 0000000..2028a6f --- /dev/null +++ b/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 diff --git a/botan.spec b/botan.spec index 419c12d..476abd4 100644 --- a/botan.spec +++ b/botan.spec @@ -1,12 +1,13 @@ Name: botan -Version: 1.8.7 -Release: 1%{?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}.tbz +Patch0: botan-1.8.8-binutils_lea_offset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -45,6 +46,7 @@ developing applications that use %{name}. %prep %setup -q -n Botan-%{version} +%patch0 -p0 %build @@ -110,6 +112,13 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Nov 19 2009 Thomas Moschny - 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 - 1.8.8-1 +- Update to 1.8.8, a bugfix release. + * Thu Sep 10 2009 Thomas Moschny - 1.8.7-1 - Update to 1.8.7. This is mainly a bugfix release. diff --git a/import.log b/import.log index ab1d9cd..eda575b 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ botan-1_8_5-1_fc11:HEAD:botan-1.8.5-1.fc11.src.rpm:1250098169 botan-1_8_5-2_fc11:HEAD:botan-1.8.5-2.fc11.src.rpm:1250099364 botan-1_8_6-1_fc11:HEAD:botan-1.8.6-1.fc11.src.rpm:1250178270 botan-1_8_7-1_fc11:HEAD:botan-1.8.7-1.fc11.src.rpm:1252614441 +botan-1_8_8-2_fc12:F-12:botan-1.8.8-2.fc12.src.rpm:1258665588 diff --git a/sources b/sources index ec98c68..fddfa1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c607e31b012d9839fd0a1da24ff85e3d Botan-1.8.7.tbz +cb7cf79c34414cdf1f7a25569d7b82ac Botan-1.8.8.tbz From 3f2968843d74bc9318322fa5397656472d499699 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:03 +0000 Subject: [PATCH 002/108] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c931fe6..d529283 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: botan -# $Id$ +# $Id: Makefile,v 1.1 2009/01/18 22:29:46 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f4bd32ef8c2cd968e9c3b790ed4227d3b12e435a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:44:08 +0000 Subject: [PATCH 003/108] Initialize branch EL-6 for botan --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From b528da8f623cf1a7f7be0fb9053d88cfa2510686 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Jul 2010 10:55:01 +0000 Subject: [PATCH 004/108] Update to 1.8.9. --- .cvsignore | 2 +- botan-1.8.8-binutils_lea_offset.patch | 28 --------------------------- botan.spec | 10 ++++++---- import.log | 1 + sources | 2 +- 5 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 botan-1.8.8-binutils_lea_offset.patch diff --git a/.cvsignore b/.cvsignore index 9c8172c..78fb1c1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Botan-1.8.8.tbz +Botan-1.8.9.tbz diff --git a/botan-1.8.8-binutils_lea_offset.patch b/botan-1.8.8-binutils_lea_offset.patch deleted file mode 100644 index 2028a6f..0000000 --- a/botan-1.8.8-binutils_lea_offset.patch +++ /dev/null @@ -1,28 +0,0 @@ -# -# -# 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 diff --git a/botan.spec b/botan.spec index 476abd4..e749bfc 100644 --- a/botan.spec +++ b/botan.spec @@ -1,13 +1,12 @@ Name: botan -Version: 1.8.8 -Release: 2%{?dist} +Version: 1.8.9 +Release: 1%{?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 -Patch0: botan-1.8.8-binutils_lea_offset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -46,7 +45,6 @@ developing applications that use %{name}. %prep %setup -q -n Botan-%{version} -%patch0 -p0 %build @@ -112,6 +110,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jun 16 2010 Thomas Moschny - 1.8.9-1 +- Update to 1.8.9. +- Drop patch applied upstream. + * Thu Nov 19 2009 Thomas Moschny - 1.8.8-2 - Add patch from upstream to build with binutils-2.20.51.0.2. Fixes bz 538949 (ftbfs). diff --git a/import.log b/import.log index eda575b..f0d0a0f 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ botan-1_8_5-2_fc11:HEAD:botan-1.8.5-2.fc11.src.rpm:1250099364 botan-1_8_6-1_fc11:HEAD:botan-1.8.6-1.fc11.src.rpm:1250178270 botan-1_8_7-1_fc11:HEAD:botan-1.8.7-1.fc11.src.rpm:1252614441 botan-1_8_8-2_fc12:F-12:botan-1.8.8-2.fc12.src.rpm:1258665588 +botan-1_8_9-1_fc13:EL-6:botan-1.8.9-1.fc13.src.rpm:1278154446 diff --git a/sources b/sources index fddfa1e..c781008 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb7cf79c34414cdf1f7a25569d7b82ac Botan-1.8.8.tbz +2c1c55ae4f5bae9f6ad516e1ada2100f Botan-1.8.9.tbz From 2862ade78751f55d28346342e2147e4e51636dd1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:13:33 +0000 Subject: [PATCH 005/108] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 10 ---------- 4 files changed, 32 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d529283..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: botan -# $Id: Makefile,v 1.1 2009/01/18 22:29:46 kevin Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index f0d0a0f..0000000 --- a/import.log +++ /dev/null @@ -1,10 +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 -botan-1_8_2-1_fc10:HEAD:botan-1.8.2-1.fc10.src.rpm:1240683730 -botan-1_8_5-1_fc11:HEAD:botan-1.8.5-1.fc11.src.rpm:1250098169 -botan-1_8_5-2_fc11:HEAD:botan-1.8.5-2.fc11.src.rpm:1250099364 -botan-1_8_6-1_fc11:HEAD:botan-1.8.6-1.fc11.src.rpm:1250178270 -botan-1_8_7-1_fc11:HEAD:botan-1.8.7-1.fc11.src.rpm:1252614441 -botan-1_8_8-2_fc12:F-12:botan-1.8.8-2.fc12.src.rpm:1258665588 -botan-1_8_9-1_fc13:EL-6:botan-1.8.9-1.fc13.src.rpm:1278154446 From 59e089da3eed583292f7bc2e510c7cf452f5379e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 11:59:10 -0600 Subject: [PATCH 006/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index cb1aebf..152464a 100644 --- a/botan.spec +++ b/botan.spec @@ -1,6 +1,6 @@ Name: botan Version: 1.8.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -122,6 +122,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.8.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Aug 25 2012 Thomas Moschny - 1.8.14-1 - Update to 1.8.14. From a180054edb5c62194bdd0891457a9837a81f2018 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 26 Jul 2013 04:32:34 +0200 Subject: [PATCH 007/108] Update to 1.10.5. - Modernize spec file. - New -doc subpackage containing HTML documentation. - Package Python binding. --- .gitignore | 1 + README.fedora | 21 ++++----- botan-1.8.14-soname.patch | 19 -------- botan.spec | 97 +++++++++++++++++++++++++++++---------- repack.sh | 21 +++++---- sources | 2 +- 6 files changed, 97 insertions(+), 64 deletions(-) delete mode 100644 botan-1.8.14-soname.patch diff --git a/.gitignore b/.gitignore index c755cb4..38d1d01 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Botan-1.8.12.stripped.tbz /Botan-1.8.13.stripped.tbz /Botan-1.8.14.stripped.tbz +/Botan-1.10.5.stripped.tbz diff --git a/README.fedora b/README.fedora index f3b8795..1a10d12 100644 --- a/README.fedora +++ b/README.fedora @@ -1,14 +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] - * RC5 [src/block/rc5] - * 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] +* 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] +* ECC Domain Parameters [src/pubkey/ec_group] +* ECC Public Key [src/pubkey/ecc_key] +* ECDH [src/pubkey/ecdh] +* ECDSA [src/pubkey/ecdsa] +* GOST 34.10 [src/pubkey/gost_3410] +* SRP-6 [src/constructs/srp6] diff --git a/botan-1.8.14-soname.patch b/botan-1.8.14-soname.patch deleted file mode 100644 index 6976728..0000000 --- a/botan-1.8.14-soname.patch +++ /dev/null @@ -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' % ( diff --git a/botan.spec b/botan.spec index 152464a..babc333 100644 --- a/botan.spec +++ b/botan.spec @@ -1,6 +1,8 @@ +%global major_version 1.10 + Name: botan -Version: 1.8.14 -Release: 2%{?dist} +Version: %{major_version}.5 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -10,18 +12,20 @@ URL: http://botan.randombit.net/ # here: http://files.randombit.net/botan/Botan-%%{version}.tbz Source0: Botan-%{version}.stripped.tbz Source1: README.fedora -# soname was changed unintentionally upstream, revert it. -Patch0: botan-1.8.14-soname.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ BuildRequires: python +BuildRequires: python-sphinx +BuildRequires: python-devel +BuildRequires: boost-python-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: gmp-devel BuildRequires: openssl-devel +# do not check .so files in the python_sitelib directory +%global __provides_exclude_from ^(%{python_sitearch}/.*\\.so)$ %description Botan is a BSD-licensed crypto library written in C++. It provides a @@ -35,24 +39,47 @@ flavor of the library. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel Requires: gmp-devel Requires: openssl-devel - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package doc +Summary: Documentation for %{name} +Group: Documentation +BuildArch: noarch + +%description doc +%{summary} + +This package contains HTML documentation for %{name}. + + +%package -n python-%{name} +Summary: Python bindings for %{name} +Group: System Environment/Libraries + +%description -n python-%{name} +%{summary} + +This package contains the Python binding for %{name}. + +Note: The Python binding should be considered alpha software, and the +interfaces may change in the future. + + %prep %setup -q -n Botan-%{version} -%patch0 -p0 cp -av %{SOURCE1} . + %build # we have the necessary prerequisites, so enable optional modules %define enable_modules gnump,bzip2,zlib,openssl @@ -67,23 +94,31 @@ cp -av %{SOURCE1} . --os=linux \ --cpu=%{_arch} \ --enable-modules=%{enable_modules} \ - --disable-modules=%{disable_modules} + --disable-modules=%{disable_modules} \ + --with-boost-python \ + --with-python-version=%{python_version} # (ab)using CXX as an easy way to inject our CXXFLAGS make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} +make -f Makefile.python \ + CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} %install -rm -rf %{buildroot} make install \ DESTDIR=%{buildroot}%{_prefix} \ DOCDIR=_doc \ INSTALL_CMD_EXEC="install -p -m 755" \ - INSTALL_CMD_DATA="install -p -m 644" \ + INSTALL_CMD_DATA="install -p -m 644" +make -f Makefile.python install \ + PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python_sitearch} -%clean -rm -rf %{buildroot} +# fixups +find doc/examples -type f -exec chmod -x {} \; +mv doc/examples/python doc/python-examples +rm _doc/manual/.buildinfo +rm -r _doc/manual/.doctrees %post -p /sbin/ldconfig @@ -93,22 +128,30 @@ 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 +%doc _doc/readme.txt +%doc doc/license.txt %doc README.fedora +%{_libdir}/libbotan-%{major_version}.so.* %files devel -%defattr(-,root,root,-) %doc doc/examples -%doc _doc/api* _doc/tutorial* -%{_bindir}/botan-config +%{_bindir}/botan-config-%{major_version} %{_includedir}/* -%exclude %{_libdir}/libbotan.a -%{_libdir}/libbotan.so -%{_libdir}/pkgconfig/botan-1.8.pc +%exclude %{_libdir}/libbotan-%{major_version}.a +%{_libdir}/libbotan-%{major_version}.so +%{_libdir}/pkgconfig/botan-%{major_version}.pc + + +%files doc +%doc _doc/manual +%doc _doc/readme.txt +%doc doc/license.txt + + +%files -n python-%{name} +%doc doc/python-examples +%{python_sitearch}/%{name} %check @@ -116,12 +159,18 @@ 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|IDEA.*)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \ checks/validate.dat.orig > checks/validate.dat LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jul 26 2013 Thomas Moschny - 1.10.5-1 +- Update to 1.10.5. +- Modernize spec file. +- New -doc subpackage containing HTML documentation. +- Package Python binding. + * Wed Feb 13 2013 Fedora Release Engineering - 1.8.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/repack.sh b/repack.sh index 9bd4162..c74ea1b 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.8.14 +version=1.10.5 name=Botan-${version} suffix=.tbz newsuffix=.stripped.tbz @@ -11,13 +11,16 @@ 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 +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 +tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecc_key +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 219b46d..f334e98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b5ce78b1cfc0735eb7ec4f6903068ca Botan-1.8.14.stripped.tbz +dcc2a74f56c617add323df4ae175c1a5 Botan-1.10.5.stripped.tbz From 49e022358c0f9c336c2fd3365655da3d0371f292 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 26 Jul 2013 12:13:41 +0200 Subject: [PATCH 008/108] Rename the subpackage for the Python binding. --- botan.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/botan.spec b/botan.spec index babc333..66f6fa0 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -62,11 +62,11 @@ BuildArch: noarch This package contains HTML documentation for %{name}. -%package -n python-%{name} +%package python Summary: Python bindings for %{name} Group: System Environment/Libraries -%description -n python-%{name} +%description python %{summary} This package contains the Python binding for %{name}. @@ -149,7 +149,7 @@ rm -r _doc/manual/.doctrees %doc doc/license.txt -%files -n python-%{name} +%files python %doc doc/python-examples %{python_sitearch}/%{name} @@ -165,6 +165,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jul 26 2013 Thomas Moschny - 1.10.5-2 +- Rename the subpackage for the Python binding. + * Fri Jul 26 2013 Thomas Moschny - 1.10.5-1 - Update to 1.10.5. - Modernize spec file. From f2a104bfae7d6fca9beb727dfe0a624d4a45ab81 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sat, 27 Jul 2013 14:57:17 +0200 Subject: [PATCH 009/108] Rebuild for boost 1.54.0 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 66f6fa0..6ef9849 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -165,6 +165,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Jul 27 2013 pmachata@redhat.com - 1.10.5-3 +- Rebuild for boost 1.54.0 + * Fri Jul 26 2013 Thomas Moschny - 1.10.5-2 - Rename the subpackage for the Python binding. From 89956fd8c978afead36c29872098e537bfc8872c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 3 Sep 2013 19:53:33 +0200 Subject: [PATCH 010/108] 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 - 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 From f78580826ce09bda3d1e0deb4c5ecaf20c018531 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 3 Sep 2013 19:55:37 +0200 Subject: [PATCH 011/108] Fix changelog. --- botan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 119020e..ae003d9 100644 --- a/botan.spec +++ b/botan.spec @@ -168,7 +168,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate * Tue Sep 3 2013 Thomas Moschny - 1.10.5-4 - Re-enable IDEA (rhbz#1003052) and SRP-6. -* Sat Jul 27 2013 pmachata@redhat.com - 1.10.5-3 +* Sat Jul 27 2013 Petr Machata - 1.10.5-3 - Rebuild for boost 1.54.0 * Fri Jul 26 2013 Thomas Moschny - 1.10.5-2 From a7ae4770ebf8ae220e51e956bfbd34290a096430 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 10 May 2014 14:29:27 +0200 Subject: [PATCH 012/108] Update to 1.10.8. --- .gitignore | 1 + botan.spec | 7 +++++-- repack.sh | 2 +- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 38d1d01..c7a054a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /Botan-1.8.13.stripped.tbz /Botan-1.8.14.stripped.tbz /Botan-1.10.5.stripped.tbz +/Botan-1.10.8.stripped.tbz diff --git a/botan.spec b/botan.spec index ae003d9..3e77829 100644 --- a/botan.spec +++ b/botan.spec @@ -1,8 +1,8 @@ %global major_version 1.10 Name: botan -Version: %{major_version}.5 -Release: 4%{?dist} +Version: %{major_version}.8 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -165,6 +165,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat May 10 2014 Thomas Moschny - 1.10.8-1 +- Update to 1.10.8. + * Tue Sep 3 2013 Thomas Moschny - 1.10.5-4 - Re-enable IDEA (rhbz#1003052) and SRP-6. diff --git a/repack.sh b/repack.sh index 33e7bdd..9f40365 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.10.5 +version=1.10.8 name=Botan-${version} suffix=.tbz newsuffix=.stripped.tbz diff --git a/sources b/sources index 3fc6f5b..89d7334 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac941b269bd6c73ab40b63577482b163 Botan-1.10.5.stripped.tbz +c7ebfad55bdfe0089e6201d11b0faa75 Botan-1.10.8.stripped.tbz From b512a893c498ab2ae9d0a6a86f1a3f165125eeef Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 10 May 2014 16:16:59 +0200 Subject: [PATCH 013/108] Add patch to fix prime testing. --- botan-1.8.14-fix_prime_testing.patch | 14 ++++++++++++++ botan.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 botan-1.8.14-fix_prime_testing.patch diff --git a/botan-1.8.14-fix_prime_testing.patch b/botan-1.8.14-fix_prime_testing.patch new file mode 100644 index 0000000..5698c6a --- /dev/null +++ b/botan-1.8.14-fix_prime_testing.patch @@ -0,0 +1,14 @@ +============================================================ +--- 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 diff --git a/botan.spec b/botan.spec index cb1aebf..5a051b4 100644 --- a/botan.spec +++ b/botan.spec @@ -1,6 +1,6 @@ Name: botan Version: 1.8.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -12,6 +12,9 @@ Source0: Botan-%{version}.stripped.tbz Source1: README.fedora # soname was changed unintentionally upstream, revert it. Patch0: botan-1.8.14-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) BuildRequires: gcc-c++ @@ -51,6 +54,7 @@ developing applications that use %{name}. %prep %setup -q -n Botan-%{version} %patch0 -p0 +%patch1 -p0 cp -av %{SOURCE1} . %build @@ -122,6 +126,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat May 10 2014 Thomas Moschny - 1.8.14-2 +- Add patch to fix prime testing. + * Sat Aug 25 2012 Thomas Moschny - 1.8.14-1 - Update to 1.8.14. From c20c9653818e1cc2a41d20814178f2b8d249caf8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 12 May 2014 13:06:24 +0100 Subject: [PATCH 014/108] Added AArch64 architecture support, patch being sent upstream --- botan.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 3e77829..6c9cd67 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -12,6 +12,7 @@ URL: http://botan.randombit.net/ # here: http://files.randombit.net/botan/Botan-%%{version}.tbz Source0: Botan-%{version}.stripped.tbz Source1: README.fedora +Patch0: botan-aarch64.patch BuildRequires: gcc-c++ BuildRequires: python @@ -77,6 +78,7 @@ interfaces may change in the future. %prep %setup -q -n Botan-%{version} +%patch0 -p1 cp -av %{SOURCE1} . @@ -165,6 +167,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon May 12 2014 Marcin Juszkiewicz - 1.10.8-2 +- Added AArch64 architecture support + * Sat May 10 2014 Thomas Moschny - 1.10.8-1 - Update to 1.10.8. From 36e8a6c98af14acc26eb20538ce9889da14a2dfb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 12 May 2014 13:06:38 +0100 Subject: [PATCH 015/108] Added AArch64 architecture support, patch being sent upstream --- botan-aarch64.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 botan-aarch64.patch diff --git a/botan-aarch64.patch b/botan-aarch64.patch new file mode 100644 index 0000000..ffb6888 --- /dev/null +++ b/botan-aarch64.patch @@ -0,0 +1,21 @@ +Index: Botan-1.10.8/src/build-data/arch/aarch64.txt +=================================================================== +--- /dev/null ++++ Botan-1.10.8/src/build-data/arch/aarch64.txt +@@ -0,0 +1,16 @@ ++ ++endian little ++family aarch64 ++ ++ ++arm64 # For Debian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ From 53bda05aa577346241af3d5cf2e73c5c585cd39d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 May 2014 10:28:27 +0200 Subject: [PATCH 016/108] rebuild for boost 1.55.0 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 6c9cd67..f5797aa 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -167,6 +167,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri May 23 2014 David Tardon - 1.10.8-3 +- rebuild for boost 1.55.0 + * Mon May 12 2014 Marcin Juszkiewicz - 1.10.8-2 - Added AArch64 architecture support From 8d68e9c74f3fb4d95cd4b9604630c47d00d1822c Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Sun, 25 May 2014 14:30:14 -0500 Subject: [PATCH 017/108] Added ppc64le arch support --- botan-1.10-add-ppc64le.patch | 50 ++++++++++++++++++++++++++++++++++++ botan.spec | 7 ++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 botan-1.10-add-ppc64le.patch diff --git a/botan-1.10-add-ppc64le.patch b/botan-1.10-add-ppc64le.patch new file mode 100644 index 0000000..05794cd --- /dev/null +++ b/botan-1.10-add-ppc64le.patch @@ -0,0 +1,50 @@ +diff -Naur Botan-1.10.8.orig/src/build-data/arch/ppc64le.txt Botan-1.10.8/src/build-data/arch/ppc64le.txt +--- Botan-1.10.8.orig/src/build-data/arch/ppc64le.txt 1969-12-31 18:00:00.000000000 -0600 ++++ Botan-1.10.8/src/build-data/arch/ppc64le.txt 2014-05-25 12:59:22.030001491 -0500 +@@ -0,0 +1,16 @@ ++ ++endian little ++family ppc64le ++ ++ ++ppc64el # For Debian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -Naur Botan-1.10.8.orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt +--- Botan-1.10.8.orig/src/build-data/cc/gcc.txt 2014-05-25 12:44:19.580001491 -0500 ++++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-05-25 12:55:57.750001491 -0500 +@@ -83,6 +83,7 @@ + mips64 -> "-mips3 -mcpu=SUBMODEL" mips64- + ppc32 -> "-mcpu=SUBMODEL" ppc + ppc64 -> "-mcpu=SUBMODEL" ppc ++ppc64le -> "-mcpu=SUBMODEL" + sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- + sparc64 -> "-mcpu=v9 -mtune=SUBMODEL" + x86_32 -> "-march=SUBMODEL -momit-leaf-frame-pointer" +@@ -98,6 +99,7 @@ + sparc32 -> "-m32 -mno-app-regs" + sparc64 -> "-m64 -mno-app-regs" + ppc64 -> "-m64" ++ppc64le -> "-m64" + + # This should probably be used on most/all targets, but the docs are unclear + openbsd -> "-pthread" +diff -Naur Botan-1.10.8.orig/src/math/mp/mp_asm64/info.txt Botan-1.10.8/src/math/mp/mp_asm64/info.txt +--- Botan-1.10.8.orig/src/math/mp/mp_asm64/info.txt 2014-05-25 12:44:19.620001491 -0500 ++++ Botan-1.10.8/src/math/mp/mp_asm64/info.txt 2014-05-25 12:45:01.580001491 -0500 +@@ -13,6 +13,7 @@ + mips64 + ppc64 + sparc64 ++ppc64le + + + # The inline asm only works with gcc, but it looks like (at least on diff --git a/botan.spec b/botan.spec index f5797aa..7750c3c 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -13,6 +13,7 @@ URL: http://botan.randombit.net/ Source0: Botan-%{version}.stripped.tbz Source1: README.fedora Patch0: botan-aarch64.patch +Patch1: botan-1.10-add-ppc64le.patch BuildRequires: gcc-c++ BuildRequires: python @@ -79,6 +80,7 @@ interfaces may change in the future. %prep %setup -q -n Botan-%{version} %patch0 -p1 +%patch1 -p1 cp -av %{SOURCE1} . @@ -167,6 +169,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun May 25 2014 Brent Baude - 1.10.8-4 +- Added ppc64le arch support + * Fri May 23 2014 David Tardon - 1.10.8-3 - rebuild for boost 1.55.0 From 4ed026fc925d83b1203d9c280bfa9cb08f67f45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 31 May 2014 10:09:40 +0200 Subject: [PATCH 018/108] rebuild for boost 1.55.0 (libboost_python.so.1.55.0) --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 7750c3c..04e22a4 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -169,6 +169,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat May 31 2014 Björn Esser - 1.10.8-5 +- rebuild for boost 1.55.0 (libboost_python.so.1.55.0) + * Sun May 25 2014 Brent Baude - 1.10.8-4 - Added ppc64le arch support From c0cba64d16fc1c1fac982e02577b47795889f734 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:27:04 -0500 Subject: [PATCH 019/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 04e22a4..a662d1a 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -169,6 +169,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.10.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat May 31 2014 Björn Esser - 1.10.8-5 - rebuild for boost 1.55.0 (libboost_python.so.1.55.0) From 80c63f463e6cd51f0b40e9209f6f277c94c43fcb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 23:04:03 +0000 Subject: [PATCH 020/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index a662d1a..1a80066 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -169,6 +169,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1.10.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.10.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a67d57e0c081a05791f1ddd07645613ce9bd27b3 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 31 Jan 2015 10:23:51 +0100 Subject: [PATCH 021/108] Update to 1.10.9. --- .gitignore | 1 + botan.spec | 12 ++++++++++-- repack.sh | 2 +- sources | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7a054a..a10c5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /Botan-1.8.14.stripped.tbz /Botan-1.10.5.stripped.tbz /Botan-1.10.8.stripped.tbz +/Botan-1.10.9.stripped.tbz diff --git a/botan.spec b/botan.spec index 1a80066..1168f46 100644 --- a/botan.spec +++ b/botan.spec @@ -1,8 +1,8 @@ %global major_version 1.10 Name: botan -Version: %{major_version}.8 -Release: 7%{?dist} +Version: %{major_version}.9 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -19,7 +19,12 @@ BuildRequires: gcc-c++ BuildRequires: python BuildRequires: python-sphinx BuildRequires: python-devel +%if 0%{?fedora} >= 22 +# work around bug 1186014 +BuildRequires: boost-python-devel%{?_isa} +%else BuildRequires: boost-python-devel +%endif BuildRequires: bzip2-devel BuildRequires: zlib-devel @@ -169,6 +174,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Jan 31 2015 Thomas Moschny - 1.10.9-1 +- Update to 1.10.9. + * Fri Aug 15 2014 Fedora Release Engineering - 1.10.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/repack.sh b/repack.sh index 9f40365..d23452d 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.10.8 +version=1.10.9 name=Botan-${version} suffix=.tbz newsuffix=.stripped.tbz diff --git a/sources b/sources index 89d7334..458bb6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7ebfad55bdfe0089e6201d11b0faa75 Botan-1.10.8.stripped.tbz +126ef6f9c7527392ecd5a0337669c8d6 Botan-1.10.9.stripped.tbz From 1ab004f2d7f3bf3a876d72a42e1f4abb121d08c6 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 5 Feb 2015 18:01:55 +0100 Subject: [PATCH 022/108] Remove workaround for bug 1186014. --- botan.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/botan.spec b/botan.spec index 1168f46..c7bf754 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -13,18 +13,13 @@ URL: http://botan.randombit.net/ Source0: Botan-%{version}.stripped.tbz Source1: README.fedora Patch0: botan-aarch64.patch -Patch1: botan-1.10-add-ppc64le.patch +Patch1: botan-1.10-add-ppc64le.patch BuildRequires: gcc-c++ BuildRequires: python BuildRequires: python-sphinx BuildRequires: python-devel -%if 0%{?fedora} >= 22 -# work around bug 1186014 -BuildRequires: boost-python-devel%{?_isa} -%else BuildRequires: boost-python-devel -%endif BuildRequires: bzip2-devel BuildRequires: zlib-devel @@ -174,6 +169,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Feb 5 2015 Thomas Moschny - 1.10.9-2 +- Remove workaround for bug 1186014. + * Sat Jan 31 2015 Thomas Moschny - 1.10.9-1 - Update to 1.10.9. From 41ed55682f5f1991640fa5c84dd6a2effd9beefd Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 6 Feb 2015 18:34:28 +0100 Subject: [PATCH 023/108] Disable gmp engine (see bug 1116406). --- botan.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/botan.spec b/botan.spec index c7bf754..2dfe915 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -23,7 +23,6 @@ BuildRequires: boost-python-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: gmp-devel BuildRequires: openssl-devel # do not check .so files in the python_sitelib directory @@ -45,7 +44,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel -Requires: gmp-devel Requires: openssl-devel %description devel @@ -86,10 +84,10 @@ cp -av %{SOURCE1} . %build # we have the necessary prerequisites, so enable optional modules -%define enable_modules gnump,bzip2,zlib,openssl +%define enable_modules bzip2,zlib,openssl # fixme: maybe disable unix_procs, very slow. -%define disable_modules %{nil} +%define disable_modules gnump ./configure.py \ --prefix=%{_prefix} \ @@ -169,6 +167,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Feb 5 2015 Thomas Moschny - 1.10.9-3 +- Disable gmp engine (see bug 1116406). + * Thu Feb 5 2015 Thomas Moschny - 1.10.9-2 - Remove workaround for bug 1186014. From 4083bc67434b9c92cd6044e16b4e487d80158052 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 6 Feb 2015 18:34:45 +0100 Subject: [PATCH 024/108] Use _pkgdocdir. --- botan.spec | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/botan.spec b/botan.spec index 2dfe915..1ddb878 100644 --- a/botan.spec +++ b/botan.spec @@ -28,6 +28,8 @@ BuildRequires: openssl-devel # do not check .so files in the python_sitelib directory %global __provides_exclude_from ^(%{python_sitearch}/.*\\.so)$ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + %description Botan is a BSD-licensed crypto library written in C++. It provides a wide variety of basic cryptographic algorithms, X.509 certificates and @@ -79,7 +81,6 @@ interfaces may change in the future. %setup -q -n Botan-%{version} %patch0 -p1 %patch1 -p1 -cp -av %{SOURCE1} . %build @@ -98,7 +99,8 @@ cp -av %{SOURCE1} . --enable-modules=%{enable_modules} \ --disable-modules=%{disable_modules} \ --with-boost-python \ - --with-python-version=%{python_version} + --with-python-version=%{python_version} \ + --with-sphinx # (ab)using CXX as an easy way to inject our CXXFLAGS make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} @@ -109,7 +111,7 @@ make -f Makefile.python \ %install make install \ DESTDIR=%{buildroot}%{_prefix} \ - DOCDIR=_doc \ + DOCDIR=%{buildroot}%{_pkgdocdir} \ INSTALL_CMD_EXEC="install -p -m 755" \ INSTALL_CMD_DATA="install -p -m 644" @@ -119,8 +121,10 @@ make -f Makefile.python install \ # fixups find doc/examples -type f -exec chmod -x {} \; mv doc/examples/python doc/python-examples -rm _doc/manual/.buildinfo -rm -r _doc/manual/.doctrees +cp -a doc/{examples,python-examples,license.txt} \ + %{buildroot}%{_pkgdocdir} +cp -a %{SOURCE1} %{buildroot}%{_pkgdocdir} +rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} %post -p /sbin/ldconfig @@ -130,14 +134,15 @@ rm -r _doc/manual/.doctrees %files -%doc _doc/readme.txt -%doc doc/license.txt -%doc README.fedora +%dir %{_pkgdocdir} +%{_pkgdocdir}/readme.txt +%{_pkgdocdir}/license.txt +%{_pkgdocdir}/README.fedora %{_libdir}/libbotan-%{major_version}.so.* %files devel -%doc doc/examples +%{_pkgdocdir}/examples %{_bindir}/botan-config-%{major_version} %{_includedir}/* %exclude %{_libdir}/libbotan-%{major_version}.a @@ -146,13 +151,19 @@ rm -r _doc/manual/.doctrees %files doc -%doc _doc/manual -%doc _doc/readme.txt -%doc doc/license.txt +%dir %{_pkgdocdir} +%{_pkgdocdir}/manual +# next files duplicated on purpose, because -doc doesn't depend on the +# main package +%{_pkgdocdir}/readme.txt +%{_pkgdocdir}/license.txt +%{_pkgdocdir}/README.fedora %files python -%doc doc/python-examples +%{_pkgdocdir}/python-examples +%exclude %{_pkgdocdir}/python-examples/*.pyc +%exclude %{_pkgdocdir}/python-examples/*.pyo %{python_sitearch}/%{name} @@ -169,6 +180,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog * Thu Feb 5 2015 Thomas Moschny - 1.10.9-3 - Disable gmp engine (see bug 1116406). +- Use _pkgdocdir. * Thu Feb 5 2015 Thomas Moschny - 1.10.9-2 - Remove workaround for bug 1186014. From 953c48ed291ec6bafc1d64871ebda6024260ed41 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 6 Feb 2015 18:52:22 +0100 Subject: [PATCH 025/108] Re-enable cleared ECC. Patch by Tom Callaway . --- botan-1.10.5-ecc-fix.patch | 327 +++++++++++++++++++++++++++++++++++++ botan.spec | 10 +- repack.sh | 5 - sources | 2 +- 4 files changed, 337 insertions(+), 7 deletions(-) create mode 100644 botan-1.10.5-ecc-fix.patch diff --git a/botan-1.10.5-ecc-fix.patch b/botan-1.10.5-ecc-fix.patch new file mode 100644 index 0000000..4cd2e9a --- /dev/null +++ b/botan-1.10.5-ecc-fix.patch @@ -0,0 +1,327 @@ +diff -up Botan-1.10.5/checks/cvc_tests.cpp.eccfix Botan-1.10.5/checks/cvc_tests.cpp +--- Botan-1.10.5/checks/cvc_tests.cpp.eccfix 2013-10-22 01:24:04.150239344 +0100 ++++ Botan-1.10.5/checks/cvc_tests.cpp 2013-10-22 01:24:28.166207414 +0100 +@@ -582,7 +582,7 @@ u32bit do_cvc_tests(Botan::RandomNumberG + std::cout << "Testing CVC: " << std::flush; + + test_enc_gen_selfsigned(rng); +- test_enc_gen_req(rng); ++ // test_enc_gen_req(rng); + test_cvc_req_ext(rng); + test_cvc_ado_ext(rng); + test_cvc_ado_creation(rng); +diff -up Botan-1.10.5/checks/ecdh.cpp.eccfix Botan-1.10.5/checks/ecdh.cpp +--- Botan-1.10.5/checks/ecdh.cpp.eccfix 2013-10-22 01:22:58.494326624 +0100 ++++ Botan-1.10.5/checks/ecdh.cpp 2013-10-22 01:23:52.580254726 +0100 +@@ -57,8 +57,8 @@ void test_ecdh_some_dp(RandomNumberGener + { + std::vector oids; + oids.push_back("1.2.840.10045.3.1.7"); +- oids.push_back("1.3.132.0.8"); +- oids.push_back("1.2.840.10045.3.1.1"); ++ // oids.push_back("1.3.132.0.8"); ++ // oids.push_back("1.2.840.10045.3.1.1"); + + for(u32bit i = 0; i< oids.size(); i++) + { +@@ -85,8 +85,8 @@ void test_ecdh_der_derivation(RandomNumb + { + std::vector oids; + oids.push_back("1.2.840.10045.3.1.7"); +- oids.push_back("1.3.132.0.8"); +- oids.push_back("1.2.840.10045.3.1.1"); ++ // oids.push_back("1.3.132.0.8"); ++ // oids.push_back("1.2.840.10045.3.1.1"); + + for(u32bit i = 0; i< oids.size(); i++) + { +@@ -116,7 +116,7 @@ u32bit do_ecdh_tests(RandomNumberGenerat + { + std::cout << "Testing ECDH (InSiTo unit tests): "; + +- test_ecdh_normal_derivation(rng); ++ // test_ecdh_normal_derivation(rng); + test_ecdh_some_dp(rng); + test_ecdh_der_derivation(rng); + +diff -up Botan-1.10.5/checks/ecdsa.cpp.eccfix Botan-1.10.5/checks/ecdsa.cpp +--- Botan-1.10.5/checks/ecdsa.cpp.eccfix 2013-03-02 21:19:35.000000000 +0000 ++++ Botan-1.10.5/checks/ecdsa.cpp 2013-10-22 01:22:48.882339400 +0100 +@@ -300,6 +300,7 @@ void test_create_and_verify(RandomNumber + void test_curve_registry(RandomNumberGenerator& rng) + { + std::vector oids; ++ /* Disabled. + oids.push_back("1.3.132.0.8"); + oids.push_back("1.2.840.10045.3.1.1"); + oids.push_back("1.2.840.10045.3.1.2"); +@@ -307,7 +308,9 @@ void test_curve_registry(RandomNumberGen + oids.push_back("1.2.840.10045.3.1.4"); + oids.push_back("1.2.840.10045.3.1.5"); + oids.push_back("1.2.840.10045.3.1.6"); ++ */ + oids.push_back("1.2.840.10045.3.1.7"); ++ /* Disabled + oids.push_back("1.3.132.0.6"); + oids.push_back("1.3.132.0.7"); + oids.push_back("1.3.132.0.28"); +@@ -318,7 +321,9 @@ void test_curve_registry(RandomNumberGen + oids.push_back("1.3.132.0.32"); + oids.push_back("1.3.132.0.33"); + oids.push_back("1.3.132.0.10"); ++ */ + oids.push_back("1.3.132.0.34"); ++ /* Disabled. + oids.push_back("1.3.132.0.35"); + oids.push_back("1.3.6.1.4.1.8301.3.1.2.9.0.38"); + oids.push_back("1.3.36.3.3.2.8.1.1.1"); +@@ -328,6 +333,7 @@ void test_curve_registry(RandomNumberGen + oids.push_back("1.3.36.3.3.2.8.1.1.9"); + oids.push_back("1.3.36.3.3.2.8.1.1.11"); + oids.push_back("1.3.36.3.3.2.8.1.1.13"); ++ */ + + unsigned int i; + for (i = 0; i < oids.size(); i++) +@@ -419,16 +425,16 @@ u32bit do_ecdsa_tests(Botan::RandomNumbe + { + std::cout << "Testing ECDSA (InSiTo unit tests): "; + +- test_hash_larger_than_n(rng); +- test_decode_ecdsa_X509(); ++ // test_hash_larger_than_n(rng); ++ // test_decode_ecdsa_X509(); + test_decode_ver_link_SHA256(); + test_decode_ver_link_SHA1(); +- test_sign_then_ver(rng); +- test_ec_sign(rng); +- test_create_pkcs8(rng); +- test_create_and_verify(rng); ++ // test_sign_then_ver(rng); ++ // test_ec_sign(rng); ++ // test_create_pkcs8(rng); ++ // test_create_and_verify(rng); + test_curve_registry(rng); +- test_read_pkcs8(rng); ++ // test_read_pkcs8(rng); + + std::cout << std::endl; + +diff -up Botan-1.10.5/checks/pk.cpp.eccfix Botan-1.10.5/checks/pk.cpp +--- Botan-1.10.5/checks/pk.cpp.eccfix 2013-03-02 21:19:36.000000000 +0000 ++++ Botan-1.10.5/checks/pk.cpp 2013-10-22 01:20:13.225546244 +0100 +@@ -760,14 +760,14 @@ void do_pk_keygen_tests(RandomNumberGene + #endif + + #if defined(BOTAN_HAS_ECDSA) +- EC_KEY(ECDSA_PrivateKey, "secp112r1"); +- EC_KEY(ECDSA_PrivateKey, "secp128r1"); +- EC_KEY(ECDSA_PrivateKey, "secp160r1"); +- EC_KEY(ECDSA_PrivateKey, "secp192r1"); +- EC_KEY(ECDSA_PrivateKey, "secp224r1"); ++// EC_KEY(ECDSA_PrivateKey, "secp112r1"); ++// EC_KEY(ECDSA_PrivateKey, "secp128r1"); ++// EC_KEY(ECDSA_PrivateKey, "secp160r1"); ++// EC_KEY(ECDSA_PrivateKey, "secp192r1"); ++// EC_KEY(ECDSA_PrivateKey, "secp224r1"); + EC_KEY(ECDSA_PrivateKey, "secp256r1"); + EC_KEY(ECDSA_PrivateKey, "secp384r1"); +- EC_KEY(ECDSA_PrivateKey, "secp521r1"); ++// EC_KEY(ECDSA_PrivateKey, "secp521r1"); + #endif + + #if defined(BOTAN_HAS_GOST_34_10_2001) +@@ -919,7 +919,7 @@ u32bit do_pk_validation_tests(const std: + + std::cout << std::endl; + +- do_ec_tests(rng); ++ // do_ec_tests(rng); + errors += do_ecdsa_tests(rng); + errors += do_ecdh_tests(rng); + do_pk_keygen_tests(rng); +diff -up Botan-1.10.5/checks/pk_bench.cpp.eccfix Botan-1.10.5/checks/pk_bench.cpp +--- Botan-1.10.5/checks/pk_bench.cpp.eccfix 2013-03-02 21:19:36.000000000 +0000 ++++ Botan-1.10.5/checks/pk_bench.cpp 2013-10-22 01:20:13.225546244 +0100 +@@ -77,12 +77,12 @@ using namespace Botan; + namespace { + + const char* ec_domains[] = { +- "secp160r2", +- "secp192r1", +- "secp224r1", ++// "secp160r2", ++// "secp192r1", ++// "secp224r1", + "secp256r1", + "secp384r1", +- "secp521r1", ++// "secp521r1", + 0 + }; + +diff -up Botan-1.10.5/checks/pk_valid.dat.eccfix Botan-1.10.5/checks/pk_valid.dat +--- Botan-1.10.5/checks/pk_valid.dat.eccfix 2013-03-02 21:19:36.000000000 +0000 ++++ Botan-1.10.5/checks/pk_valid.dat 2013-10-22 01:20:13.226546243 +0100 +@@ -4232,45 +4232,6 @@ MIG6AgEAMIGhBgcqhkjOOAQBMIGVAkAA8HR2W1fH + 14593FBF63EAC64976987524044D8B11AB9A95B4B75A760FE22C45A3EFD6: + + # ECDSA format is group name:private key:message:nonce:signature +-[ECDSA/EMSA1(SHA-1)] +- +-# From ANSI X9.62 +-secp192r1:\ +-1A8D598FC15BF0FD89030B5CB1111AEB92AE8BAF5EA475FB:\ +-616263:\ +-FA6DE29746BBEB7F8BB1E761F85F7DFB2983169D82FA2F4E:\ +-885052380FF147B734C330C43D39B2C4A89F29B0F749FEAD\ +-E9ECC78106DEF82BF1070CF1D4D804C3CB390046951DF686 +- +-x962_p239v1:\ +-7EF7C6FABEFFFDEA864206E80B0B08A9331ED93E698561B64CA0F7777F3D:\ +-616263:\ +-656C7196BF87DCC5D1F1020906DF2782360D36B2DE7A17ECE37D503784AF:\ +-2CB7F36803EBB9C427C58D8265F11FC5084747133078FC279DE874FBECB0\ +-2EEAE988104E9C2234A3C2BEB1F53BFA5DC11FF36A875D1E3CCB1F7E45CF +- +-brainpool160r1:\ +-1CA8A0ACE60292D2813D992C4EC7A4BCDF611C0:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-9CB692B33F02179D1A6F2A0669FD8DAAF17E4FC4:\ +-672EAFD043D30BAE7CA826828333FA70F10A14C7\ +-0F49C076BB26178277D8E490D0C77F7A9649DE31 +- +-[ECDSA/EMSA1(SHA-224)] +-secp224r1:\ +-42D126D0E51F3D6AA9B4D60BD1290853AA964A9C8698D5D5BDBAADEB:\ +-45434453412074657374206D657373616765203230313130323135:\ +-E1F6B207B4FC896879A51F65E85DB94CEB633FEC765739E689847D64:\ +-A4C80AAF3D7B61200E66D6F41EC66D3D65E9E38DC06A88FE3B7F6C4C\ +-8A5CEE4E04FE240464EA2DBB52489D3FAC1CDE6DA24A0E4C6598BCD2 +- +-brainpool224r1:\ +-47B5CCE9EED463CED28666DA57DA9D0A8BDD3F000CCFC0AE6054F1AD:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-9E9D0C9E67FF5785C3AD89195567CD3990D54C628788F26DB926F5B6:\ +-40369F41BD0D15C92DFB855779DBF439376FB6EDC4153E9B99019B79\ +-40FEF076FC8D610EC12AFC9CC43A150BD0190E507622E6623906D6B8 +- + [ECDSA/EMSA1(SHA-256)] + secp256r1:\ + 368E89CC30AE7A3B4B4903C30C238C010257FE97DB85AF35982A7960A0DBD2F3:\ +@@ -4286,20 +4247,6 @@ C1DDAA59A4E0B5D95EB873C33BC465C6782EBF7B + A8369164EF54A67303760B77AA62C4DE8122396908EA5B06DBCC2BC48264C832\ + ADB3A8855019D5AFF789EC1F276AD38A03AAF41F88593B74E5CB9DF7E4BD4922 + +-brainpool256r1:\ +-4EC702404A8047A08206721DE33F02E1F06B14E09A5582171EA9BB8AB3C9BC14:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-A9952A1B896FB2C2AEA88EA578E2A5323114978A765E03E397969DC0F282708C:\ +-54F843E89B084EEE1CFFED09F222DF041CD46DB0C48833667BA0790ECD603089\ +-5304039A927714E79E5FCDB1D043E093FD85C8DD98B835CD6C7BB492C05357E5 +- +-brainpool256r1:\ +-416D7FCEB966DF966CAE7BE2608C5C4D8939A7B5B3CF6D3E441A64886AC5FAD7:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-A07978494C1B301C1E44467853CD367624549E0E9F5092C0100A53F877AD2EF6:\ +-93935B733CCC6A8702191664346135D1D6320D86A2346DFCA41AEDFBC4260435\ +-A4A9C66485C02BC2DCC858364173FAE00EA02529BA21B56BBBB2EAA4B811416D +- + [ECDSA/EMSA1(SHA-384)] + secp384r1:\ + 100CC52F0263DCB12FDB9E50D44A4C84831A98756265DF0CBFD092D27A739821\ +@@ -4321,54 +4268,6 @@ FF83C10E8D84777D17B724957B83E1500F578F10 + A34F66CA2AF31241FAF85AEE2528438DA6BED934D75ACCF2E41176D8B661AB58\ + B7B867D802C38B39E8227F9CF0865072D381948FFFF637D8FB9B37BEC6AE0772 + +-brainpool384r1:\ +-19AD48ECFB30F115AEF41CAFD29B265A586399C0F95166017AA7DB894413A2AE\ +-821B7BE4F4E7B6BBC22A4E2EB1CC0865:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-83928FD1219F1C6D5B128C0ECD2E39A83399CE609382D41890D43FD476318E0C\ +-26264E98E0D5A0DBCC28A8C01C2D63D7:\ +-4B800A206ED7807C0F15798509164709E94ED73B5E02B10D65F45B6C2B7FD694\ +-37F3B5D1342DAF0988CA100B8875C739\ +-2CFA819E10B76CFE12B2C6485D8326B66E6256CD2F4A6DFEB9B2B7BDD732EA9E\ +-9D5398DDECCBEAAF3FD53D554AA1FADD +- +-[ECDSA/EMSA1(SHA-512)] +- +-secp521r1:\ +-1511908E830069DAD59E8BA8F1BD4045612A4844805F61F7ECD92A1DEE1877B7\ +-E62A57860314820C97FFC972732E3C4C0AE837103692E85B3A11B49EB3E20EF1599:\ +-45434453412F53484128353132292074657374206D6573736167652032303131\ +-30323135:\ +-01C352020AAA6D14B6FC2B78FD46209A9EEF6A357CD8B5D53738E3D655FE7A80\ +-8396E1DC5742058D05F2D76C8CBF4832BE0580A6FD7B4C7426656D17680DEAAEEEC2:\ +-0138A515C79EECAAB50139FB5D9EF5A771CC1C0999F2E54B5A1A9370EA8ADCFD\ +-DDD6E9933A39EDA0862F3ECAEBD49EA5ED58D93DA8F72B1CFB11E52A1528AEC8\ +-63870060D717B29AD6D36DE953A4753FAC58629429EF4DD8F98B5A4F5504C5B2\ +-29C23C609905632CD8D839DC472693698D7A149E8F3F17462F86BA0A7A895D80\ +-583A46E9 +- +-brainpool512r1:\ +-1433AE89858BE7DD9346AF015FEC69F0556982FFEB9CCEF7FB1CE71155F7620C\ +-ED4A6ACD0F35461A17C8370C4E600BECBACC0F7C1D2D1A2C00203A0E6626C21C:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-AA72BC70ABD9E078DDE47F5440E75A93F136F6EAA5267F591E0D3F562DE48BD8\ +-FED21B9E3F6F5560250566A00C7AAE7E57770BFC7D18A3E7750DC6C7083CC5B0:\ +-A058CD406C7F2D87FBBDDDD1870C67D1ACBD222D45A929565101842EDFAEFB89\ +-3CF07AD22CAC0F3350A7D1300741AB5ECE38498F196690CBCEDBF8C866995E5C\ +-17F48EA66EB70ADE68F6C16103BE54DD004230270E1F8CAC2D6BD47F717C0D1B\ +-1E335FA4AAA5212321EE93E55FED129D781912A0D87B78A5B569DA272B3C9469 +- +-brainpool512r1:\ +-83DBEFECAF8CFF78C575BE9659C1A104767979497AD9B589B1B13705C71F1DEF\ +-AF5CA76C8700236CE2392268E0133CAADE358E3D4F2E64CB4AB8517079E3EFA0:\ +-43727970746F2B2B20352E362E312045434453412074657374206D7367:\ +-A110CC7BEF64F5C0349344025B97B151C735408BD2BC0D0CC4E54642EA0DF33E\ +-829E85916086B51624B830BB2CDF53DAD9003A6D194115051139DBC3E81DF197:\ +-3254388208915E0EEB99DA89AA198C6FDB1A31B21D3B69EF8EFE4848AE78C32A\ +-4C489347510A9DD04125BBE95F847E14A2DF3267A0A6D1B5EC442B130C9B5DD1\ +-924FCD9F365897570329BFEC41FBAF42961210F3FF850DE5736FFBAAB09C5C03\ +-E0058BD51C8A8EF0FF221F31CF93FE59572ADA3CFEC7016085258A45D1E8544C +- + # ECC verification format is group name:public key:message:signature + [GOST_3410_VA/EMSA1(GOST-34.11)] + gost_256A:\ +diff -up Botan-1.10.5/src/libstate/policy.cpp.eccfix Botan-1.10.5/src/libstate/policy.cpp +--- Botan-1.10.5/src/libstate/policy.cpp.eccfix 2013-03-02 21:19:37.000000000 +0000 ++++ Botan-1.10.5/src/libstate/policy.cpp 2013-10-22 01:20:13.226546243 +0100 +@@ -210,6 +210,7 @@ void set_default_oids(Library_State& con + + /* ECC domain parameters */ + ++ /* Disabled. + add_oid(config, "1.3.132.0.6", "secp112r1"); + add_oid(config, "1.3.132.0.7", "secp112r2"); + add_oid(config, "1.3.132.0.8", "secp160r1"); +@@ -221,7 +222,9 @@ void set_default_oids(Library_State& con + add_oid(config, "1.3.132.0.31", "secp192k1"); + add_oid(config, "1.3.132.0.32", "secp224k1"); + add_oid(config, "1.3.132.0.33", "secp224r1"); ++ */ + add_oid(config, "1.3.132.0.34", "secp384r1"); ++ /* Disabled. + add_oid(config, "1.3.132.0.35", "secp521r1"); + + add_oid(config, "1.2.840.10045.3.1.1", "secp192r1"); +@@ -230,8 +233,10 @@ void set_default_oids(Library_State& con + add_oid(config, "1.2.840.10045.3.1.4", "x962_p239v1"); + add_oid(config, "1.2.840.10045.3.1.5", "x962_p239v2"); + add_oid(config, "1.2.840.10045.3.1.6", "x962_p239v3"); ++ */ + add_oid(config, "1.2.840.10045.3.1.7", "secp256r1"); + ++ /* Disabled. + add_oid(config, "1.3.36.3.3.2.8.1.1.1", "brainpool160r1"); + add_oid(config, "1.3.36.3.3.2.8.1.1.3", "brainpool192r1"); + add_oid(config, "1.3.36.3.3.2.8.1.1.5", "brainpool224r1"); +@@ -242,6 +247,7 @@ void set_default_oids(Library_State& con + + add_oid(config, "1.2.643.2.2.35.1", "gost_256A"); + add_oid(config, "1.2.643.2.2.36.0", "gost_256A"); ++ */ + + /* CVC */ + add_oid(config, "0.4.0.127.0.7.3.1.2.1", diff --git a/botan.spec b/botan.spec index 1ddb878..9fec23c 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -14,6 +14,8 @@ Source0: Botan-%{version}.stripped.tbz Source1: README.fedora Patch0: botan-aarch64.patch Patch1: botan-1.10-add-ppc64le.patch +# Enable only cleared ECC algorithms +Patch2: botan-1.10.5-ecc-fix.patch BuildRequires: gcc-c++ BuildRequires: python @@ -81,7 +83,10 @@ interfaces may change in the future. %setup -q -n Botan-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .eccfix +# These tests will fail. +rm -rf checks/ec_tests.cpp %build # we have the necessary prerequisites, so enable optional modules @@ -178,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Feb 6 2015 Thomas Moschny - 1.10.9-4 +- Re-enable cleared ECC. Patch by Tom Callaway . + * Thu Feb 5 2015 Thomas Moschny - 1.10.9-3 - Disable gmp engine (see bug 1116406). - Use _pkgdocdir. diff --git a/repack.sh b/repack.sh index d23452d..3eb65b2 100755 --- a/repack.sh +++ b/repack.sh @@ -13,11 +13,6 @@ ${compr} -cd ${name}${suffix} > ${tmpfile} 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 -tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecc_key -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 ${compr} -c ${tmpfile} > ${name}${newsuffix} diff --git a/sources b/sources index 458bb6a..804aba0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -126ef6f9c7527392ecd5a0337669c8d6 Botan-1.10.9.stripped.tbz +44eb12a2757f51623b17b38fe8b9df2c Botan-1.10.9.stripped.tbz From e1d94114b5455db94f03e701e4095d65d93ca676 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 23 Apr 2015 19:10:52 +0200 Subject: [PATCH 026/108] Rebuild for gcc5. --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 9fec23c..bd3f129 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -183,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Apr 23 2015 Thomas Moschny - 1.10.9-5 +- Rebuild for gcc5. + * Fri Feb 6 2015 Thomas Moschny - 1.10.9-4 - Re-enable cleared ECC. Patch by Tom Callaway . From 159d3cc78ccaf9d675ab1ba8be9beee16004cac9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:02:04 +0000 Subject: [PATCH 027/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index bd3f129..ab883f6 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -183,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.10.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Apr 23 2015 Thomas Moschny - 1.10.9-5 - Rebuild for gcc5. From a5ec2066fca22031769be8d773b865bf83e9f483 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 24 Jul 2015 21:29:54 +0200 Subject: [PATCH 028/108] rebuild for Boost 1.58 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index ab883f6..36d520a 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -183,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jul 24 2015 David Tardon - 1.10.9-7 +- rebuild for Boost 1.58 + * Wed Jun 17 2015 Fedora Release Engineering - 1.10.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2aff43e8af6c739b8ca582e8d093dfc6b1c03630 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 21:18:50 +0100 Subject: [PATCH 029/108] Rebuilt for Boost 1.59 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 36d520a..ab61a7a 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -183,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Aug 27 2015 Jonathan Wakely - 1.10.9-8 +- Rebuilt for Boost 1.59 + * Fri Jul 24 2015 David Tardon - 1.10.9-7 - rebuild for Boost 1.58 From 99d10d6ee611e5a971fa3a9c7ac6c45b2f5c92ab Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 14 Jan 2016 17:18:08 +0000 Subject: [PATCH 030/108] Rebuilt for Boost 1.60 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index ab61a7a..9d2b2f8 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -183,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Jan 14 2016 Jonathan Wakely - 1.10.9-9 +- Rebuilt for Boost 1.60 + * Thu Aug 27 2015 Jonathan Wakely - 1.10.9-8 - Rebuilt for Boost 1.59 From 810b42d3078319dc74830e70430053b41ed39659 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:11:24 +0000 Subject: [PATCH 031/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 9d2b2f8..5f54228 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -183,6 +183,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.10.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Jonathan Wakely - 1.10.9-9 - Rebuilt for Boost 1.60 From 7aaaba071e7ddfa790899e6bf7c476155559ff9b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 8 Feb 2016 18:40:49 +0100 Subject: [PATCH 032/108] Update to 1.10.12. - Mark license.txt with %license. - Change %define -> %global. --- .gitignore | 12 ++---------- botan.spec | 31 +++++++++++++++++++++++-------- repack.sh | 26 ++++++++++++++------------ sources | 2 +- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index a10c5ff..b5deeda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ -/Botan-1.8.9.tbz -/Botan-1.8.9.stripped.tbz -/Botan-1.8.10.stripped.tbz -/Botan-1.8.11.stripped.tbz -/Botan-1.8.12.stripped.tbz -/Botan-1.8.13.stripped.tbz -/Botan-1.8.14.stripped.tbz -/Botan-1.10.5.stripped.tbz -/Botan-1.10.8.stripped.tbz -/Botan-1.10.9.stripped.tbz +/Botan-*.stripped.tbz +/Botan-1.10.12.stripped.tar.gz diff --git a/botan.spec b/botan.spec index 5f54228..a20b4a7 100644 --- a/botan.spec +++ b/botan.spec @@ -1,16 +1,16 @@ %global major_version 1.10 Name: botan -Version: %{major_version}.9 -Release: 10%{?dist} +Version: %{major_version}.12 +Release: 1%{?dist} Summary: Crypto library written in C++ 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 Patch0: botan-aarch64.patch Patch1: botan-1.10-add-ppc64le.patch @@ -90,10 +90,10 @@ rm -rf checks/ec_tests.cpp %build # we have the necessary prerequisites, so enable optional modules -%define enable_modules bzip2,zlib,openssl +%global enable_modules bzip2,zlib,openssl # fixme: maybe disable unix_procs, very slow. -%define disable_modules gnump +%global disable_modules gnump ./configure.py \ --prefix=%{_prefix} \ @@ -141,8 +141,13 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} %files %dir %{_pkgdocdir} %{_pkgdocdir}/readme.txt -%{_pkgdocdir}/license.txt %{_pkgdocdir}/README.fedora +%if 0%{?_licensedir:1} +%exclude %{_pkgdocdir}/license.txt +%license doc/license.txt +%else +%{_pkgdocdir}/license.txt +%endif # licensedir %{_libdir}/libbotan-%{major_version}.so.* @@ -161,8 +166,13 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} # next files duplicated on purpose, because -doc doesn't depend on the # main package %{_pkgdocdir}/readme.txt -%{_pkgdocdir}/license.txt %{_pkgdocdir}/README.fedora +%if 0%{?_licensedir:1} +%exclude %{_pkgdocdir}/license.txt +%license doc/license.txt +%else +%{_pkgdocdir}/license.txt +%endif # licensedir %files python @@ -183,6 +193,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Feb 8 2016 Thomas Moschny - 1.10.12-1 +- Update to 1.10.12. +- Mark license.txt with %%license. +- Change %%define -> %%global. + * Wed Feb 03 2016 Fedora Release Engineering - 1.10.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/repack.sh b/repack.sh index 3eb65b2..53d4959 100755 --- a/repack.sh +++ b/repack.sh @@ -1,18 +1,20 @@ #! /bin/bash -version=1.10.9 -name=Botan-${version} -suffix=.tbz -newsuffix=.stripped.tbz -compr=bzip2 +name=Botan-1.10.12 +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/rc6 -tar --delete --file=${tmpfile} Botan-${version}/src/block/rc5 -tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/gost_3410 +tar --delete --file=${dst%.gz} \ + ${name}/src/block/rc6 \ + ${name}/src/block/rc5 \ + ${name}/src/pubkey/gost_3410 + +touch -m -r ${src} ${dst%.gz} + +gzip ${dst%.gz} -${compr} -c ${tmpfile} > ${name}${newsuffix} diff --git a/sources b/sources index 804aba0..526ce3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44eb12a2757f51623b17b38fe8b9df2c Botan-1.10.9.stripped.tbz +d59f0fd44bc3f8b71025d79c9ffe75ba Botan-1.10.12.stripped.tar.gz From b4fa4c98ecbb43df3274f4453511ca1bf1b11e74 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 15 Feb 2016 19:04:11 +0100 Subject: [PATCH 033/108] Update to 1.8.15. - Remove patch applied upstream. - Remove %defattr directives. --- .gitignore | 1 + botan-1.8.14-fix_prime_testing.patch | 14 ------------ botan-1.8.14-soname.patch | 19 ---------------- botan-1.8.15-soname.patch | 12 ++++++++++ botan.spec | 23 +++++++++---------- repack.sh | 34 ++++++++++++++-------------- sources | 2 +- 7 files changed, 42 insertions(+), 63 deletions(-) delete mode 100644 botan-1.8.14-fix_prime_testing.patch delete mode 100644 botan-1.8.14-soname.patch create mode 100644 botan-1.8.15-soname.patch diff --git a/.gitignore b/.gitignore index c755cb4..970128b 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/botan-1.8.14-fix_prime_testing.patch b/botan-1.8.14-fix_prime_testing.patch deleted file mode 100644 index 5698c6a..0000000 --- a/botan-1.8.14-fix_prime_testing.patch +++ /dev/null @@ -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 diff --git a/botan-1.8.14-soname.patch b/botan-1.8.14-soname.patch deleted file mode 100644 index 6976728..0000000 --- a/botan-1.8.14-soname.patch +++ /dev/null @@ -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' % ( diff --git a/botan-1.8.15-soname.patch b/botan-1.8.15-soname.patch new file mode 100644 index 0000000..92621f0 --- /dev/null +++ b/botan-1.8.15-soname.patch @@ -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' % ( diff --git a/botan.spec b/botan.spec index 5a051b4..6f43c6c 100644 --- a/botan.spec +++ b/botan.spec @@ -1,20 +1,17 @@ Name: botan -Version: 1.8.14 -Release: 2%{?dist} +Version: 1.8.15 +Release: 1%{?dist} Summary: Crypto library written in C++ 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 -# 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 +Patch0: botan-1.8.15-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -53,8 +50,7 @@ developing applications that use %{name}. %prep %setup -q -n Botan-%{version} -%patch0 -p0 -%patch1 -p0 +%patch0 -p1 cp -av %{SOURCE1} . %build @@ -97,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 @@ -105,7 +100,6 @@ rm -rf %{buildroot} %files devel -%defattr(-,root,root,-) %doc doc/examples %doc _doc/api* _doc/tutorial* %{_bindir}/botan-config @@ -126,6 +120,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Feb 13 2016 Thomas Moschny - 1.8.15-1 +- Update to 1.8.15. +- Remove patch applied upstream. +- Remove %%defattr directives. + * Sat May 10 2014 Thomas Moschny - 1.8.14-2 - Add patch to fix prime testing. diff --git a/repack.sh b/repack.sh index 9bd4162..475c8b7 100755 --- a/repack.sh +++ b/repack.sh @@ -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} diff --git a/sources b/sources index 219b46d..cdf2878 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b5ce78b1cfc0735eb7ec4f6903068ca Botan-1.8.14.stripped.tbz +9206a5cb467cd9c8f81be72a52a2d4f8 Botan-1.8.15.stripped.tar.gz From e95f726d0ba42cac43a55eb9448b59125ae4e43e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 29 Apr 2016 20:53:51 +0200 Subject: [PATCH 034/108] Update to 1.10.13. --- .gitignore | 1 + botan.spec | 5 ++++- repack.sh | 2 +- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b5deeda..01136d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Botan-*.stripped.tbz /Botan-1.10.12.stripped.tar.gz +/Botan-1.10.13.stripped.tar.gz diff --git a/botan.spec b/botan.spec index a20b4a7..57a0108 100644 --- a/botan.spec +++ b/botan.spec @@ -1,7 +1,7 @@ %global major_version 1.10 Name: botan -Version: %{major_version}.12 +Version: %{major_version}.13 Release: 1%{?dist} Summary: Crypto library written in C++ @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Apr 29 2016 Thomas Moschny - 1.10.13-1 +- Update to 1.10.13. + * Mon Feb 8 2016 Thomas Moschny - 1.10.12-1 - Update to 1.10.12. - Mark license.txt with %%license. diff --git a/repack.sh b/repack.sh index 53d4959..a55199a 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -name=Botan-1.10.12 +name=Botan-1.10.13 src=${name}.tgz dst=${name}.stripped.tar.gz diff --git a/sources b/sources index 526ce3d..34e6824 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d59f0fd44bc3f8b71025d79c9ffe75ba Botan-1.10.12.stripped.tar.gz +d7cc44ba99c8b989913a11a5a8acf927 Botan-1.10.13.stripped.tar.gz From e5b29be54270417e21712c1c4ed7fb6e1e3d0a2f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 4 Jul 2016 01:30:02 +0200 Subject: [PATCH 035/108] Provide python2- and python3- subpackages (rhbz#1313786). - Move python examples to -doc subpackage. --- botan-1.10.13-python-init.patch | 9 +++ botan-boost_python.patch | 20 ++++++ botan.spec | 110 ++++++++++++++++++++++++++------ 3 files changed, 118 insertions(+), 21 deletions(-) create mode 100644 botan-1.10.13-python-init.patch create mode 100644 botan-boost_python.patch diff --git a/botan-1.10.13-python-init.patch b/botan-1.10.13-python-init.patch new file mode 100644 index 0000000..040a9a7 --- /dev/null +++ b/botan-1.10.13-python-init.patch @@ -0,0 +1,9 @@ +diff -up Botan-1.10.13/src/wrap/python/__init__.py.orig Botan-1.10.13/src/wrap/python/__init__.py +--- Botan-1.10.13/src/wrap/python/__init__.py.orig 2016-04-28 15:27:08.000000000 +0200 ++++ Botan-1.10.13/src/wrap/python/__init__.py 2016-06-30 18:02:11.724997966 +0200 +@@ -1,4 +1,4 @@ +-from _botan import * ++from botan._botan import * + + # Initialize the library when the module is imported + init = LibraryInitializer() diff --git a/botan-boost_python.patch b/botan-boost_python.patch new file mode 100644 index 0000000..ccc016b --- /dev/null +++ b/botan-boost_python.patch @@ -0,0 +1,20 @@ +diff -up Botan-1.10.13/src/build-data/makefile/python.in.orig Botan-1.10.13/src/build-data/makefile/python.in +--- Botan-1.10.13/src/build-data/makefile/python.in.orig 2016-04-28 15:27:08.000000000 +0200 ++++ Botan-1.10.13/src/build-data/makefile/python.in 2016-06-30 16:12:04.001859858 +0200 +@@ -15,13 +15,15 @@ BOTAN_PYTHON_MODDIR = %{python_obj_dir} + + PYTHON_OBJS = %{python_objs} + ++BOOST_PYTHON = boost_python ++ + all: $(BOTAN_PYTHON_MODDIR)/_botan.so + + %{python_build_cmds} + + $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS) + cp %{python_dir}/*.py $(BOTAN_PYTHON_MODDIR) +- $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -lboost_python -o $@ ++ $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -l$(BOOST_PYTHON) -o $@ + + clean: + rm -rf $(BOTAN_PYTHON_MODDIR)/* diff --git a/botan.spec b/botan.spec index 57a0108..8e4eea9 100644 --- a/botan.spec +++ b/botan.spec @@ -1,8 +1,12 @@ %global major_version 1.10 +%if 0%{?fedora} +%global with_python3 1 +%endif + Name: botan Version: %{major_version}.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -16,19 +20,31 @@ Patch0: botan-aarch64.patch Patch1: botan-1.10-add-ppc64le.patch # Enable only cleared ECC algorithms Patch2: botan-1.10.5-ecc-fix.patch +# Make boost_python selectable +Patch3: botan-boost_python.patch +# Fix wrong path +Patch4: botan-1.10.13-python-init.patch BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: python-sphinx -BuildRequires: python-devel +BuildRequires: python2 +BuildRequires: python2-devel BuildRequires: boost-python-devel +%if 0%{?with_python3} +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: boost-python3-devel +%endif # with_python3 +BuildRequires: python-sphinx BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel -# do not check .so files in the python_sitelib directory -%global __provides_exclude_from ^(%{python_sitearch}/.*\\.so)$ +# do not check .so files in the python_sitelib directories +%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so)$ +%if 0%{?with_python3} +%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ +%endif # with_python3 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -66,24 +82,45 @@ BuildArch: noarch This package contains HTML documentation for %{name}. -%package python -Summary: Python bindings for %{name} +%package -n python2-%{name} +Summary: Python2 bindings for %{name} Group: System Environment/Libraries +%{?python_provide:%python_provide python2-%{name}} +# the python2 package was named botan-python up to 1.10.13-1 +Provides: %{name}-python = %{version}-%{release} +Obsoletes: %{name}-python < 1.10.13-2 -%description python +%description -n python2-%{name} %{summary} -This package contains the Python binding for %{name}. +This package contains the Python2 binding for %{name}. Note: The Python binding should be considered alpha software, and the interfaces may change in the future. +%if 0%{?with_python3} +%package -n python3-%{name} +Summary: Python3 bindings for %{name} +Group: System Environment/Libraries +%{?python_provide:%python_provide python2-%{name}} + +%description -n python3-%{name} +%{summary} + +This package contains the Python3 binding for %{name}. + +Note: The Python binding should be considered alpha software, and the +interfaces may change in the future. +%endif # with_python3 + %prep %setup -q -n Botan-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 -b .eccfix +%patch3 -p1 +%patch4 -p1 # These tests will fail. rm -rf checks/ec_tests.cpp @@ -104,14 +141,30 @@ rm -rf checks/ec_tests.cpp --enable-modules=%{enable_modules} \ --disable-modules=%{disable_modules} \ --with-boost-python \ - --with-python-version=%{python_version} \ + --with-python-version=dummy.dummy \ --with-sphinx +%if 0%{?with_python3} +cp -a build/python{,3} +%endif # with_python3 + # (ab)using CXX as an easy way to inject our CXXFLAGS make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} -make -f Makefile.python \ - CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} +make -f Makefile.python \ + CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ + PYTHON_INC="$(python2-config --includes)" \ + PYTHON_ROOT=. + +%if 0%{?with_python3} +mv build/python{,2} ; mv build/python{3,} +make -f Makefile.python \ + CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ + PYTHON_INC="$(python3-config --includes)" \ + PYTHON_ROOT=. \ + BOOST_PYTHON=boost_python3 +mv build/python{,3} ; mv build/python{2,} +%endif # with_python3 %install make install \ @@ -121,12 +174,19 @@ make install \ INSTALL_CMD_DATA="install -p -m 644" make -f Makefile.python install \ - PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python_sitearch} + PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python2_sitearch} + +%if 0%{?with_python3} +mv build/python{,2} ; mv build/python{3,} +make -f Makefile.python install \ + PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python3_sitearch} +mv build/python{,3} ; mv build/python{2,} +%endif # with_python3 # fixups find doc/examples -type f -exec chmod -x {} \; -mv doc/examples/python doc/python-examples -cp -a doc/{examples,python-examples,license.txt} \ +mv doc/examples/python doc/python2-examples +cp -a doc/{examples,python2-examples,license.txt} \ %{buildroot}%{_pkgdocdir} cp -a %{SOURCE1} %{buildroot}%{_pkgdocdir} rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} @@ -173,13 +233,17 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} %else %{_pkgdocdir}/license.txt %endif # licensedir +%{_pkgdocdir}/python2-examples -%files python -%{_pkgdocdir}/python-examples -%exclude %{_pkgdocdir}/python-examples/*.pyc -%exclude %{_pkgdocdir}/python-examples/*.pyo -%{python_sitearch}/%{name} +%files -n python2-%{name} +%{python2_sitearch}/%{name} + + +%if 0%{?with_python3} +%files -n python3-%{name} +%{python3_sitearch}/%{name} +%endif # with_python3 %check @@ -193,6 +257,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun Jul 3 2016 Thomas Moschny - 1.10.13-2 +- Provide python2- and python3- subpackages (rhbz#1313786). +- Move python examples to -doc subpackage. + * Fri Apr 29 2016 Thomas Moschny - 1.10.13-1 - Update to 1.10.13. From 5b87a3fc47dbeb932dc56183a47776fc018d1bb0 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 4 Jul 2016 02:05:33 +0200 Subject: [PATCH 036/108] Fix typo. --- botan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/botan.spec b/botan.spec index 8e4eea9..fb1667c 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -102,7 +102,7 @@ interfaces may change in the future. %package -n python3-%{name} Summary: Python3 bindings for %{name} Group: System Environment/Libraries -%{?python_provide:%python_provide python2-%{name}} +%{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} %{summary} @@ -257,6 +257,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun Jul 3 2016 Thomas Moschny - 1.10.13-3 +- Fix typo. + * Sun Jul 3 2016 Thomas Moschny - 1.10.13-2 - Provide python2- and python3- subpackages (rhbz#1313786). - Move python examples to -doc subpackage. From 84dde5b3f2f6b4d1c93498108d66e6b3e2aa6df2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:40:59 +0000 Subject: [PATCH 037/108] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index fb1667c..f7f15c8 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -257,6 +257,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.10.13-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Sun Jul 3 2016 Thomas Moschny - 1.10.13-3 - Fix typo. From 50c5d7062df849dae70892b7151f4a8e0341a9e6 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Dec 2016 07:21:25 +0100 Subject: [PATCH 038/108] Update to 1.10.14. --- .gitignore | 4 +--- botan.spec | 7 +++++-- repack.sh | 2 +- sources | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 01136d1..bd7a36c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/Botan-*.stripped.tbz -/Botan-1.10.12.stripped.tar.gz -/Botan-1.10.13.stripped.tar.gz +/Botan-*.stripped.tar.gz diff --git a/botan.spec b/botan.spec index f7f15c8..599222a 100644 --- a/botan.spec +++ b/botan.spec @@ -5,8 +5,8 @@ %endif Name: botan -Version: %{major_version}.13 -Release: 4%{?dist} +Version: %{major_version}.14 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -257,6 +257,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Dec 3 2016 Thomas Moschny - 1.10.14-1 +- Update to 1.10.14. + * Tue Jul 19 2016 Fedora Release Engineering - 1.10.13-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/repack.sh b/repack.sh index a55199a..af5cd56 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -name=Botan-1.10.13 +name=Botan-1.10.14 src=${name}.tgz dst=${name}.stripped.tar.gz diff --git a/sources b/sources index 34e6824..bbe1e99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7cc44ba99c8b989913a11a5a8acf927 Botan-1.10.13.stripped.tar.gz +55fb6734ce039c79ddac939af9a176dc Botan-1.10.14.stripped.tar.gz From a596d4e935c5930b66d5d60ed35fbf9865112b08 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 9 Dec 2016 21:10:03 +0100 Subject: [PATCH 039/108] Update to 1.10.14. - Depend on OpenSSL 1.0 compat package for F26+. --- botan.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 599222a..aabdf68 100644 --- a/botan.spec +++ b/botan.spec @@ -38,7 +38,11 @@ BuildRequires: boost-python3-devel BuildRequires: python-sphinx BuildRequires: bzip2-devel BuildRequires: zlib-devel +%if 0%{?fedora} >=26 +BuildRequires: compat-openssl10-devel +%else BuildRequires: openssl-devel +%endif # do not check .so files in the python_sitelib directories %global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so)$ @@ -257,8 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog -* Sat Dec 3 2016 Thomas Moschny - 1.10.14-1 +* Fri Dec 9 2016 Thomas Moschny - 1.10.14-1 - Update to 1.10.14. +- Depend on OpenSSL 1.0 compat package for F26+. * Tue Jul 19 2016 Fedora Release Engineering - 1.10.13-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 8f890a6325c0fde5ece0d9f73bd26aa1f8075598 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 10 Dec 2016 09:34:39 +0100 Subject: [PATCH 040/108] Fix requirement of the -devel package. --- botan.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/botan.spec b/botan.spec index aabdf68..32ec998 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -68,7 +68,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel +%if 0%{?fedora} >=26 +Requires: compat-openssl10-devel +%else Requires: openssl-devel +%endif %description devel The %{name}-devel package contains libraries and header files for @@ -261,7 +265,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog -* Fri Dec 9 2016 Thomas Moschny - 1.10.14-1 +* Fri Dec 9 2016 Thomas Moschny - 1.10.14-2 - Update to 1.10.14. - Depend on OpenSSL 1.0 compat package for F26+. From bf8adb66c8ac02ce179d69531c62a9386eaa70da Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 10 Dec 2016 18:33:34 +0100 Subject: [PATCH 041/108] Add -std=c++11 to the compilerflags (needed on EPEL7). --- botan.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/botan.spec b/botan.spec index 32ec998..f4af8fe 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -157,17 +157,17 @@ cp -a build/python{,3} %endif # with_python3 # (ab)using CXX as an easy way to inject our CXXFLAGS -make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} +make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} make -f Makefile.python \ - CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ + CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ PYTHON_INC="$(python2-config --includes)" \ PYTHON_ROOT=. %if 0%{?with_python3} mv build/python{,2} ; mv build/python{3,} make -f Makefile.python \ - CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ + CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ PYTHON_INC="$(python3-config --includes)" \ PYTHON_ROOT=. \ BOOST_PYTHON=boost_python3 @@ -255,7 +255,7 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} %check -make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check +make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check # these checks would fail mv checks/validate.dat{,.orig} @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Dec 10 2016 Thomas Moschny - 1.10.14-3 +- Add -std=c++11 to the compilerflags (needed on EPEL7). + * Fri Dec 9 2016 Thomas Moschny - 1.10.14-2 - Update to 1.10.14. - Depend on OpenSSL 1.0 compat package for F26+. From 16f0c7206088ea0c5749d2e6c32f006a9fd4bbb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 042/108] Rebuild for Python 3.6 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index f4af8fe..59b6162 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.10.14-4 +- Rebuild for Python 3.6 + * Sat Dec 10 2016 Thomas Moschny - 1.10.14-3 - Add -std=c++11 to the compilerflags (needed on EPEL7). From e9cbd68f6b1a9577f5beed7be3fd1adb6e058b7f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 18:00:56 +0000 Subject: [PATCH 043/108] Rebuilt for Boost 1.63 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 59b6162..9029444 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jan 27 2017 Jonathan Wakely - 1.10.14-5 +- Rebuilt for Boost 1.63 + * Mon Dec 19 2016 Miro Hrončok - 1.10.14-4 - Rebuild for Python 3.6 From 22ea44d6b13afa39da6cc8b9b5254506884daaa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:01:38 +0000 Subject: [PATCH 044/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 9029444..52ad87d 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.10.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 1.10.14-5 - Rebuilt for Boost 1.63 From 5b3d5c814c1080237de6c273e6e1be7ce54e87c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:42:25 +0000 Subject: [PATCH 045/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 52ad87d..372d5bb 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon May 15 2017 Fedora Release Engineering - 1.10.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.10.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ac6f1cb70a80bf4f5f7f108274b8e9ce2ca6c329 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 3 Jul 2017 16:59:12 +0100 Subject: [PATCH 046/108] Rebuilt for Boost 1.64 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 372d5bb..502f78c 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Jul 03 2017 Jonathan Wakely - 1.10.14-8 +- Rebuilt for Boost 1.64 + * Mon May 15 2017 Fedora Release Engineering - 1.10.14-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From fd263d946c54e4decc80e4eb51fd3235082ad8eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 04:11:06 +0000 Subject: [PATCH 047/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 502f78c..a1b1a47 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.10.14-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 03 2017 Jonathan Wakely - 1.10.14-8 - Rebuilt for Boost 1.64 From 1b5794187d9d36630c9895f550cb0117cad76202 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 18:24:07 +0000 Subject: [PATCH 048/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index a1b1a47..32afc84 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.10.14-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.10.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c5907002c3c2c12c453ba69c2cf51b2f5ac9ee38 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 13 Aug 2017 17:01:49 +0200 Subject: [PATCH 049/108] Update to 1.10.16. --- botan-avoid-gcc7-miscompilation.patch | 16 ++++++++++++++++ botan.spec | 12 +++++++++--- repack.sh | 2 +- sources | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 botan-avoid-gcc7-miscompilation.patch diff --git a/botan-avoid-gcc7-miscompilation.patch b/botan-avoid-gcc7-miscompilation.patch new file mode 100644 index 0000000..23ef69d --- /dev/null +++ b/botan-avoid-gcc7-miscompilation.patch @@ -0,0 +1,16 @@ +diff -up Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp.orig Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp +--- Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp.orig 2017-04-05 03:06:45.000000000 +0200 ++++ Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp 2017-08-13 16:29:34.720567939 +0200 +@@ -90,8 +90,11 @@ void GOST_34_11::compress_n(const byte i + + // P transformation + for(size_t k = 0; k != 4; ++k) ++ { ++ const uint64_t UVk = U[k] ^ V[k]; + for(size_t l = 0; l != 8; ++l) +- key[4*l+k] = get_byte(l, U[k]) ^ get_byte(l, V[k]); ++ key[4*l+k] = get_byte(l, UVk); ++ } + + cipher.set_key(key, 32); + cipher.encrypt(&hash[8*j], S + 8*j); diff --git a/botan.spec b/botan.spec index 32afc84..cd4bfa8 100644 --- a/botan.spec +++ b/botan.spec @@ -5,8 +5,8 @@ %endif Name: botan -Version: %{major_version}.14 -Release: 10%{?dist} +Version: %{major_version}.16 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -24,6 +24,8 @@ Patch2: botan-1.10.5-ecc-fix.patch Patch3: botan-boost_python.patch # Fix wrong path Patch4: botan-1.10.13-python-init.patch +# See https://github.com/randombit/botan/issues/882 +Patch5: botan-avoid-gcc7-miscompilation.patch BuildRequires: gcc-c++ BuildRequires: python2 @@ -35,7 +37,7 @@ BuildRequires: python3-devel BuildRequires: boost-python3-devel %endif # with_python3 -BuildRequires: python-sphinx +BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: zlib-devel %if 0%{?fedora} >=26 @@ -129,6 +131,7 @@ interfaces may change in the future. %patch2 -p1 -b .eccfix %patch3 -p1 %patch4 -p1 +%patch5 -p1 # These tests will fail. rm -rf checks/ec_tests.cpp @@ -265,6 +268,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun Aug 13 2017 Thomas Moschny - 1.10.16-1 +- Update to 1.10.16. + * Wed Aug 02 2017 Fedora Release Engineering - 1.10.14-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/repack.sh b/repack.sh index af5cd56..e38d5a4 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -name=Botan-1.10.14 +name=Botan-1.10.16 src=${name}.tgz dst=${name}.stripped.tar.gz diff --git a/sources b/sources index bbe1e99..7d505fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55fb6734ce039c79ddac939af9a176dc Botan-1.10.14.stripped.tar.gz +SHA512 (Botan-1.10.16.stripped.tar.gz) = 67b5cb788903e20cd555d6ed2aa62b646b17d9b0df59d52f04c48d9d60e05531549f05a4d2679b865ca4517797f3b9e2b5c37181c0815c0975e28b9df5c8c817 From d2d8099106ce133fc34bc277ff910b897f8f7a56 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 8 Sep 2017 08:33:34 -0700 Subject: [PATCH 050/108] Cleanup spec file conditionals --- botan.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/botan.spec b/botan.spec index cd4bfa8..d262bc5 100644 --- a/botan.spec +++ b/botan.spec @@ -1,12 +1,12 @@ %global major_version 1.10 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %endif Name: botan Version: %{major_version}.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -40,7 +40,7 @@ BuildRequires: boost-python3-devel BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: zlib-devel -%if 0%{?fedora} >=26 +%if 0%{?fedora} >=26 || 0%{?rhel} > 7 BuildRequires: compat-openssl10-devel %else BuildRequires: openssl-devel @@ -70,7 +70,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel -%if 0%{?fedora} >=26 +%if 0%{?fedora} >=26 || 0%{?rhel} > 7 Requires: compat-openssl10-devel %else Requires: openssl-devel @@ -268,6 +268,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Sep 08 2017 Troy Dawson - 1.10.16-2 +- Cleanup spec file conditionals + * Sun Aug 13 2017 Thomas Moschny - 1.10.16-1 - Update to 1.10.16. From 26ada87302fa842f3305af2221950710400e6714 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 2 Oct 2017 19:25:41 +0200 Subject: [PATCH 051/108] Update to 1.10.17. Remove obsolete patches. --- botan-1.10-add-ppc64le.patch | 50 --------------------------- botan-aarch64.patch | 21 ----------- botan-avoid-gcc7-miscompilation.patch | 16 --------- botan.spec | 25 ++++++-------- repack.sh | 2 +- sources | 2 +- 6 files changed, 13 insertions(+), 103 deletions(-) delete mode 100644 botan-1.10-add-ppc64le.patch delete mode 100644 botan-aarch64.patch delete mode 100644 botan-avoid-gcc7-miscompilation.patch diff --git a/botan-1.10-add-ppc64le.patch b/botan-1.10-add-ppc64le.patch deleted file mode 100644 index 05794cd..0000000 --- a/botan-1.10-add-ppc64le.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur Botan-1.10.8.orig/src/build-data/arch/ppc64le.txt Botan-1.10.8/src/build-data/arch/ppc64le.txt ---- Botan-1.10.8.orig/src/build-data/arch/ppc64le.txt 1969-12-31 18:00:00.000000000 -0600 -+++ Botan-1.10.8/src/build-data/arch/ppc64le.txt 2014-05-25 12:59:22.030001491 -0500 -@@ -0,0 +1,16 @@ -+ -+endian little -+family ppc64le -+ -+ -+ppc64el # For Debian -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -Naur Botan-1.10.8.orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt ---- Botan-1.10.8.orig/src/build-data/cc/gcc.txt 2014-05-25 12:44:19.580001491 -0500 -+++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-05-25 12:55:57.750001491 -0500 -@@ -83,6 +83,7 @@ - mips64 -> "-mips3 -mcpu=SUBMODEL" mips64- - ppc32 -> "-mcpu=SUBMODEL" ppc - ppc64 -> "-mcpu=SUBMODEL" ppc -+ppc64le -> "-mcpu=SUBMODEL" - sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- - sparc64 -> "-mcpu=v9 -mtune=SUBMODEL" - x86_32 -> "-march=SUBMODEL -momit-leaf-frame-pointer" -@@ -98,6 +99,7 @@ - sparc32 -> "-m32 -mno-app-regs" - sparc64 -> "-m64 -mno-app-regs" - ppc64 -> "-m64" -+ppc64le -> "-m64" - - # This should probably be used on most/all targets, but the docs are unclear - openbsd -> "-pthread" -diff -Naur Botan-1.10.8.orig/src/math/mp/mp_asm64/info.txt Botan-1.10.8/src/math/mp/mp_asm64/info.txt ---- Botan-1.10.8.orig/src/math/mp/mp_asm64/info.txt 2014-05-25 12:44:19.620001491 -0500 -+++ Botan-1.10.8/src/math/mp/mp_asm64/info.txt 2014-05-25 12:45:01.580001491 -0500 -@@ -13,6 +13,7 @@ - mips64 - ppc64 - sparc64 -+ppc64le - - - # The inline asm only works with gcc, but it looks like (at least on diff --git a/botan-aarch64.patch b/botan-aarch64.patch deleted file mode 100644 index ffb6888..0000000 --- a/botan-aarch64.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Botan-1.10.8/src/build-data/arch/aarch64.txt -=================================================================== ---- /dev/null -+++ Botan-1.10.8/src/build-data/arch/aarch64.txt -@@ -0,0 +1,16 @@ -+ -+endian little -+family aarch64 -+ -+ -+arm64 # For Debian -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/botan-avoid-gcc7-miscompilation.patch b/botan-avoid-gcc7-miscompilation.patch deleted file mode 100644 index 23ef69d..0000000 --- a/botan-avoid-gcc7-miscompilation.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp.orig Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp ---- Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp.orig 2017-04-05 03:06:45.000000000 +0200 -+++ Botan-1.10.16/src/hash/gost_3411/gost_3411.cpp 2017-08-13 16:29:34.720567939 +0200 -@@ -90,8 +90,11 @@ void GOST_34_11::compress_n(const byte i - - // P transformation - for(size_t k = 0; k != 4; ++k) -+ { -+ const uint64_t UVk = U[k] ^ V[k]; - for(size_t l = 0; l != 8; ++l) -- key[4*l+k] = get_byte(l, U[k]) ^ get_byte(l, V[k]); -+ key[4*l+k] = get_byte(l, UVk); -+ } - - cipher.set_key(key, 32); - cipher.encrypt(&hash[8*j], S + 8*j); diff --git a/botan.spec b/botan.spec index d262bc5..8ad36e0 100644 --- a/botan.spec +++ b/botan.spec @@ -5,8 +5,8 @@ %endif Name: botan -Version: %{major_version}.16 -Release: 2%{?dist} +Version: %{major_version}.17 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -16,16 +16,12 @@ URL: http://botan.randombit.net/ # here: http://botan.randombit.net/releases/Botan-%%{version}.tgz Source0: Botan-%{version}.stripped.tar.gz Source1: README.fedora -Patch0: botan-aarch64.patch -Patch1: botan-1.10-add-ppc64le.patch # Enable only cleared ECC algorithms -Patch2: botan-1.10.5-ecc-fix.patch +Patch0: botan-1.10.5-ecc-fix.patch # Make boost_python selectable -Patch3: botan-boost_python.patch +Patch1: botan-boost_python.patch # Fix wrong path -Patch4: botan-1.10.13-python-init.patch -# See https://github.com/randombit/botan/issues/882 -Patch5: botan-avoid-gcc7-miscompilation.patch +Patch2: botan-1.10.13-python-init.patch BuildRequires: gcc-c++ BuildRequires: python2 @@ -126,12 +122,9 @@ interfaces may change in the future. %prep %setup -q -n Botan-%{version} -%patch0 -p1 +%patch0 -p1 -b .eccfix %patch1 -p1 -%patch2 -p1 -b .eccfix -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch2 -p1 # These tests will fail. rm -rf checks/ec_tests.cpp @@ -268,6 +261,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Oct 2 2017 Thomas Moschny - 1.10.17-1 +- Update to 1.10.17. +- Remove obsolete patches. + * Fri Sep 08 2017 Troy Dawson - 1.10.16-2 - Cleanup spec file conditionals diff --git a/repack.sh b/repack.sh index e38d5a4..05356a2 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -name=Botan-1.10.16 +name=Botan-1.10.17 src=${name}.tgz dst=${name}.stripped.tar.gz diff --git a/sources b/sources index 7d505fe..236fef4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Botan-1.10.16.stripped.tar.gz) = 67b5cb788903e20cd555d6ed2aa62b646b17d9b0df59d52f04c48d9d60e05531549f05a4d2679b865ca4517797f3b9e2b5c37181c0815c0975e28b9df5c8c817 +SHA512 (Botan-1.10.17.stripped.tar.gz) = 9fc356ae042af56667ceb8430006658fe8a0c8ef2d00eb1961645bf3082e41c6850a781cc0e0672d68da1e9094532018a51465e5b2e84115c9f0af75910a9eac From 81fbf5cda0934db2206b0d245dd35f592bbc92e1 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 3 Oct 2017 10:35:42 +0200 Subject: [PATCH 052/108] Patch to fix X509 DN comparisons. --- botan-1.8.15-fix-x509-dn-cmp.patch | 13 +++++++++++++ botan.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 botan-1.8.15-fix-x509-dn-cmp.patch diff --git a/botan-1.8.15-fix-x509-dn-cmp.patch b/botan-1.8.15-fix-x509-dn-cmp.patch new file mode 100644 index 0000000..1757d23 --- /dev/null +++ b/botan-1.8.15-fix-x509-dn-cmp.patch @@ -0,0 +1,13 @@ +diff --git a/src/utils/parsing.cpp b/src/utils/parsing.cpp +index bdb9e79..3f56d12 100644 +--- a/src/utils/parsing.cpp ++++ b/src/utils/parsing.cpp +@@ -227,6 +227,8 @@ bool x500_name_cmp(const std::string& name1, const std::string& name2) + + if(p1 == name1.end() && p2 == name2.end()) + return true; ++ if(p1 == name1.end() || p2 == name2.end()) ++ return false; + } + + if(!Charset::caseless_cmp(*p1, *p2)) diff --git a/botan.spec b/botan.spec index 6f43c6c..52f393e 100644 --- a/botan.spec +++ b/botan.spec @@ -1,6 +1,6 @@ Name: botan Version: 1.8.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -12,6 +12,8 @@ Source0: Botan-%{version}.stripped.tar.gz Source1: README.fedora # soname was changed unintentionally upstream, revert it. Patch0: botan-1.8.15-soname.patch +# cherry-pick commit c9271016 from 1.10 branch: fix for CVE-2017-2801 +Patch1: botan-1.8.15-fix-x509-dn-cmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -51,6 +53,7 @@ developing applications that use %{name}. %prep %setup -q -n Botan-%{version} %patch0 -p1 +%patch1 -p1 cp -av %{SOURCE1} . %build @@ -120,6 +123,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Oct 3 2017 Thomas Moschny - 1.8.15-2 +- Patch to fix X509 DN comparisons. + * Sat Feb 13 2016 Thomas Moschny - 1.8.15-1 - Update to 1.8.15. - Remove patch applied upstream. From a0e12851173fb2880a7d40f36050fdbb3cd47c62 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Jan 2018 01:01:05 +0000 Subject: [PATCH 053/108] Rebuilt for Boost 1.66 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 8ad36e0..e985750 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jan 23 2018 Jonathan Wakely - 1.10.17-2 +- Rebuilt for Boost 1.66 + * Mon Oct 2 2017 Thomas Moschny - 1.10.17-1 - Update to 1.10.17. - Remove obsolete patches. From af760f724be9634a35d3e0015e19176387f2cbf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 04:07:58 +0000 Subject: [PATCH 054/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index e985750..09d10b1 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.10.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 23 2018 Jonathan Wakely - 1.10.17-2 - Rebuilt for Boost 1.66 From a2cdd3f4582e2b62636e71019b00cdcafc4be9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:40:34 +0200 Subject: [PATCH 055/108] Rebuilt for Python 3.7 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 09d10b1..ac9eb01 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jun 19 2018 Miro Hrončok - 1.10.17-4 +- Rebuilt for Python 3.7 + * Wed Feb 07 2018 Fedora Release Engineering - 1.10.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0e68f46907feda98acb27c8f0b72224f8aca8c8d Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Thu, 28 Jun 2018 06:42:55 +0000 Subject: [PATCH 056/108] Switch BR boost-python-devel to boost-python2-devel Signed-off-by: David Abdurachmanov --- botan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/botan.spec b/botan.spec index ac9eb01..3436e57 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -26,7 +26,7 @@ Patch2: botan-1.10.13-python-init.patch BuildRequires: gcc-c++ BuildRequires: python2 BuildRequires: python2-devel -BuildRequires: boost-python-devel +BuildRequires: boost-python2-devel %if 0%{?with_python3} BuildRequires: python3 BuildRequires: python3-devel @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Jun 28 2018 David Abdurachmanov - 1.10.17-5 +- Switch BR boost-python-devel to boost-python2-devel + * Tue Jun 19 2018 Miro Hrončok - 1.10.17-4 - Rebuilt for Python 3.7 From d039f46f21caa49a0d138563b1c532c24c967dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 29 Jun 2018 09:59:17 +0200 Subject: [PATCH 057/108] Rebuilt for Python 3.7 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 3436e57..0832cf4 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jun 29 2018 Miro Hrončok - 1.10.17-6 +- Rebuilt for Python 3.7 + * Thu Jun 28 2018 David Abdurachmanov - 1.10.17-5 - Switch BR boost-python-devel to boost-python2-devel From 7529ac1b87828f5421a4a5f23e6b93d37d25100c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 30 Jun 2018 00:39:03 +0200 Subject: [PATCH 058/108] Use ldconfig scriptlet macros. --- botan.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/botan.spec b/botan.spec index 0832cf4..e283f58 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -196,10 +196,10 @@ cp -a %{SOURCE1} %{buildroot}%{_pkgdocdir} rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} -%post -p /sbin/ldconfig +%ldconfig_post -%postun -p /sbin/ldconfig +%ldconfig_postun %files @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jun 29 2018 Thomas Moschny - 1.10.17-7 +- Use ldconfig scriptlet macros. + * Fri Jun 29 2018 Miro Hrončok - 1.10.17-6 - Rebuilt for Python 3.7 From 2114577286fd020538cdce74cb628182de11fc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:22:02 +0200 Subject: [PATCH 059/108] Rebuilt for Python 3.7 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index e283f58..f2e6fbc 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Jul 02 2018 Miro Hrončok - 1.10.17-8 +- Rebuilt for Python 3.7 + * Fri Jun 29 2018 Thomas Moschny - 1.10.17-7 - Use ldconfig scriptlet macros. From c6cdb8528ba2b9175d20481883be0e6db0b5e051 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:19:03 +0000 Subject: [PATCH 060/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index f2e6fbc..152b95f 100644 --- a/botan.spec +++ b/botan.spec @@ -6,7 +6,7 @@ Name: botan Version: %{major_version}.17 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -261,6 +261,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.10.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 02 2018 Miro Hrončok - 1.10.17-8 - Rebuilt for Python 3.7 From eba0fb3b885f69e96ab121460595863e1a7cd78f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 13 Jul 2018 12:43:16 +0200 Subject: [PATCH 061/108] Explicitly call configure.py using %{__python2}. --- botan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 152b95f..1727451 100644 --- a/botan.spec +++ b/botan.spec @@ -136,7 +136,7 @@ rm -rf checks/ec_tests.cpp # fixme: maybe disable unix_procs, very slow. %global disable_modules gnump -./configure.py \ +%{__python2} ./configure.py \ --prefix=%{_prefix} \ --libdir=%{_lib} \ --cc=gcc \ From 2eef2ced3b401ffe57ebb8d277f6a6341ae70202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 18 Sep 2018 13:24:13 +0200 Subject: [PATCH 062/108] Remove Python 2 subpackage (#1627321) --- botan.spec | 72 +++++++----------------------------------------------- 1 file changed, 9 insertions(+), 63 deletions(-) diff --git a/botan.spec b/botan.spec index 1727451..615c327 100644 --- a/botan.spec +++ b/botan.spec @@ -1,12 +1,8 @@ %global major_version 1.10 -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%endif - Name: botan Version: %{major_version}.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -24,29 +20,20 @@ Patch1: botan-boost_python.patch Patch2: botan-1.10.13-python-init.patch BuildRequires: gcc-c++ -BuildRequires: python2 -BuildRequires: python2-devel -BuildRequires: boost-python2-devel -%if 0%{?with_python3} BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-sphinx BuildRequires: boost-python3-devel -%endif # with_python3 - -BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: zlib-devel -%if 0%{?fedora} >=26 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: compat-openssl10-devel %else BuildRequires: openssl-devel %endif # do not check .so files in the python_sitelib directories -%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so)$ -%if 0%{?with_python3} %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ -%endif # with_python3 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -61,12 +48,11 @@ flavor of the library. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel -%if 0%{?fedora} >=26 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: compat-openssl10-devel %else Requires: openssl-devel @@ -88,23 +74,6 @@ BuildArch: noarch This package contains HTML documentation for %{name}. -%package -n python2-%{name} -Summary: Python2 bindings for %{name} -Group: System Environment/Libraries -%{?python_provide:%python_provide python2-%{name}} -# the python2 package was named botan-python up to 1.10.13-1 -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < 1.10.13-2 - -%description -n python2-%{name} -%{summary} - -This package contains the Python2 binding for %{name}. - -Note: The Python binding should be considered alpha software, and the -interfaces may change in the future. - -%if 0%{?with_python3} %package -n python3-%{name} Summary: Python3 bindings for %{name} Group: System Environment/Libraries @@ -117,7 +86,6 @@ This package contains the Python3 binding for %{name}. Note: The Python binding should be considered alpha software, and the interfaces may change in the future. -%endif # with_python3 %prep @@ -136,7 +104,7 @@ rm -rf checks/ec_tests.cpp # fixme: maybe disable unix_procs, very slow. %global disable_modules gnump -%{__python2} ./configure.py \ +%{__python3} ./configure.py \ --prefix=%{_prefix} \ --libdir=%{_lib} \ --cc=gcc \ @@ -148,27 +116,14 @@ rm -rf checks/ec_tests.cpp --with-python-version=dummy.dummy \ --with-sphinx -%if 0%{?with_python3} -cp -a build/python{,3} -%endif # with_python3 - # (ab)using CXX as an easy way to inject our CXXFLAGS make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} -make -f Makefile.python \ - CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ - PYTHON_INC="$(python2-config --includes)" \ - PYTHON_ROOT=. - -%if 0%{?with_python3} -mv build/python{,2} ; mv build/python{3,} make -f Makefile.python \ CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ PYTHON_INC="$(python3-config --includes)" \ PYTHON_ROOT=. \ BOOST_PYTHON=boost_python3 -mv build/python{,3} ; mv build/python{2,} -%endif # with_python3 %install make install \ @@ -177,15 +132,9 @@ make install \ INSTALL_CMD_EXEC="install -p -m 755" \ INSTALL_CMD_DATA="install -p -m 644" -make -f Makefile.python install \ - PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python2_sitearch} - -%if 0%{?with_python3} -mv build/python{,2} ; mv build/python{3,} make -f Makefile.python install \ PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python3_sitearch} -mv build/python{,3} ; mv build/python{2,} -%endif # with_python3 + # fixups find doc/examples -type f -exec chmod -x {} \; @@ -240,14 +189,8 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} %{_pkgdocdir}/python2-examples -%files -n python2-%{name} -%{python2_sitearch}/%{name} - - -%if 0%{?with_python3} %files -n python3-%{name} %{python3_sitearch}/%{name} -%endif # with_python3 %check @@ -261,6 +204,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Sep 18 2018 Miro Hrončok - 1.10.17-10 +- Remove Python 2 subpackage (#1627321) + * Thu Jul 12 2018 Fedora Release Engineering - 1.10.17-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0a6cf8a91519c8d7939d5348f2f1fdbf0e3ed746 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 24 Jan 2019 21:40:02 +0000 Subject: [PATCH 063/108] Rebuilt for Boost 1.69 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 615c327..8ec7323 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -204,6 +204,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Jan 24 2019 Jonathan Wakely - 1.10.17-11 +- Rebuilt for Boost 1.69 + * Tue Sep 18 2018 Miro Hrončok - 1.10.17-10 - Remove Python 2 subpackage (#1627321) From c9b3eca933d333216f3307d165c3f3c1d4e4aced Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:40 +0100 Subject: [PATCH 064/108] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- botan.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/botan.spec b/botan.spec index 8ec7323..1fa4502 100644 --- a/botan.spec +++ b/botan.spec @@ -5,7 +5,6 @@ Version: %{major_version}.17 Release: 11%{?dist} Summary: Crypto library written in C++ -Group: System Environment/Libraries License: BSD URL: http://botan.randombit.net/ # tarfile is stripped using repack.sh. original tarfile to be found @@ -65,7 +64,6 @@ developing applications that use %{name}. %package doc Summary: Documentation for %{name} -Group: Documentation BuildArch: noarch %description doc @@ -76,7 +74,6 @@ This package contains HTML documentation for %{name}. %package -n python3-%{name} Summary: Python3 bindings for %{name} -Group: System Environment/Libraries %{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} From 3fb576c80fcdbef8b29671c187d31cdabe7eccaa Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 29 Jan 2019 15:24:28 +0000 Subject: [PATCH 065/108] Use boost_python37 for library name --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 1fa4502..14cfc70 100644 --- a/botan.spec +++ b/botan.spec @@ -120,7 +120,7 @@ make -f Makefile.python \ CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ PYTHON_INC="$(python3-config --includes)" \ PYTHON_ROOT=. \ - BOOST_PYTHON=boost_python3 + BOOST_PYTHON=boost_python37 %install make install \ @@ -201,6 +201,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jan 29 2019 Jonathan Wakely - 1.10.17-11 +- Use boost_python37 for library name + * Thu Jan 24 2019 Jonathan Wakely - 1.10.17-11 - Rebuilt for Boost 1.69 From c7ffcf21eebaa0964d7c8702f6a0426462171099 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 30 Jan 2019 21:10:34 +0000 Subject: [PATCH 066/108] Use %{python3_version_nodots} for Boost.Python library name --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 14cfc70..654ee99 100644 --- a/botan.spec +++ b/botan.spec @@ -120,7 +120,7 @@ make -f Makefile.python \ CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ PYTHON_INC="$(python3-config --includes)" \ PYTHON_ROOT=. \ - BOOST_PYTHON=boost_python37 + BOOST_PYTHON=boost_python%{python3_version_nodots} %install make install \ @@ -201,6 +201,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jan 30 2019 Jonathan Wakely - 1.10.17-11 +- Use %%{python3_version_nodots} for Boost.Python library name + * Tue Jan 29 2019 Jonathan Wakely - 1.10.17-11 - Use boost_python37 for library name From baa8a3e18805a9a0d679d639f245a955f85a7f83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:51:59 +0000 Subject: [PATCH 067/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 654ee99..b080404 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Crypto library written in C++ License: BSD @@ -201,6 +201,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.10.17-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 30 2019 Jonathan Wakely - 1.10.17-11 - Use %%{python3_version_nodots} for Boost.Python library name From b35f6bad683f7cab470c0dbec208e96307a0070f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:31:40 +0000 Subject: [PATCH 068/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index b080404..204dace 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Crypto library written in C++ License: BSD @@ -201,6 +201,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.10.17-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.10.17-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From cc1b8f35c00f9544f68531bc47c3b22a573e83ed Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 14 Aug 2019 10:40:42 +0200 Subject: [PATCH 069/108] Remove dependency on OpenSSL (for F31+). --- botan.spec | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/botan.spec b/botan.spec index 204dace..1f7f408 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Crypto library written in C++ License: BSD @@ -25,11 +25,6 @@ BuildRequires: python3-sphinx BuildRequires: boost-python3-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: compat-openssl10-devel -%else -BuildRequires: openssl-devel -%endif # do not check .so files in the python_sitelib directories %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ @@ -51,11 +46,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel -%if 0%{?fedora} || 0%{?rhel} > 7 -Requires: compat-openssl10-devel -%else -Requires: openssl-devel -%endif %description devel The %{name}-devel package contains libraries and header files for @@ -96,7 +86,7 @@ rm -rf checks/ec_tests.cpp %build # we have the necessary prerequisites, so enable optional modules -%global enable_modules bzip2,zlib,openssl +%global enable_modules bzip2,zlib # fixme: maybe disable unix_procs, very slow. %global disable_modules gnump @@ -201,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Aug 14 2019 Thomas Moschny - 1.10.17-14 +- Remove dependency on OpenSSL (for F31+). + * Wed Jul 24 2019 Fedora Release Engineering - 1.10.17-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 46ccc08f8c08a8c7df55978c053d42f0e0e13fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:10:53 +0200 Subject: [PATCH 070/108] Rebuilt for Python 3.8 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 1f7f408..36d4dae 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Crypto library written in C++ License: BSD @@ -191,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.10.17-15 +- Rebuilt for Python 3.8 + * Wed Aug 14 2019 Thomas Moschny - 1.10.17-14 - Remove dependency on OpenSSL (for F31+). From c04ee983908a7db719cdcb53aa0d0080ba0be1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:51:15 +0200 Subject: [PATCH 071/108] Rebuilt for Python 3.8.0rc1 (#1748018) --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 36d4dae..696e68b 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Crypto library written in C++ License: BSD @@ -191,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Oct 03 2019 Miro Hrončok - 1.10.17-16 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 1.10.17-15 - Rebuilt for Python 3.8 From 133a171d1e41ea17ae0d8e1b9db23104652cf3d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 13:14:04 +0000 Subject: [PATCH 072/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 696e68b..95a534f 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Crypto library written in C++ License: BSD @@ -191,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.10.17-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 1.10.17-16 - Rebuilt for Python 3.8.0rc1 (#1748018) From 53fff83a389b60d2d425ee4ea089dbd0cb0755af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:41:44 +0200 Subject: [PATCH 073/108] Rebuilt for Python 3.9 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 95a534f..dc0fca1 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Crypto library written in C++ License: BSD @@ -191,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue May 26 2020 Miro Hrončok - 1.10.17-18 +- Rebuilt for Python 3.9 + * Tue Jan 28 2020 Fedora Release Engineering - 1.10.17-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b718544bf23adb2e52012e0c43a67970ffd2845f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 29 May 2020 23:37:02 +0100 Subject: [PATCH 074/108] Rebuilt for Boost 1.73 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index dc0fca1..854a2c4 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Crypto library written in C++ License: BSD @@ -191,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri May 29 2020 Jonathan Wakely - 1.10.17-19 +- Rebuilt for Boost 1.73 + * Tue May 26 2020 Miro Hrončok - 1.10.17-18 - Rebuilt for Python 3.9 From bc6b42a2dd0c3cab4191438133e17026ef373091 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:20:13 +0000 Subject: [PATCH 075/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 854a2c4..f352120 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Crypto library written in C++ License: BSD @@ -191,6 +191,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.10.17-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 29 2020 Jonathan Wakely - 1.10.17-19 - Rebuilt for Boost 1.73 From 2c6c52d21417cdd717b6cd120e0457ac349d4963 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 10 Aug 2020 21:01:10 -0600 Subject: [PATCH 076/108] Disable LTO on armv7hl for now --- botan.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index f352120..8118809 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Crypto library written in C++ License: BSD @@ -85,6 +85,13 @@ interfaces may change in the future. rm -rf checks/ec_tests.cpp %build +# This package fails to build on armv7 with LTO due to the usual problems +# with NEON instructions. After we figure out the root cause of the failure +# we'll hopefully be able to remove this opt-out +%ifarch armv7hl +%define _lto_cflags %{nil} +%endif + # we have the necessary prerequisites, so enable optional modules %global enable_modules bzip2,zlib @@ -191,6 +198,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Aug 10 2020 Jeff Law - 1.10.17-21 +- Disable LTO on armv7hl for now. + * Mon Jul 27 2020 Fedora Release Engineering - 1.10.17-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From af7c6ca96c1f4feadfc9731240f8eba8a900bccc Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 1 Oct 2020 17:39:29 -0600 Subject: [PATCH 077/108] Re-enable LTO --- botan.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/botan.spec b/botan.spec index 8118809..cd76272 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Crypto library written in C++ License: BSD @@ -85,12 +85,6 @@ interfaces may change in the future. rm -rf checks/ec_tests.cpp %build -# This package fails to build on armv7 with LTO due to the usual problems -# with NEON instructions. After we figure out the root cause of the failure -# we'll hopefully be able to remove this opt-out -%ifarch armv7hl -%define _lto_cflags %{nil} -%endif # we have the necessary prerequisites, so enable optional modules %global enable_modules bzip2,zlib @@ -198,6 +192,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Oct 01 2020 Jeff Law - 1.10.17-22 +- Re-enable LTO + * Mon Aug 10 2020 Jeff Law - 1.10.17-21 - Disable LTO on armv7hl for now. From b0d203cd11983ef9ebe70800859a6ec9e7e2550c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 03:06:03 +0000 Subject: [PATCH 078/108] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- botan.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/botan.spec b/botan.spec index cd76272..16956a5 100644 --- a/botan.spec +++ b/botan.spec @@ -25,6 +25,7 @@ BuildRequires: python3-sphinx BuildRequires: boost-python3-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel +BuildRequires: make # do not check .so files in the python_sitelib directories %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ From fc58ab300325fc99555131e4791edd839f79f976 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 16:34:26 +0000 Subject: [PATCH 079/108] Rebuilt for Boost 1.75 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 16956a5..b07f0f1 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jan 22 2021 Jonathan Wakely - 1.10.17-23 +- Rebuilt for Boost 1.75 + * Thu Oct 01 2020 Jeff Law - 1.10.17-22 - Re-enable LTO From bf56908bdde5736a0787e585cc255439431817d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:20:14 +0000 Subject: [PATCH 080/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index b07f0f1..c9051e3 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.10.17-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 1.10.17-23 - Rebuilt for Boost 1.75 From 67e7949731a4c1c5741e2ae4cb7a5a9d24e8a3ec Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:00:38 +0200 Subject: [PATCH 081/108] Rebuilt for Python 3.10 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index c9051e3..07341d9 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jun 04 2021 Python Maint - 1.10.17-25 +- Rebuilt for Python 3.10 + * Tue Jan 26 2021 Fedora Release Engineering - 1.10.17-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6523c727814621340be25782b54a60e0589c038e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:51:53 +0000 Subject: [PATCH 082/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 27a64fc16c3ae1cb06be45b81030519f97787bd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:49:07 +0000 Subject: [PATCH 083/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 07341d9..96bb2b4 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.10.17-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.10.17-25 - Rebuilt for Python 3.10 From acb4309eeef2766f8a2b589d6ad7395665bc901d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Aug 2021 22:25:12 +0100 Subject: [PATCH 084/108] Rebuilt for Boost 1.76 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 96bb2b4..55b7d48 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Aug 06 2021 Jonathan Wakely - 1.10.17-27 +- Rebuilt for Boost 1.76 + * Wed Jul 21 2021 Fedora Release Engineering - 1.10.17-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e3ac435d6f97602446c1a51d9db9ac6c8ee93fc4 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 11 Sep 2021 18:13:20 +0200 Subject: [PATCH 085/108] Fix FTBFS on F35 and later. --- botan-1.10.17-doc-conf-2to3.patch | 38 +++++++++++++++++++++++++++++++ botan.spec | 13 +++++++---- 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 botan-1.10.17-doc-conf-2to3.patch diff --git a/botan-1.10.17-doc-conf-2to3.patch b/botan-1.10.17-doc-conf-2to3.patch new file mode 100644 index 0000000..e826ca6 --- /dev/null +++ b/botan-1.10.17-doc-conf-2to3.patch @@ -0,0 +1,38 @@ +diff -up Botan-1.10.17/doc/conf.py.orig Botan-1.10.17/doc/conf.py +--- Botan-1.10.17/doc/conf.py.orig 2017-10-02 08:00:00.000000000 +0200 ++++ Botan-1.10.17/doc/conf.py 2021-09-11 17:57:38.159934955 +0200 +@@ -40,10 +40,10 @@ version. + def check_sphinx_version(): + import sphinx + +- version = map(int, sphinx.__version__.split('.')) ++ version = list(map(int, sphinx.__version__.split('.'))) + if version[0] == 1 and version[1] == 0 and version[2] < 7: + # Exit rather than throwing to avoid a confusing backtrace +- print "This Sphinx is too old - upgrade to at least 1.0.7" ++ print("This Sphinx is too old - upgrade to at least 1.0.7") + import sys + sys.exit(1) + +@@ -66,8 +66,8 @@ source_suffix = '.txt' + master_doc = 'contents' + + # General information about the project. +-project = u'botan' +-copyright = u'2000-2011, Jack Lloyd' ++project = 'botan' ++copyright = '2000-2011, Jack Lloyd' + + # The version info for the project you're documenting, acts as replacement for + # |version| and |release|, also used in various other places throughout the +@@ -214,8 +214,8 @@ htmlhelp_basename = 'botandoc' + # Grouping the document tree into LaTeX files. List of tuples + # (source start file, target name, title, author, documentclass [howto/manual]). + latex_documents = [ +- ('contents', 'botan.tex', u'botan Reference Manual', +- u'Jack Lloyd', 'manual'), ++ ('contents', 'botan.tex', 'botan Reference Manual', ++ 'Jack Lloyd', 'manual'), + ] + + # The name of an image file (relative to this directory) to place at the top of diff --git a/botan.spec b/botan.spec index 55b7d48..62576bc 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Crypto library written in C++ License: BSD @@ -17,6 +17,8 @@ Patch0: botan-1.10.5-ecc-fix.patch Patch1: botan-boost_python.patch # Fix wrong path Patch2: botan-1.10.13-python-init.patch +# 2to3 doc/conf.py +Patch3: botan-1.10.17-doc-conf-2to3.patch BuildRequires: gcc-c++ BuildRequires: python3 @@ -25,7 +27,7 @@ BuildRequires: python3-sphinx BuildRequires: boost-python3-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: make +BuildRequires: make # do not check .so files in the python_sitelib directories %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ @@ -78,9 +80,7 @@ interfaces may change in the future. %prep %setup -q -n Botan-%{version} -%patch0 -p1 -b .eccfix -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n Botan-%{version} # These tests will fail. rm -rf checks/ec_tests.cpp @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Sep 11 2021 Thomas Moschny - 1.10.17-28 +- Fix FTBFS on F35 and later. + * Fri Aug 06 2021 Jonathan Wakely - 1.10.17-27 - Rebuilt for Boost 1.76 From 430ac8a4350fb5350f3821aa6660c88e7f85dd0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:32:44 +0000 Subject: [PATCH 086/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 62576bc..fefc59a 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.10.17-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Sep 11 2021 Thomas Moschny - 1.10.17-28 - Fix FTBFS on F35 and later. From a1881f2615c6ed80127e39efee1e01367d381344 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:37:45 +0200 Subject: [PATCH 087/108] Rebuilt for Boost 1.78 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index fefc59a..e012c69 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed May 04 2022 Thomas Rodgers - 1.10.17-30 +- Rebuilt for Boost 1.78 + * Wed Jan 19 2022 Fedora Release Engineering - 1.10.17-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 14fb5a3b80887a9439ccc737735bbbc6e4e1c5b3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 19:53:12 +0200 Subject: [PATCH 088/108] Rebuilt for Python 3.11 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index e012c69..aa02af9 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Jun 13 2022 Python Maint - 1.10.17-31 +- Rebuilt for Python 3.11 + * Wed May 04 2022 Thomas Rodgers - 1.10.17-30 - Rebuilt for Boost 1.78 From 0b2460631d9b2f24ba4c54c5c8c0210279f2e499 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 24 Jun 2022 09:16:40 +0100 Subject: [PATCH 089/108] Replace obsolete boost-python3-devel build dependency (#2100748) --- botan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/botan.spec b/botan.spec index aa02af9..1f52b9d 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Crypto library written in C++ License: BSD @@ -24,7 +24,7 @@ BuildRequires: gcc-c++ BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-sphinx -BuildRequires: boost-python3-devel +BuildRequires: boost-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: make @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jun 24 2022 Jonathan Wakely - .17-32 +- Replace obsolete boost-python3-devel build dependency (#2100748) + * Mon Jun 13 2022 Python Maint - 1.10.17-31 - Rebuilt for Python 3.11 From 4b4741f3871135d797d0eb88657a41dc8cdff7be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:12:16 +0000 Subject: [PATCH 090/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 1f52b9d..6d8168b 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.10.17-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jun 24 2022 Jonathan Wakely - .17-32 - Replace obsolete boost-python3-devel build dependency (#2100748) From e594e34ca9e6c0794a62be6f075a820c8ef4ffab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:06:17 +0000 Subject: [PATCH 091/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 6d8168b..aa0211b 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Crypto library written in C++ License: BSD @@ -193,6 +193,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.10.17-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.10.17-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f3877e62a7a67f9dd7552e3b447ebdcf60817e5e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 22 Jan 2023 13:07:34 +0100 Subject: [PATCH 092/108] Add patch to fix FTBFS. --- botan-1.10.17-u64bit.patch | 12 ++++++++++++ botan.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 botan-1.10.17-u64bit.patch diff --git a/botan-1.10.17-u64bit.patch b/botan-1.10.17-u64bit.patch new file mode 100644 index 0000000..ea90706 --- /dev/null +++ b/botan-1.10.17-u64bit.patch @@ -0,0 +1,12 @@ +diff -up Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp~ Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp +--- Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp~ 2017-10-02 08:00:00.000000000 +0200 ++++ Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp 2023-01-22 13:01:38.984150336 +0100 +@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte i + // P transformation + for(size_t k = 0; k != 4; ++k) + { +- const uint64_t UVk = U[k] ^ V[k]; ++ const u64bit UVk = U[k] ^ V[k]; + for(size_t l = 0; l != 8; ++l) + key[4*l+k] = get_byte(l, UVk); + } diff --git a/botan.spec b/botan.spec index aa0211b..9967eb6 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Crypto library written in C++ License: BSD @@ -19,6 +19,8 @@ Patch1: botan-boost_python.patch Patch2: botan-1.10.13-python-init.patch # 2to3 doc/conf.py Patch3: botan-1.10.17-doc-conf-2to3.patch +# Fix FTBFS +Patch4: botan-1.10.17-u64bit.patch BuildRequires: gcc-c++ BuildRequires: python3 @@ -193,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sun Jan 22 2023 Thomas Moschny - 1.10.17-35 +- Add patch to fix FTBFS. + * Wed Jan 18 2023 Fedora Release Engineering - 1.10.17-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d5a75da6b80ed01af5381dfd0602882853ab0d43 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:49:04 +0000 Subject: [PATCH 093/108] Rebuilt for Boost 1.81 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 9967eb6..cbdf6d1 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Crypto library written in C++ License: BSD @@ -195,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Feb 20 2023 Jonathan Wakely - 1.10.17-36 +- Rebuilt for Boost 1.81 + * Sun Jan 22 2023 Thomas Moschny - 1.10.17-35 - Add patch to fix FTBFS. From 7445671560db7d774b4b315166497b418e13ffd9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 06:13:28 +0200 Subject: [PATCH 094/108] Rebuilt for Python 3.12 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index cbdf6d1..eea5c47 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Crypto library written in C++ License: BSD @@ -195,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jun 14 2023 Python Maint - 1.10.17-37 +- Rebuilt for Python 3.12 + * Mon Feb 20 2023 Jonathan Wakely - 1.10.17-36 - Rebuilt for Boost 1.81 From f006e943bb1f489df343ee1929017c67a64eb017 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:51:25 +0000 Subject: [PATCH 095/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index eea5c47..4856bea 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Crypto library written in C++ License: BSD @@ -195,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.10.17-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 1.10.17-37 - Rebuilt for Python 3.12 From f849c1ed0ae01323949000640b7239c1bbd75f12 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Jan 2024 21:24:17 +0000 Subject: [PATCH 096/108] Rebuilt for Boost 1.83 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 4856bea..e4a41f4 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Crypto library written in C++ License: BSD @@ -195,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jan 17 2024 Jonathan Wakely - 1.10.17-39 +- Rebuilt for Boost 1.83 + * Wed Jul 19 2023 Fedora Release Engineering - 1.10.17-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 422a184182ad33c485a8dc69f6332bd2934f995b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:37:59 +0000 Subject: [PATCH 097/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index e4a41f4..1952eed 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Crypto library written in C++ License: BSD @@ -195,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.10.17-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 17 2024 Jonathan Wakely - 1.10.17-39 - Rebuilt for Boost 1.83 From ce6ffcd1b7863c1bd2b18f34bdb6001faaf8f971 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:43:38 +0000 Subject: [PATCH 098/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 1952eed..efbb6a0 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Crypto library written in C++ License: BSD @@ -195,6 +195,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 1.10.17-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.10.17-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 23e501f85371e61e54cfc7fc18d0e2c0e27971fc Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 20 Mar 2023 09:37:49 +0200 Subject: [PATCH 099/108] Add support for riscv64 Signed-off-by: David Abdurachmanov --- Botan-1.10.17-add-riscv64.patch | 7 +++++++ botan.spec | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Botan-1.10.17-add-riscv64.patch diff --git a/Botan-1.10.17-add-riscv64.patch b/Botan-1.10.17-add-riscv64.patch new file mode 100644 index 0000000..c2da72d --- /dev/null +++ b/Botan-1.10.17-add-riscv64.patch @@ -0,0 +1,7 @@ +diff --git a/src/build-data/arch/riscv64.txt b/src/build-data/arch/riscv64.txt +new file mode 100644 +index 0000000..6e5e0ff +--- /dev/null ++++ b/src/build-data/arch/riscv64.txt +@@ -0,0 +1 @@ ++endian little diff --git a/botan.spec b/botan.spec index efbb6a0..e68bc98 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Crypto library written in C++ License: BSD @@ -21,6 +21,10 @@ Patch2: botan-1.10.13-python-init.patch Patch3: botan-1.10.17-doc-conf-2to3.patch # Fix FTBFS Patch4: botan-1.10.17-u64bit.patch +# Add RISC-V (riscv64) +# Upstream in later versions: +# https://github.com/randombit/botan/blob/master/src/build-data/arch/riscv64.txt +Patch9: Botan-1.10.17-add-riscv64.patch BuildRequires: gcc-c++ BuildRequires: python3 @@ -195,6 +199,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Feb 24 2024 David Abdurachmanov - 1.10.17-42 +- Add support for riscv64 + * Tue Jan 23 2024 Fedora Release Engineering - 1.10.17-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a92b6063e48c99e49b08085cc255fa5d026fa7a9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:30:55 +0200 Subject: [PATCH 100/108] Rebuilt for Python 3.13 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index e68bc98..3fca020 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Crypto library written in C++ License: BSD @@ -199,6 +199,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Jun 08 2024 Python Maint - 1.10.17-43 +- Rebuilt for Python 3.13 + * Sat Feb 24 2024 David Abdurachmanov - 1.10.17-42 - Add support for riscv64 From 74a11d67ae1024b184d4c998ad0532f469b98907 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:32:04 +0000 Subject: [PATCH 101/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 3fca020..598ef38 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Crypto library written in C++ License: BSD @@ -199,6 +199,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.10.17-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 1.10.17-43 - Rebuilt for Python 3.13 From 5752be65926fd7c92690ab4f3b6fde3e20aa4b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 08:17:29 +0200 Subject: [PATCH 102/108] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- botan.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/botan.spec b/botan.spec index 598ef38..536ce71 100644 --- a/botan.spec +++ b/botan.spec @@ -2,10 +2,11 @@ Name: botan Version: %{major_version}.17 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Crypto library written in C++ -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://botan.randombit.net/ # tarfile is stripped using repack.sh. original tarfile to be found # here: http://botan.randombit.net/releases/Botan-%%{version}.tgz @@ -199,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Aug 28 2024 Miroslav Suchý - 1.10.17-45 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 1.10.17-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d23fb42a3518585d154a524623aa0b32afd4f753 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:47:30 +0000 Subject: [PATCH 103/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 536ce71..86db8cb 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Crypto library written in C++ # Automatically converted from old format: BSD - review is highly recommended. @@ -200,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.10.17-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 1.10.17-45 - convert license to SPDX From 87650282dee3db5f49f671e204300c253466286c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:28:38 +0200 Subject: [PATCH 104/108] Rebuilt for Python 3.14 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 86db8cb..1c5bc7c 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Crypto library written in C++ # Automatically converted from old format: BSD - review is highly recommended. @@ -200,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Jun 03 2025 Python Maint - 1.10.17-47 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 1.10.17-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9f49f7f9384b377914cbed437e408292a2b0a447 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:50:32 +0000 Subject: [PATCH 105/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 1c5bc7c..d984c58 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Crypto library written in C++ # Automatically converted from old format: BSD - review is highly recommended. @@ -200,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.10.17-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 1.10.17-47 - Rebuilt for Python 3.14 From 0b4eb982474584fd3f79c7b683ebcef593ef6837 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:40:25 +0200 Subject: [PATCH 106/108] Rebuilt for Python 3.14.0rc2 bytecode --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index d984c58..41df040 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Crypto library written in C++ # Automatically converted from old format: BSD - review is highly recommended. @@ -200,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Aug 15 2025 Python Maint - 1.10.17-49 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1.10.17-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 25309aa7f9991646961e06ccafd4b6de54eb5c3b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:09:39 +0200 Subject: [PATCH 107/108] Rebuilt for Python 3.14.0rc3 bytecode --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index 41df040..a5b86d9 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Crypto library written in C++ # Automatically converted from old format: BSD - review is highly recommended. @@ -200,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Fri Sep 19 2025 Python Maint - 1.10.17-50 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.10.17-49 - Rebuilt for Python 3.14.0rc2 bytecode From 3f2013d775123d4a6ad3750f2a5da21844932714 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 15:16:23 +0000 Subject: [PATCH 108/108] Rebuilt for Boost 1.90 --- botan.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/botan.spec b/botan.spec index a5b86d9..975d0a8 100644 --- a/botan.spec +++ b/botan.spec @@ -2,7 +2,7 @@ Name: botan Version: %{major_version}.17 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Crypto library written in C++ # Automatically converted from old format: BSD - review is highly recommended. @@ -200,6 +200,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Mon Jan 12 2026 Jonathan Wakely - 1.10.17-51 +- Rebuilt for Boost 1.90 + * Fri Sep 19 2025 Python Maint - 1.10.17-50 - Rebuilt for Python 3.14.0rc3 bytecode