diff --git a/.gitignore b/.gitignore index bd7a36c..a10c5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ -/Botan-*.stripped.tar.gz +/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 diff --git a/Botan-1.10.17-add-riscv64.patch b/Botan-1.10.17-add-riscv64.patch deleted file mode 100644 index c2da72d..0000000 --- a/Botan-1.10.17-add-riscv64.patch +++ /dev/null @@ -1,7 +0,0 @@ -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-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-1.10.13-python-init.patch b/botan-1.10.13-python-init.patch deleted file mode 100644 index 040a9a7..0000000 --- a/botan-1.10.13-python-init.patch +++ /dev/null @@ -1,9 +0,0 @@ -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-1.10.17-doc-conf-2to3.patch b/botan-1.10.17-doc-conf-2to3.patch deleted file mode 100644 index e826ca6..0000000 --- a/botan-1.10.17-doc-conf-2to3.patch +++ /dev/null @@ -1,38 +0,0 @@ -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-1.10.17-u64bit.patch b/botan-1.10.17-u64bit.patch deleted file mode 100644 index ea90706..0000000 --- a/botan-1.10.17-u64bit.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-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 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/botan-boost_python.patch b/botan-boost_python.patch deleted file mode 100644 index ccc016b..0000000 --- a/botan-boost_python.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 975d0a8..9fec23c 100644 --- a/botan.spec +++ b/botan.spec @@ -1,43 +1,34 @@ %global major_version 1.10 Name: botan -Version: %{major_version}.17 -Release: 51%{?dist} +Version: %{major_version}.9 +Release: 4%{?dist} Summary: Crypto library written in C++ -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +Group: System Environment/Libraries +License: 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 -Source0: Botan-%{version}.stripped.tar.gz +# here: http://files.randombit.net/botan/Botan-%%{version}.tbz +Source0: Botan-%{version}.stripped.tbz Source1: README.fedora +Patch0: botan-aarch64.patch +Patch1: botan-1.10-add-ppc64le.patch # Enable only cleared ECC algorithms -Patch0: botan-1.10.5-ecc-fix.patch -# Make boost_python selectable -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 -# 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 +Patch2: botan-1.10.5-ecc-fix.patch BuildRequires: gcc-c++ -BuildRequires: python3 -BuildRequires: python3-devel -BuildRequires: python3-sphinx -BuildRequires: boost-devel +BuildRequires: python +BuildRequires: python-sphinx +BuildRequires: python-devel +BuildRequires: boost-python-devel + BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: make +BuildRequires: openssl-devel -# do not check .so files in the python_sitelib directories -%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ +# do not check .so files in the python_sitelib directory +%global __provides_exclude_from ^(%{python_sitearch}/.*\\.so)$ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -52,10 +43,12 @@ 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 +Requires: openssl-devel %description devel The %{name}-devel package contains libraries and header files for @@ -64,6 +57,7 @@ developing applications that use %{name}. %package doc Summary: Documentation for %{name} +Group: Documentation BuildArch: noarch %description doc @@ -72,14 +66,14 @@ BuildArch: noarch This package contains HTML documentation for %{name}. -%package -n python3-%{name} -Summary: Python3 bindings for %{name} -%{?python_provide:%python_provide python3-%{name}} +%package python +Summary: Python bindings for %{name} +Group: System Environment/Libraries -%description -n python3-%{name} +%description python %{summary} -This package contains the Python3 binding for %{name}. +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. @@ -87,20 +81,21 @@ interfaces may change in the future. %prep %setup -q -n Botan-%{version} -%autosetup -p1 -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 -%global enable_modules bzip2,zlib +%define enable_modules bzip2,zlib,openssl # fixme: maybe disable unix_procs, very slow. -%global disable_modules gnump +%define disable_modules gnump -%{__python3} ./configure.py \ +./configure.py \ --prefix=%{_prefix} \ --libdir=%{_lib} \ --cc=gcc \ @@ -109,17 +104,14 @@ rm -rf checks/ec_tests.cpp --enable-modules=%{enable_modules} \ --disable-modules=%{disable_modules} \ --with-boost-python \ - --with-python-version=dummy.dummy \ + --with-python-version=%{python_version} \ --with-sphinx # (ab)using CXX as an easy way to inject our CXXFLAGS -make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} - +make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} make -f Makefile.python \ - CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ - PYTHON_INC="$(python3-config --includes)" \ - PYTHON_ROOT=. \ - BOOST_PYTHON=boost_python%{python3_version_nodots} + CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} + %install make install \ @@ -129,34 +121,28 @@ make install \ INSTALL_CMD_DATA="install -p -m 644" make -f Makefile.python install \ - PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python3_sitearch} - + PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python_sitearch} # fixups find doc/examples -type f -exec chmod -x {} \; -mv doc/examples/python doc/python2-examples -cp -a doc/{examples,python2-examples,license.txt} \ +mv doc/examples/python doc/python-examples +cp -a doc/{examples,python-examples,license.txt} \ %{buildroot}%{_pkgdocdir} cp -a %{SOURCE1} %{buildroot}%{_pkgdocdir} rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} -%ldconfig_post +%post -p /sbin/ldconfig -%ldconfig_postun +%postun -p /sbin/ldconfig %files %dir %{_pkgdocdir} %{_pkgdocdir}/readme.txt -%{_pkgdocdir}/README.fedora -%if 0%{?_licensedir:1} -%exclude %{_pkgdocdir}/license.txt -%license doc/license.txt -%else %{_pkgdocdir}/license.txt -%endif # licensedir +%{_pkgdocdir}/README.fedora %{_libdir}/libbotan-%{major_version}.so.* @@ -175,22 +161,19 @@ 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}/README.fedora -%if 0%{?_licensedir:1} -%exclude %{_pkgdocdir}/license.txt -%license doc/license.txt -%else %{_pkgdocdir}/license.txt -%endif # licensedir -%{_pkgdocdir}/python2-examples +%{_pkgdocdir}/README.fedora -%files -n python3-%{name} -%{python3_sitearch}/%{name} +%files python +%{_pkgdocdir}/python-examples +%exclude %{_pkgdocdir}/python-examples/*.pyc +%exclude %{_pkgdocdir}/python-examples/*.pyo +%{python_sitearch}/%{name} %check -make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check +make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check # these checks would fail mv checks/validate.dat{,.orig} @@ -200,236 +183,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) - -* 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 - -* 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. - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) - -* 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+). - -* 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 - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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+. - -* 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. - -* 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. - -* 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 - -* 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 - -* 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 - -* 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 . diff --git a/repack.sh b/repack.sh index 05356a2..3eb65b2 100755 --- a/repack.sh +++ b/repack.sh @@ -1,20 +1,18 @@ #! /bin/bash -name=Botan-1.10.17 -src=${name}.tgz -dst=${name}.stripped.tar.gz +version=1.10.9 +name=Botan-${version} +suffix=.tbz +newsuffix=.stripped.tbz +compr=bzip2 -rm -f ${dst} ${dst%.gz} -cp -av ${src} ${dst} +trap '${tmpfile:+rm ${tmpfile}}' EXIT +tmpfile=$(mktemp) -gzip -d ${dst} +${compr} -cd ${name}${suffix} > ${tmpfile} -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} +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 +${compr} -c ${tmpfile} > ${name}${newsuffix} diff --git a/sources b/sources index 236fef4..804aba0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Botan-1.10.17.stripped.tar.gz) = 9fc356ae042af56667ceb8430006658fe8a0c8ef2d00eb1961645bf3082e41c6850a781cc0e0672d68da1e9094532018a51465e5b2e84115c9f0af75910a9eac +44eb12a2757f51623b17b38fe8b9df2c Botan-1.10.9.stripped.tbz