From 35471474a80be314cf3e31669351f1859c02cf06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 14 May 2015 19:07:46 +0000 Subject: [PATCH 01/80] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 59139740dc5dae9be3d1a5e0bcf847d80bb4db91 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 14 May 2015 22:56:27 +0200 Subject: [PATCH 02/80] Initial import (#1193923). --- .gitignore | 1 + mbedtls.spec | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 110 insertions(+) create mode 100644 mbedtls.spec diff --git a/.gitignore b/.gitignore index e69de29..894c52d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/mbedtls-1.3.10-gpl.tgz diff --git a/mbedtls.spec b/mbedtls.spec new file mode 100644 index 0000000..ec02aa2 --- /dev/null +++ b/mbedtls.spec @@ -0,0 +1,108 @@ +%global _docdir_fmt %{name} + +Name: mbedtls +Version: 1.3.10 +Release: 1%{?dist} +Summary: Light-weight cryptographic and SSL/TLS library +Group: System Environment/Libraries +License: GPLv2+ with exceptions +URL: https://tls.mbed.org/ +Source0: https://tls.mbed.org/download/%{name}-%{version}-gpl.tgz + +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: graphviz + +# replace polarssl with mbedtls + +Obsoletes: polarssl < 1.3.10 +Provides: polarssl = %{version}-%{release} + +%description +Mbed TLS is a light-weight open source cryptographic and SSL/TLS +library written in C. Mbed TLS makes it easy for developers to include +cryptographic and SSL/TLS capabilities in their (embedded) +applications with as little hassle as possible. +FOSS License Exception: https://tls.mbed.org/foss-license-exception + +%package utils +Summary: Utilities for %{name} +Group: Applications/System +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: polarssl-utils < 1.3.10 +Provides: polarssl-utils = %{version}-%{release} + +%description utils +Cryptographic utilities based on %{name}. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: polarssl-devel < 1.3.10 +Provides: polarssl-devel = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package static +Summary: Static files for %{name} +Group: Development/Libraries +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +The %{name}-static package contains static files for +developing applications that use %{name}. + +%package doc +Summary: Documentation files for %{name} +Group: Documentation +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation. + +%prep +%setup -q + +%build +%cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 . +make %{?_smp_mflags} all apidoc + +%install +%make_install +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls + +# check temporarily disabled due a bug +# %check +# LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%doc ChangeLog +%license LICENSE +%{_libdir}/*.so.* + +%files utils +%{_libexecdir}/%{name}/ + +%files devel +%{_includedir}/polarssl/ +%{_libdir}/*.so + +%files static +%{_libdir}/*.a + +%files doc +%doc apidoc/* + +%changelog +* Thu May 14 2015 Morten Stevens - 1.3.10-1 +- Initial Fedora Package +- Added subpackage for documentation files +- Added subpackage for static files diff --git a/sources b/sources index e69de29..110dac1 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +19ebbc96feceb430ad958dfe89cb633f mbedtls-1.3.10-gpl.tgz From 3888f7a24e7a07065c19328760cee71bf8eb4fa9 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 1 Jun 2015 17:05:02 +0200 Subject: [PATCH 03/80] Spec file changes to cover Red Hat Enterprise Linux 5 and 6 --- mbedtls.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index ec02aa2..14111d7 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -1,8 +1,10 @@ +%if 0%{?fedora} || 0%{?rhel} >= 7 %global _docdir_fmt %{name} +%endif Name: mbedtls Version: 1.3.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: GPLv2+ with exceptions @@ -13,6 +15,10 @@ BuildRequires: cmake BuildRequires: doxygen BuildRequires: graphviz +%if 0%{?rhel} == 5 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif + # replace polarssl with mbedtls Obsoletes: polarssl < 1.3.10 @@ -58,7 +64,9 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} Group: Documentation +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch +%endif %description doc The %{name}-doc package contains documentation. @@ -66,12 +74,20 @@ The %{name}-doc package contains documentation. %prep %setup -q +%if 0%{?rhel} == 5 +sed -e 's/-Wlogical-op//' -i CMakeLists.txt +%endif + %build %cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 . make %{?_smp_mflags} all apidoc %install +%if 0%{?fedora} || 0%{?rhel} >= 6 %make_install +%else +make DESTDIR=$RPM_BUILD_ROOT install +%endif mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls @@ -85,6 +101,7 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %files %doc ChangeLog +%{!?_licensedir:%global license %%doc} %license LICENSE %{_libdir}/*.so.* @@ -102,6 +119,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Mon Jun 01 2015 Robert Scheck - 1.3.10-2 +- Spec file changes to cover Red Hat Enterprise Linux 5 and 6 + * Thu May 14 2015 Morten Stevens - 1.3.10-1 - Initial Fedora Package - Added subpackage for documentation files From 5e7b557c64b261150268dc73665f26d83a77b625 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 5 Jun 2015 11:51:16 +0200 Subject: [PATCH 04/80] Update to 1.3.11 --- .gitignore | 1 + mbedtls.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 894c52d..8e9312a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /mbedtls-1.3.10-gpl.tgz +/mbedtls-1.3.11-gpl.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 14111d7..1b3399a 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 1.3.10 -Release: 2%{?dist} +Version: 1.3.11 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: GPLv2+ with exceptions @@ -91,9 +91,8 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls -# check temporarily disabled due a bug -# %check -# LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V +%check +LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %post -p /sbin/ldconfig @@ -119,6 +118,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Fri Jun 05 2015 Morten Stevens - 1.3.11-1 +- Update to 1.3.11 + * Mon Jun 01 2015 Robert Scheck - 1.3.10-2 - Spec file changes to cover Red Hat Enterprise Linux 5 and 6 diff --git a/sources b/sources index 110dac1..4c5ca7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19ebbc96feceb430ad958dfe89cb633f mbedtls-1.3.10-gpl.tgz +c02ce2e54862d678604794ee484fb59e mbedtls-1.3.11-gpl.tgz From b2b3b4e677f2f028b888b46f7736151b04659f39 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 19:51:29 +0000 Subject: [PATCH 05/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 1b3399a..c987bf3 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 1.3.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: GPLv2+ with exceptions @@ -118,6 +118,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 05 2015 Morten Stevens - 1.3.11-1 - Update to 1.3.11 From 930849a686caffa84538ef236f0321d317eee17a Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 22 Jul 2015 15:17:33 +0200 Subject: [PATCH 06/80] Update to 2.0.0 --- .gitignore | 1 + mbedtls.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8e9312a..dc8279a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /mbedtls-1.3.10-gpl.tgz /mbedtls-1.3.11-gpl.tgz +/mbedtls-2.0.0-gpl.tgz diff --git a/mbedtls.spec b/mbedtls.spec index c987bf3..5c83ea0 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 1.3.11 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: GPLv2+ with exceptions @@ -108,7 +108,7 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %{_libexecdir}/%{name}/ %files devel -%{_includedir}/polarssl/ +%{_includedir}/mbedtls/ %{_libdir}/*.so %files static @@ -118,6 +118,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed Jul 22 2015 Morten Stevens - 2.0.0-1 +- Update to 2.0.0 + * Wed Jun 17 2015 Fedora Release Engineering - 1.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 4c5ca7f..d5d4662 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c02ce2e54862d678604794ee484fb59e mbedtls-1.3.11-gpl.tgz +6b8246a19a7a77737856e729cc8a0952 mbedtls-2.0.0-gpl.tgz From 4a49b4678f47eeedf628b5875aad56bb007e5b7d Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 11 Sep 2015 17:37:34 +0200 Subject: [PATCH 07/80] Update to 2.1.0 --- .gitignore | 1 + mbedtls.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dc8279a..6cf6f9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mbedtls-1.3.10-gpl.tgz /mbedtls-1.3.11-gpl.tgz /mbedtls-2.0.0-gpl.tgz +/mbedtls-2.1.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 5c83ea0..f0e676e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,13 +3,13 @@ %endif Name: mbedtls -Version: 2.0.0 +Version: 2.1.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries -License: GPLv2+ with exceptions +License: ASL 2.0 URL: https://tls.mbed.org/ -Source0: https://tls.mbed.org/download/%{name}-%{version}-gpl.tgz +Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz BuildRequires: cmake BuildRequires: doxygen @@ -118,6 +118,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Sep 11 2015 Morten Stevens - 2.1.0-1 +- Update to 2.1.0 + * Wed Jul 22 2015 Morten Stevens - 2.0.0-1 - Update to 2.0.0 diff --git a/sources b/sources index d5d4662..c0b720b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b8246a19a7a77737856e729cc8a0952 mbedtls-2.0.0-gpl.tgz +bdce8f2b688f1805350cba424d357db8 mbedtls-2.1.0-apache.tgz From 7abbadbd450eacf459b43895d0f60cb7086b532c Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 12 Oct 2015 13:58:36 +0200 Subject: [PATCH 08/80] Update to 2.1.2 --- .gitignore | 1 + mbedtls.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6cf6f9a..e49166f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /mbedtls-1.3.11-gpl.tgz /mbedtls-2.0.0-gpl.tgz /mbedtls-2.1.0-apache.tgz +/mbedtls-2.1.2-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index f0e676e..ee43f00 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.1.0 +Version: 2.1.2 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -118,6 +118,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Oct 12 2015 Morten Stevens - 2.1.2-1 +- Update to 2.1.2 +- CVE-2015-5291 + * Fri Sep 11 2015 Morten Stevens - 2.1.0-1 - Update to 2.1.0 diff --git a/sources b/sources index c0b720b..38c058b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdce8f2b688f1805350cba424d357db8 mbedtls-2.1.0-apache.tgz +ef1a625774a621d243f161100cc0c8d4 mbedtls-2.1.2-apache.tgz From c383a9048a5d598567d9a271f5767ddae5fbaf74 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sun, 27 Dec 2015 14:39:20 +0100 Subject: [PATCH 09/80] Update to 2.2.0 --- .gitignore | 1 + mbedtls.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e49166f..56dd9cd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /mbedtls-2.0.0-gpl.tgz /mbedtls-2.1.0-apache.tgz /mbedtls-2.1.2-apache.tgz +/mbedtls-2.2.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index ee43f00..b8f500e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.1.2 +Version: 2.2.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -118,26 +118,29 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog -* Mon Oct 12 2015 Morten Stevens - 2.1.2-1 +* Sun Dec 27 2015 Morten Stevens - 2.2.0-1 +- Update to 2.2.0 + +* Mon Oct 12 2015 Morten Stevens - 2.1.2-1 - Update to 2.1.2 - CVE-2015-5291 -* Fri Sep 11 2015 Morten Stevens - 2.1.0-1 +* Fri Sep 11 2015 Morten Stevens - 2.1.0-1 - Update to 2.1.0 -* Wed Jul 22 2015 Morten Stevens - 2.0.0-1 +* Wed Jul 22 2015 Morten Stevens - 2.0.0-1 - Update to 2.0.0 * Wed Jun 17 2015 Fedora Release Engineering - 1.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Fri Jun 05 2015 Morten Stevens - 1.3.11-1 +* Fri Jun 05 2015 Morten Stevens - 1.3.11-1 - Update to 1.3.11 * Mon Jun 01 2015 Robert Scheck - 1.3.10-2 - Spec file changes to cover Red Hat Enterprise Linux 5 and 6 -* Thu May 14 2015 Morten Stevens - 1.3.10-1 +* Thu May 14 2015 Morten Stevens - 1.3.10-1 - Initial Fedora Package - Added subpackage for documentation files - Added subpackage for static files diff --git a/sources b/sources index 38c058b..60c4187 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef1a625774a621d243f161100cc0c8d4 mbedtls-2.1.2-apache.tgz +b02f6be0f26f00c20e0c24d64b628e62 mbedtls-2.2.0-apache.tgz From b0589878243d8c19c92aa9a69f7a15ec70469be9 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 6 Jan 2016 01:34:01 +0100 Subject: [PATCH 10/80] Work around "make[2]: *** No rule to make target `library/libmbedtls.so', needed by `tests/test_suite_aes.cbc.c'. Stop." on RHEL 5 --- mbedtls.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mbedtls.spec b/mbedtls.spec index b8f500e..6c808fd 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -80,6 +80,11 @@ sed -e 's/-Wlogical-op//' -i CMakeLists.txt %build %cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 . + +%if 0%{?rhel} == 5 +sed -e 's/libmbedtls.so$/libmbedtls.so.%{version}/' -i tests/CMakeFiles/test_suite_*.dir/build.make +%endif + make %{?_smp_mflags} all apidoc %install From c70d25e2145dd91a25f1195bc815bb1817c94f2a Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 9 Jan 2016 21:16:49 +0100 Subject: [PATCH 11/80] Update to 2.2.1 --- .gitignore | 1 + mbedtls.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 56dd9cd..b2257f3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mbedtls-2.1.0-apache.tgz /mbedtls-2.1.2-apache.tgz /mbedtls-2.2.0-apache.tgz +/mbedtls-2.2.1-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 6c808fd..a6d700e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -123,6 +123,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Sat Jan 09 2016 Morten Stevens - 2.2.1-1 +- Update to 2.2.1 + * Sun Dec 27 2015 Morten Stevens - 2.2.0-1 - Update to 2.2.0 diff --git a/sources b/sources index 60c4187..3372b71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b02f6be0f26f00c20e0c24d64b628e62 mbedtls-2.2.0-apache.tgz +77751c0e370ed2ab01934e4c5e1d380f mbedtls-2.2.1-apache.tgz From b6c0462e4707849186c7143292271135cb8368d6 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 11 Jan 2016 23:03:27 +0100 Subject: [PATCH 12/80] -Wlogical-op has been conditionalized in CMakefile :) --- mbedtls.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index a6d700e..fc7c7b5 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -74,10 +74,6 @@ The %{name}-doc package contains documentation. %prep %setup -q -%if 0%{?rhel} == 5 -sed -e 's/-Wlogical-op//' -i CMakeLists.txt -%endif - %build %cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 . From 94cd2c20d4a5109b3e299129dd6cabf134936300 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 05:10:07 +0000 Subject: [PATCH 13/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index fc7c7b5..d16bc8e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -119,6 +119,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 09 2016 Morten Stevens - 2.2.1-1 - Update to 2.2.1 From 9135ac011639b84e1e609e4dec84e595928f515c Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 30 Jun 2016 14:58:20 +0200 Subject: [PATCH 14/80] Update to 2.3.0 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b2257f3..9b4239c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /mbedtls-2.1.2-apache.tgz /mbedtls-2.2.0-apache.tgz /mbedtls-2.2.1-apache.tgz +/mbedtls-2.3.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index d16bc8e..f0dec39 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -119,6 +119,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Jun 30 2016 Morten Stevens - 2.3.0-1 +- Update to 2.3.0 + * Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 3372b71..f6421cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77751c0e370ed2ab01934e4c5e1d380f mbedtls-2.2.1-apache.tgz +4dab982481441ed0a0235bc06d40eb17 mbedtls-2.3.0-apache.tgz From 4d7cd8c0d04ea231cc0e3b7a2d650b8f895dee41 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 31 Oct 2016 16:38:45 +0100 Subject: [PATCH 15/80] Update to 2.4.0 --- .gitignore | 1 + mbedtls.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9b4239c..2a56253 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /mbedtls-2.2.0-apache.tgz /mbedtls-2.2.1-apache.tgz /mbedtls-2.3.0-apache.tgz +/mbedtls-2.4.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index f0dec39..f166942 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.3.0 +Version: 2.4.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -12,6 +12,7 @@ URL: https://tls.mbed.org/ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz BuildRequires: cmake +BuildRequires: perl BuildRequires: doxygen BuildRequires: graphviz @@ -119,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Oct 31 2016 Morten Stevens - 2.4.0-1 +- Update to 2.4.0 + * Thu Jun 30 2016 Morten Stevens - 2.3.0-1 - Update to 2.3.0 diff --git a/sources b/sources index f6421cc..362537d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dab982481441ed0a0235bc06d40eb17 mbedtls-2.3.0-apache.tgz +4debf0e0eed7e75a00b7780830c9688e mbedtls-2.4.0-apache.tgz From 16306f4cb86c63cda1e96d2689d727613e793e0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 20:44:46 +0000 Subject: [PATCH 16/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index f166942..9911861 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -120,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 31 2016 Morten Stevens - 2.4.0-1 - Update to 2.4.0 From 57529a1b9d4501c714845c8855a2bf547d71932d Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 11 Mar 2017 21:32:12 +0100 Subject: [PATCH 17/80] Update to 2.4.2 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2a56253..57eee84 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /mbedtls-2.2.1-apache.tgz /mbedtls-2.3.0-apache.tgz /mbedtls-2.4.0-apache.tgz +/mbedtls-2.4.2-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 9911861..f86586e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.4.0 -Release: 2%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -120,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Sat Mar 11 2017 Morten Stevens - 2.4.2-1 +- Update to 2.4.2 + * Fri Feb 10 2017 Fedora Release Engineering - 2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 362537d..93742c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4debf0e0eed7e75a00b7780830c9688e mbedtls-2.4.0-apache.tgz +SHA512 (mbedtls-2.4.2-apache.tgz) = 75b704c9ea913828e4c56811e6255bdfc4c5ef5b5c44f28278521d2e209e57775507b54aef2a2e2a8c28d32f2ad474f65fdd40b079e0e9ee36d6f27a3c35bbd1 From b842a852aa74405213e34172548d31d3e093f2a6 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 30 Mar 2017 17:04:32 +0200 Subject: [PATCH 18/80] Enable PKCS#11 support --- mbedtls-2.4-config-enable-pkcs11.patch | 11 +++++++++++ mbedtls.spec | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 mbedtls-2.4-config-enable-pkcs11.patch diff --git a/mbedtls-2.4-config-enable-pkcs11.patch b/mbedtls-2.4-config-enable-pkcs11.patch new file mode 100644 index 0000000..fd31bbc --- /dev/null +++ b/mbedtls-2.4-config-enable-pkcs11.patch @@ -0,0 +1,11 @@ +--- include/mbedtls/config.h.orig 2017-03-29 12:55:55.677132417 +0200 ++++ include/mbedtls/config.h 2017-03-29 12:56:09.476057072 +0200 +@@ -2109,7 +2109,7 @@ + * This module enables SSL/TLS PKCS #11 smartcard support. + * Requires the presence of the PKCS#11 helper library (libpkcs11-helper) + */ +-//#define MBEDTLS_PKCS11_C ++#define MBEDTLS_PKCS11_C + + /** + * \def MBEDTLS_PKCS12_C diff --git a/mbedtls.spec b/mbedtls.spec index f86586e..cb486b3 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,17 +4,23 @@ Name: mbedtls Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 URL: https://tls.mbed.org/ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz +# mbed TLS way of enabling features +Patch0: mbedtls-2.4-config-enable-pkcs11.patch + BuildRequires: cmake BuildRequires: perl BuildRequires: doxygen BuildRequires: graphviz +BuildRequires: pkcs11-helper-devel + +Requires: pkcs11-helper %if 0%{?rhel} == 5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,9 +80,10 @@ The %{name}-doc package contains documentation. %prep %setup -q +%patch0 %build -%cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 . +%cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 -D USE_PKCS11_HELPER_LIBRARY:BOOL=1 . %if 0%{?rhel} == 5 sed -e 's/libmbedtls.so$/libmbedtls.so.%{version}/' -i tests/CMakeFiles/test_suite_*.dir/build.make @@ -120,6 +127,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed Mar 29 2017 David Sommerseth - 2.4.2-2 +- Enable PKCS#11 support + * Sat Mar 11 2017 Morten Stevens - 2.4.2-1 - Update to 2.4.2 From bdf67065832163ab2ae6c6422b89f3770f385eb2 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 21 Jun 2017 20:49:30 +0200 Subject: [PATCH 19/80] Update to 2.5.1 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 57eee84..eae1c68 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /mbedtls-2.3.0-apache.tgz /mbedtls-2.4.0-apache.tgz /mbedtls-2.4.2-apache.tgz +/mbedtls-2.5.1-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index cb486b3..8f70826 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -127,6 +127,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed Jun 21 2017 Morten Stevens - 2.5.1-1 +- Update to 2.5.1 + * Wed Mar 29 2017 David Sommerseth - 2.4.2-2 - Enable PKCS#11 support diff --git a/sources b/sources index 93742c5..28683ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.4.2-apache.tgz) = 75b704c9ea913828e4c56811e6255bdfc4c5ef5b5c44f28278521d2e209e57775507b54aef2a2e2a8c28d32f2ad474f65fdd40b079e0e9ee36d6f27a3c35bbd1 +SHA512 (mbedtls-2.5.1-apache.tgz) = 8bde8f3d1d025a13c2a20fa8d2a4b9711adf0bb32d2226f1dd898dda3f3337c929b3d60e53684fbcf8094142568dd1d780353a92b94cb15c28c31c6d0542e6fc From 0acddc49e5f147b344204e5ed7f936431d70e6f2 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 23 Jun 2017 23:02:44 +0200 Subject: [PATCH 20/80] Disable ctest due a bug on s390x --- mbedtls.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 8f70826..011ee4b 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -100,8 +100,9 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls -%check -LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V +# Disable ctest due a bug on s390x +# %check +# LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %post -p /sbin/ldconfig @@ -127,6 +128,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Jun 23 2017 Morten Stevens - 2.5.1-2 +- Disable ctest due a bug on s390x + * Wed Jun 21 2017 Morten Stevens - 2.5.1-1 - Update to 2.5.1 From e0c25537257ede1f705b8f3029d55a5c5e672061 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 26 Jun 2017 14:34:08 +0200 Subject: [PATCH 21/80] Reenable ctest --- mbedtls.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 011ee4b..8ef10f4 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -100,9 +100,8 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls -# Disable ctest due a bug on s390x -# %check -# LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V +%check +LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %post -p /sbin/ldconfig @@ -128,6 +127,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Mon Jun 26 2017 Morten Stevens - 2.5.1-3 +- Reenable ctest + * Fri Jun 23 2017 Morten Stevens - 2.5.1-2 - Disable ctest due a bug on s390x From 775b37d448ac930f243374eefb6011985b9b75b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:36:12 +0200 Subject: [PATCH 22/80] perl dependency renamed to perl-interpreter --- mbedtls.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 8ef10f4..24239b1 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -15,7 +15,7 @@ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz Patch0: mbedtls-2.4-config-enable-pkcs11.patch BuildRequires: cmake -BuildRequires: perl +BuildRequires: perl-interpreter BuildRequires: doxygen BuildRequires: graphviz BuildRequires: pkcs11-helper-devel From e74ac13215d7b56cf58a12ae7a012f6a3ff7eae6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 21:10:18 +0000 Subject: [PATCH 23/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 24239b1..a790b22 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -127,6 +127,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jun 26 2017 Morten Stevens - 2.5.1-3 - Reenable ctest From ea61b47bb71e08142f2e5dbc4601c3c977c3b7c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 03:09:49 +0000 Subject: [PATCH 24/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index a790b22..5b90810 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -127,6 +127,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 542678ee98d4f448e3543c0e7b6d64c0500c2e67 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 29 Aug 2017 13:24:02 +0200 Subject: [PATCH 25/80] Update to 2.6.0 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eae1c68..41baad7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /mbedtls-2.4.0-apache.tgz /mbedtls-2.4.2-apache.tgz /mbedtls-2.5.1-apache.tgz +/mbedtls-2.6.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 5b90810..83cb661 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.5.1 -Release: 5%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -127,6 +127,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Aug 29 2017 Morten Stevens - 2.6.0-1 +- Update to 2.6.0 + * Thu Aug 03 2017 Fedora Release Engineering - 2.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 28683ac..92d0979 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.5.1-apache.tgz) = 8bde8f3d1d025a13c2a20fa8d2a4b9711adf0bb32d2226f1dd898dda3f3337c929b3d60e53684fbcf8094142568dd1d780353a92b94cb15c28c31c6d0542e6fc +SHA512 (mbedtls-2.6.0-apache.tgz) = 5eb47d95a31c63e43074a115d141dedae869c43cbe62d5cf7bde11440e14fb8879ac6ed204d0d741b3501b8ba551019a5d47cbdf6673d18b61296be4463e9ffd From 92f7c522e4734ffc3949144b4f5d6ba7dd7c1a54 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 6 Feb 2018 15:39:13 +0100 Subject: [PATCH 26/80] Update to 2.7.0 --- .gitignore | 1 + ...-2.7-config-enable-threading-pthread.patch | 20 +++++++++++++++++++ mbedtls.spec | 9 ++++++++- sources | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 mbedtls-2.7-config-enable-threading-pthread.patch diff --git a/.gitignore b/.gitignore index 41baad7..e047a21 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mbedtls-2.4.2-apache.tgz /mbedtls-2.5.1-apache.tgz /mbedtls-2.6.0-apache.tgz +/mbedtls-2.7.0-apache.tgz diff --git a/mbedtls-2.7-config-enable-threading-pthread.patch b/mbedtls-2.7-config-enable-threading-pthread.patch new file mode 100644 index 0000000..f9c02af --- /dev/null +++ b/mbedtls-2.7-config-enable-threading-pthread.patch @@ -0,0 +1,20 @@ +--- include/mbedtls/config.h.orig 2018-02-05 12:36:59.000000000 +0100 ++++ include/mbedtls/config.h 2018-02-06 14:37:48.911218309 +0100 +@@ -1431,7 +1431,7 @@ + * + * Uncomment this to enable pthread mutexes. + */ +-//#define MBEDTLS_THREADING_PTHREAD ++#define MBEDTLS_THREADING_PTHREAD + + /** + * \def MBEDTLS_VERSION_FEATURES +@@ -2508,7 +2508,7 @@ + * + * Enable this layer to allow use of mutexes within mbed TLS + */ +-//#define MBEDTLS_THREADING_C ++#define MBEDTLS_THREADING_C + + /** + * \def MBEDTLS_TIMING_C diff --git a/mbedtls.spec b/mbedtls.spec index 83cb661..b7a63f8 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.6.0 +Version: 2.7.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -13,6 +13,7 @@ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz # mbed TLS way of enabling features Patch0: mbedtls-2.4-config-enable-pkcs11.patch +Patch1: mbedtls-2.7-config-enable-threading-pthread.patch BuildRequires: cmake BuildRequires: perl-interpreter @@ -81,6 +82,7 @@ The %{name}-doc package contains documentation. %prep %setup -q %patch0 +%patch1 %build %cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 -D USE_PKCS11_HELPER_LIBRARY:BOOL=1 . @@ -127,6 +129,11 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Feb 06 2018 Morten Stevens - 2.7.0-1 +- Update to 2.70 +- Enable pthread support (#1533435) +- Security Advisory 2018-01 (CVE-2018-0488) + * Tue Aug 29 2017 Morten Stevens - 2.6.0-1 - Update to 2.6.0 diff --git a/sources b/sources index 92d0979..a8d2b70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.6.0-apache.tgz) = 5eb47d95a31c63e43074a115d141dedae869c43cbe62d5cf7bde11440e14fb8879ac6ed204d0d741b3501b8ba551019a5d47cbdf6673d18b61296be4463e9ffd +SHA512 (mbedtls-2.7.0-apache.tgz) = 1cdd0e9a8f0639830c03520a5fdf1546864e0ee7fc4dd5ef2c8a260d0f911b903a83038fd43e25c59a0e1d894b494fb6947478e0007a341c5ffcee5bf25cf43f From 423d55c0d82df6a7ba991a776e279bcfa3835223 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:48:21 +0100 Subject: [PATCH 27/80] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- mbedtls.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index b7a63f8..6590096 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -24,7 +24,6 @@ BuildRequires: pkcs11-helper-devel Requires: pkcs11-helper %if 0%{?rhel} == 5 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif # replace polarssl with mbedtls From 2ea2d981322e9942864501d7634e22e387e98a02 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 6 Apr 2018 16:10:44 +0200 Subject: [PATCH 28/80] Update to 2.8.0 --- .gitignore | 1 + mbedtls.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e047a21..536e232 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /mbedtls-2.5.1-apache.tgz /mbedtls-2.6.0-apache.tgz /mbedtls-2.7.0-apache.tgz +/mbedtls-2.8.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 6590096..87855cf 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.7.0 +Version: 2.8.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -128,6 +128,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Apr 06 2018 Morten Stevens - 2.8.0-1 +- Update to 2.8.0 +- CVE-2018-0488, CVE-2018-0487 + * Tue Feb 06 2018 Morten Stevens - 2.7.0-1 - Update to 2.70 - Enable pthread support (#1533435) diff --git a/sources b/sources index a8d2b70..f3a3aa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.7.0-apache.tgz) = 1cdd0e9a8f0639830c03520a5fdf1546864e0ee7fc4dd5ef2c8a260d0f911b903a83038fd43e25c59a0e1d894b494fb6947478e0007a341c5ffcee5bf25cf43f +SHA512 (mbedtls-2.8.0-apache.tgz) = f70acd91eb1d0173372bfffde98931d3fec39d57cdde223767bc49f2e18c65977e76572e59f921693ed5c4dc3cc67929308e8e483cf2b64831c0f09aaf6a1a01 From ff51752151b18970f0a7f2c4e5e7e7df955aeba2 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 6 Apr 2018 16:23:39 +0200 Subject: [PATCH 29/80] Fix version number --- mbedtls.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 87855cf..15ffaad 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -130,10 +130,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %changelog * Fri Apr 06 2018 Morten Stevens - 2.8.0-1 - Update to 2.8.0 -- CVE-2018-0488, CVE-2018-0487 * Tue Feb 06 2018 Morten Stevens - 2.7.0-1 -- Update to 2.70 +- Update to 2.7.0 - Enable pthread support (#1533435) - Security Advisory 2018-01 (CVE-2018-0488) From bdd588196d1e33d12e1ddc14357ea5141336db8f Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 16 May 2018 13:17:33 +0200 Subject: [PATCH 30/80] Update to 2.9.0 --- .gitignore | 1 + mbedtls.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 536e232..efdc86d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /mbedtls-2.6.0-apache.tgz /mbedtls-2.7.0-apache.tgz /mbedtls-2.8.0-apache.tgz +/mbedtls-2.9.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 15ffaad..5c3d00c 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.8.0 +Version: 2.9.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -128,6 +128,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed May 16 2018 Morten Stevens - 2.9.0-1 +- Update to 2.90 + * Fri Apr 06 2018 Morten Stevens - 2.8.0-1 - Update to 2.8.0 diff --git a/sources b/sources index f3a3aa8..a3daf4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.8.0-apache.tgz) = f70acd91eb1d0173372bfffde98931d3fec39d57cdde223767bc49f2e18c65977e76572e59f921693ed5c4dc3cc67929308e8e483cf2b64831c0f09aaf6a1a01 +SHA512 (mbedtls-2.9.0-apache.tgz) = b0d5d8e6c8a2e0019549e41085cc35354a83499141c72d4fafeb05188f7b624199690bd01fc0d3473c0c8832fc917a556ce3830ea883ed36f36002177be4d66e From 2a32d50ac3d666f6f370168d543b4cdd1ec534c3 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 9 Jul 2018 13:49:52 +0200 Subject: [PATCH 31/80] Update to 2.11.0 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index efdc86d..5188c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /mbedtls-2.7.0-apache.tgz /mbedtls-2.8.0-apache.tgz /mbedtls-2.9.0-apache.tgz +/mbedtls-2.11.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 5c3d00c..754c898 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.9.0 +Version: 2.11.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -128,8 +128,11 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Jul 09 2018 Morten Stevens - 2.11.0-1 +- Update to 2.11.0 + * Wed May 16 2018 Morten Stevens - 2.9.0-1 -- Update to 2.90 +- Update to 2.9.0 * Fri Apr 06 2018 Morten Stevens - 2.8.0-1 - Update to 2.8.0 diff --git a/sources b/sources index a3daf4d..454b88d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.9.0-apache.tgz) = b0d5d8e6c8a2e0019549e41085cc35354a83499141c72d4fafeb05188f7b624199690bd01fc0d3473c0c8832fc917a556ce3830ea883ed36f36002177be4d66e +SHA512 (mbedtls-2.11.0-apache.tgz) = 602c95b48ae36fbe728582d356dc6b9fc2cbd04befd3b5edeae3bb483ca1bf7092a96019c75e2aacb2d7a9e0716855d5de76a9b6340f76eaf2551fb275893835 From bdfb899b3a17ebcb0d4cdb1e95b8e782f8a81470 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:02:17 +0000 Subject: [PATCH 32/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 754c898..b2cab66 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -128,6 +128,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Morten Stevens - 2.11.0-1 - Update to 2.11.0 From 0e1ca91bf349dac2ac06ceb8de80c202329af252 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 16 Jul 2018 18:50:29 +0200 Subject: [PATCH 33/80] BuildRequire gcc-c++ --- mbedtls.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index b2cab66..c7a87e3 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -15,6 +15,7 @@ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz Patch0: mbedtls-2.4-config-enable-pkcs11.patch Patch1: mbedtls-2.7-config-enable-threading-pthread.patch +BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: perl-interpreter BuildRequires: doxygen @@ -128,6 +129,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Jul 16 2018 Morten Stevens - 2.11.0-3 +- BuildRequire gcc-c++ (https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B) + * Fri Jul 13 2018 Fedora Release Engineering - 2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 456619f4640c0f590fa0ff9b30a3102528a33d97 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 27 Jul 2018 14:44:52 +0200 Subject: [PATCH 34/80] Update to 2.12.0 --- .gitignore | 1 + mbedtls.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5188c6f..f724c4c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /mbedtls-2.8.0-apache.tgz /mbedtls-2.9.0-apache.tgz /mbedtls-2.11.0-apache.tgz +/mbedtls-2.12.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index c7a87e3..9d7eb8a 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.11.0 -Release: 3%{?dist} +Version: 2.12.0 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -129,6 +129,11 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +%changelog +* Fri Jul 27 2018 Morten Stevens - 2.12.0-1 +- Update to 2.12.0 +- Security Advisory 2018-02 (CVE-2018-0497) + * Mon Jul 16 2018 Morten Stevens - 2.11.0-3 - BuildRequire gcc-c++ (https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B) diff --git a/sources b/sources index 454b88d..bd3b5e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.11.0-apache.tgz) = 602c95b48ae36fbe728582d356dc6b9fc2cbd04befd3b5edeae3bb483ca1bf7092a96019c75e2aacb2d7a9e0716855d5de76a9b6340f76eaf2551fb275893835 +SHA512 (mbedtls-2.12.0-apache.tgz) = 4b6387c6040d4a5f8792d5a7e3ee32036a4f619d2506f0af965be3d7d32176c5eec14df894befc8cd875ddab4e0d6b75486a8d893f155e9c965ec9d1304e346f From cc9ed8ac672a28c024a18e21e659ca726be93826 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 19 Sep 2018 11:26:45 +0200 Subject: [PATCH 35/80] Update to 2.13.0 --- .gitignore | 1 + mbedtls.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f724c4c..3a1ee4d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /mbedtls-2.9.0-apache.tgz /mbedtls-2.11.0-apache.tgz /mbedtls-2.12.0-apache.tgz +/mbedtls-2.13.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 9d7eb8a..047a65e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.12.0 +Version: 2.13.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -129,7 +129,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog -%changelog +* Wed Sep 19 2018 Morten Stevens - 2.13.0-1 +- Update to 2.13.0 + * Fri Jul 27 2018 Morten Stevens - 2.12.0-1 - Update to 2.12.0 - Security Advisory 2018-02 (CVE-2018-0497) diff --git a/sources b/sources index bd3b5e7..a8fee15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.12.0-apache.tgz) = 4b6387c6040d4a5f8792d5a7e3ee32036a4f619d2506f0af965be3d7d32176c5eec14df894befc8cd875ddab4e0d6b75486a8d893f155e9c965ec9d1304e346f +SHA512 (mbedtls-2.13.0-apache.tgz) = f70e63c5dc56d15de8d0093f83a2d70f181f6fb361359d5036bef54462929c37635b8214426faa9bac2570522be5eac29786d11e98f5502a6aa501b80be55d7d From cbdd4557d54f360c9d2987aef95f7de9bcf10562 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 3 Dec 2018 14:12:42 +0100 Subject: [PATCH 36/80] Update to 2.14.0 --- .gitignore | 1 + mbedtls.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3a1ee4d..241cf0f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /mbedtls-2.11.0-apache.tgz /mbedtls-2.12.0-apache.tgz /mbedtls-2.13.0-apache.tgz +/mbedtls-2.14.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 047a65e..94518f8 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.13.0 +Version: 2.14.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -129,6 +129,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Dec 03 2018 Morten Stevens - 2.14.0-1 +- Update to 2.14.0 + * Wed Sep 19 2018 Morten Stevens - 2.13.0-1 - Update to 2.13.0 diff --git a/sources b/sources index a8fee15..4fb283c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.13.0-apache.tgz) = f70e63c5dc56d15de8d0093f83a2d70f181f6fb361359d5036bef54462929c37635b8214426faa9bac2570522be5eac29786d11e98f5502a6aa501b80be55d7d +SHA512 (mbedtls-2.14.0-apache.tgz) = 081af6cfb22db1a7977fac8ae1e56030f0268e8f83419d3d032cae9f9cf8d11947050eb64aee841dc7a93880c03d535935e06054da4d30815f1e6288e32fc252 From f2c67017cab8182ab147566d6a2809432409c181 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Fri, 7 Dec 2018 23:14:34 +0100 Subject: [PATCH 37/80] Update to 2.14.1 --- .gitignore | 1 + mbedtls.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 241cf0f..beaa20b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /mbedtls-2.12.0-apache.tgz /mbedtls-2.13.0-apache.tgz /mbedtls-2.14.0-apache.tgz +/mbedtls-2.14.1-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 94518f8..3f69e58 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.14.0 +Version: 2.14.1 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries @@ -129,6 +129,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Dec 07 2018 Morten Stevens - 2.14.1-1 +- Update to 2.14.1 +- CVE-2018-19608 (#1656784) + * Mon Dec 03 2018 Morten Stevens - 2.14.0-1 - Update to 2.14.0 diff --git a/sources b/sources index 4fb283c..f7a86d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.14.0-apache.tgz) = 081af6cfb22db1a7977fac8ae1e56030f0268e8f83419d3d032cae9f9cf8d11947050eb64aee841dc7a93880c03d535935e06054da4d30815f1e6288e32fc252 +SHA512 (mbedtls-2.14.1-apache.tgz) = f8a9371fcdca34f61db3676f14f83ba303194dc097fcf34b8088b2d2b1b88b2818c2ed54eef747d8dff7c799e11aee511eb179bb815ae46934b3426d09926dda From bf7d2ccc0cc6830f2da3a29c887e30d434b20882 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 20 Dec 2018 14:48:32 +0100 Subject: [PATCH 38/80] Spec file improvements --- mbedtls-2.4-config-enable-pkcs11.patch | 11 ----- ...-2.7-config-enable-threading-pthread.patch | 20 --------- mbedtls.spec | 44 +++++++++---------- 3 files changed, 22 insertions(+), 53 deletions(-) delete mode 100644 mbedtls-2.4-config-enable-pkcs11.patch delete mode 100644 mbedtls-2.7-config-enable-threading-pthread.patch diff --git a/mbedtls-2.4-config-enable-pkcs11.patch b/mbedtls-2.4-config-enable-pkcs11.patch deleted file mode 100644 index fd31bbc..0000000 --- a/mbedtls-2.4-config-enable-pkcs11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/mbedtls/config.h.orig 2017-03-29 12:55:55.677132417 +0200 -+++ include/mbedtls/config.h 2017-03-29 12:56:09.476057072 +0200 -@@ -2109,7 +2109,7 @@ - * This module enables SSL/TLS PKCS #11 smartcard support. - * Requires the presence of the PKCS#11 helper library (libpkcs11-helper) - */ --//#define MBEDTLS_PKCS11_C -+#define MBEDTLS_PKCS11_C - - /** - * \def MBEDTLS_PKCS12_C diff --git a/mbedtls-2.7-config-enable-threading-pthread.patch b/mbedtls-2.7-config-enable-threading-pthread.patch deleted file mode 100644 index f9c02af..0000000 --- a/mbedtls-2.7-config-enable-threading-pthread.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- include/mbedtls/config.h.orig 2018-02-05 12:36:59.000000000 +0100 -+++ include/mbedtls/config.h 2018-02-06 14:37:48.911218309 +0100 -@@ -1431,7 +1431,7 @@ - * - * Uncomment this to enable pthread mutexes. - */ --//#define MBEDTLS_THREADING_PTHREAD -+#define MBEDTLS_THREADING_PTHREAD - - /** - * \def MBEDTLS_VERSION_FEATURES -@@ -2508,7 +2508,7 @@ - * - * Enable this layer to allow use of mutexes within mbed TLS - */ --//#define MBEDTLS_THREADING_C -+#define MBEDTLS_THREADING_C - - /** - * \def MBEDTLS_TIMING_C diff --git a/mbedtls.spec b/mbedtls.spec index 3f69e58..ffa89d5 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,29 +4,23 @@ Name: mbedtls Version: 2.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 URL: https://tls.mbed.org/ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz -# mbed TLS way of enabling features -Patch0: mbedtls-2.4-config-enable-pkcs11.patch -Patch1: mbedtls-2.7-config-enable-threading-pthread.patch - BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: perl-interpreter BuildRequires: doxygen BuildRequires: graphviz BuildRequires: pkcs11-helper-devel +BuildRequires: zlib-devel Requires: pkcs11-helper -%if 0%{?rhel} == 5 -%endif - # replace polarssl with mbedtls Obsoletes: polarssl < 1.3.10 @@ -72,33 +66,35 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} Group: Documentation -%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch -%endif %description doc The %{name}-doc package contains documentation. %prep -%setup -q -%patch0 -%patch1 +%autosetup -%build -%cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_MBEDTLS_LIBRARY:BOOL=1 -D USE_PKCS11_HELPER_LIBRARY:BOOL=1 . +sed -i 's|//\(#define MBEDTLS_PKCS11_C\)|\1|' include/mbedtls/config.h +sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h +sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h +sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h +sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h -%if 0%{?rhel} == 5 -sed -e 's/libmbedtls.so$/libmbedtls.so.%{version}/' -i tests/CMakeFiles/test_suite_*.dir/build.make -%endif +%build +%cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DLINK_WITH_PTHREAD=ON \ + -DUSE_PKCS11_HELPER_LIBRARY=ON \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=ON make %{?_smp_mflags} all apidoc %install -%if 0%{?fedora} || 0%{?rhel} >= 6 %make_install -%else -make DESTDIR=$RPM_BUILD_ROOT install -%endif + mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls @@ -129,6 +125,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Dec 20 2018 Morten Stevens - 2.14.1-2 +- Spec file improvements +- Enabled zlib support + * Fri Dec 07 2018 Morten Stevens - 2.14.1-1 - Update to 2.14.1 - CVE-2018-19608 (#1656784) From 6ca0dfd75b35bbb9edf7a397beab0cbfc758d01c Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 1 Jan 2019 13:27:34 +0100 Subject: [PATCH 39/80] Update to 2.16.0 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index beaa20b..3e27994 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /mbedtls-2.13.0-apache.tgz /mbedtls-2.14.0-apache.tgz /mbedtls-2.14.1-apache.tgz +/mbedtls-2.16.0-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index ffa89d5..a7d7aee 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.14.1 -Release: 2%{?dist} +Version: 2.16.0 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library Group: System Environment/Libraries License: ASL 2.0 @@ -125,6 +125,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Jan 01 2019 Morten Stevens - 2.16.0-1 +- Update to 2.16.0 + * Thu Dec 20 2018 Morten Stevens - 2.14.1-2 - Spec file improvements - Enabled zlib support diff --git a/sources b/sources index f7a86d6..96f94d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.14.1-apache.tgz) = f8a9371fcdca34f61db3676f14f83ba303194dc097fcf34b8088b2d2b1b88b2818c2ed54eef747d8dff7c799e11aee511eb179bb815ae46934b3426d09926dda +SHA512 (mbedtls-2.16.0-apache.tgz) = 765303bc0572b904e05990b254ed160eb18e300a1bbbb4aa5176e5cdbf5464a944d5ad06b712183e2396a48f0c7ae529e0c820303c3995f7d6b9c3f24535d004 From f87eb0bdf101e60e41a82a7efa2697b551d50928 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:40:23 +0100 Subject: [PATCH 40/80] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- mbedtls.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index a7d7aee..2b6b89e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -101,9 +101,7 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %check LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc ChangeLog From 152acb895faaf4a952f3675e3bd673ad2934e525 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:53 +0100 Subject: [PATCH 41/80] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- mbedtls.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 2b6b89e..3918db0 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -6,7 +6,6 @@ Name: mbedtls Version: 2.16.0 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library -Group: System Environment/Libraries License: ASL 2.0 URL: https://tls.mbed.org/ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz @@ -35,7 +34,6 @@ FOSS License Exception: https://tls.mbed.org/foss-license-exception %package utils Summary: Utilities for %{name} -Group: Applications/System Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: polarssl-utils < 1.3.10 Provides: polarssl-utils = %{version}-%{release} @@ -45,7 +43,6 @@ Cryptographic utilities based on %{name}. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: polarssl-devel < 1.3.10 Provides: polarssl-devel = %{version}-%{release} @@ -56,7 +53,6 @@ developing applications that use %{name}. %package static Summary: Static files for %{name} -Group: Development/Libraries Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static @@ -65,7 +61,6 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} -Group: Documentation BuildArch: noarch %description doc From 784683609b7f19e1476d63454aa4d08b3a79b99a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 10:01:06 +0000 Subject: [PATCH 42/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 3918db0..3fbdbf5 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -118,6 +118,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 01 2019 Morten Stevens - 2.16.0-1 - Update to 2.16.0 From 7f047ef2fd710155299f42ab395483ac67d8fabd Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 2 Feb 2019 16:15:16 +0100 Subject: [PATCH 43/80] Fix build issues with cmake 3.13.3 --- mbedtls.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 3fbdbf5..88791e7 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -76,7 +76,8 @@ sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h %build -%cmake \ + +%cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DLINK_WITH_PTHREAD=ON \ -DUSE_PKCS11_HELPER_LIBRARY=ON \ From 0f9136f042b0233b31aae0f957da3c0f4db19957 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 11 Feb 2019 21:26:25 +0000 Subject: [PATCH 44/80] devel package needs zlib-devel --- mbedtls.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 88791e7..1065557 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -44,6 +44,7 @@ Cryptographic utilities based on %{name}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: zlib-devel Obsoletes: polarssl-devel < 1.3.10 Provides: polarssl-devel = %{version}-%{release} @@ -119,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Feb 11 2019 Peter Robinson 2.16.0-3 +- devel package needs zlib-devel + * Fri Feb 01 2019 Fedora Release Engineering - 2.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e95221f3b66f7542882a8b0e2e13dec22f2fc806 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 28 Mar 2019 13:43:53 +0100 Subject: [PATCH 45/80] Update to 2.16.1 --- .gitignore | 1 + mbedtls.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e27994..3212d71 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /mbedtls-2.14.0-apache.tgz /mbedtls-2.14.1-apache.tgz /mbedtls-2.16.0-apache.tgz +/mbedtls-2.16.1-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 1065557..7f9706d 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.16.0 -Release: 3%{?dist} +Version: 2.16.1 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -78,7 +78,7 @@ sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h %build -%cmake . \ +%cmake \ -DCMAKE_BUILD_TYPE=Release \ -DLINK_WITH_PTHREAD=ON \ -DUSE_PKCS11_HELPER_LIBRARY=ON \ @@ -120,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Mar 28 2019 Morten Stevens - 2.16.1-1 +- Update to 2.16.1 + * Mon Feb 11 2019 Peter Robinson 2.16.0-3 - devel package needs zlib-devel diff --git a/sources b/sources index 96f94d1..6c6aea2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.0-apache.tgz) = 765303bc0572b904e05990b254ed160eb18e300a1bbbb4aa5176e5cdbf5464a944d5ad06b712183e2396a48f0c7ae529e0c820303c3995f7d6b9c3f24535d004 +SHA512 (mbedtls-2.16.1-apache.tgz) = 9e436ef22f1a43d8e139be4dcba1544291ee2cdb3b05335c4d6127536b122f95c2d894bab965d3242a53509637860aad72715651c5cf7d176103fa762eea6a68 From 1dd2ddfbb89fed4ecb7890fb7a635cbc0f71e956 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 20 Jul 2019 19:35:37 +0200 Subject: [PATCH 46/80] Update to 2.16.2 --- .gitignore | 1 + mbedtls.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3212d71..b249f69 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /mbedtls-2.14.1-apache.tgz /mbedtls-2.16.0-apache.tgz /mbedtls-2.16.1-apache.tgz +/mbedtls-2.16.2-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 7f9706d..d872adb 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.16.1 +Version: 2.16.2 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 @@ -120,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Sat Jul 20 2019 Morten Stevens - 2.16.2-1 +- Update to 2.16.2 + * Thu Mar 28 2019 Morten Stevens - 2.16.1-1 - Update to 2.16.1 diff --git a/sources b/sources index 6c6aea2..1cb16ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.1-apache.tgz) = 9e436ef22f1a43d8e139be4dcba1544291ee2cdb3b05335c4d6127536b122f95c2d894bab965d3242a53509637860aad72715651c5cf7d176103fa762eea6a68 +SHA512 (mbedtls-2.16.2-apache.tgz) = afb9a7a68f09a0ae4b8bda293fd568c0758c6173f33d8383aea0ef52e0901ef1508cda2639ef394112b965a43dc49004dc3abf0a23a752c276be5a42d7e49d0c From fc7f27d349d7dd23165bdc4b390fee362deace76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 16:12:54 +0000 Subject: [PATCH 47/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index d872adb..a3de93e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -120,6 +120,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Jul 20 2019 Morten Stevens - 2.16.2-1 - Update to 2.16.2 From 201c0eb0d036dd43361f79685ea3810722d270d2 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 3 Aug 2019 10:52:51 +0200 Subject: [PATCH 48/80] Fix building on RHEL8 --- mbedtls.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index a3de93e..eb05778 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -12,10 +12,11 @@ Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: perl-interpreter BuildRequires: doxygen BuildRequires: graphviz +BuildRequires: perl-interpreter BuildRequires: pkcs11-helper-devel +BuildRequires: python3 BuildRequires: zlib-devel Requires: pkcs11-helper @@ -120,6 +121,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Sat Aug 03 2019 Morten Stevens - 2.16.2-3 +- Fix building on RHEL8 + * Thu Jul 25 2019 Fedora Release Engineering - 2.16.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 060338f1bbc645a8e1cda96ae622e5746c9b81ea Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 4 Sep 2019 01:22:08 +0200 Subject: [PATCH 49/80] devel package needs pkcs11-helper-devel (#1748468) --- mbedtls.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index eb05778..477701e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -45,6 +45,7 @@ Cryptographic utilities based on %{name}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkcs11-helper-devel Requires: zlib-devel Obsoletes: polarssl-devel < 1.3.10 Provides: polarssl-devel = %{version}-%{release} @@ -121,6 +122,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Sep 03 2019 Morten Stevens - 2.16.2-4 +- devel package needs pkcs11-helper-devel (#1748468) + * Sat Aug 03 2019 Morten Stevens - 2.16.2-3 - Fix building on RHEL8 From f225ed5ecf07d1d2a09542aae5ccbe328777b690 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 28 Sep 2019 15:20:35 +0200 Subject: [PATCH 50/80] Update to 2.16.3 --- .gitignore | 1 + mbedtls.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b249f69..5613a22 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /mbedtls-2.16.0-apache.tgz /mbedtls-2.16.1-apache.tgz /mbedtls-2.16.2-apache.tgz +/mbedtls-2.16.3-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 477701e..0234963 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.16.2 -Release: 4%{?dist} +Version: 2.16.3 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -122,6 +122,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Sat Sep 28 2019 Morten Stevens - 2.16.3-1 +- Update to 2.16.3 +- Side channel attack on deterministic ECDSA (CVE-2019-16910) + * Tue Sep 03 2019 Morten Stevens - 2.16.2-4 - devel package needs pkcs11-helper-devel (#1748468) diff --git a/sources b/sources index 1cb16ab..f0754c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.2-apache.tgz) = afb9a7a68f09a0ae4b8bda293fd568c0758c6173f33d8383aea0ef52e0901ef1508cda2639ef394112b965a43dc49004dc3abf0a23a752c276be5a42d7e49d0c +SHA512 (mbedtls-2.16.3-apache.tgz) = 62b984d04570334e740ff8b857b4dad73804a4d0aec22b224cb813eb8a6a4b2ec9bff3126c198552e030da94201fd98ed764e8b9f53056e2f94a51dfdbb47cdd From 9337af20bf24825dfa3af3778eef633c35de8e13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 12:24:21 +0000 Subject: [PATCH 51/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 0234963..ffae578 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -122,6 +122,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.16.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Sep 28 2019 Morten Stevens - 2.16.3-1 - Update to 2.16.3 - Side channel attack on deterministic ECDSA (CVE-2019-16910) From 2613b71e51ebc4439cdc4da73a3f5c991be59c90 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 10 Feb 2020 11:35:10 +0100 Subject: [PATCH 52/80] Update to 2.16.4 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5613a22..93c6939 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /mbedtls-2.16.1-apache.tgz /mbedtls-2.16.2-apache.tgz /mbedtls-2.16.3-apache.tgz +/mbedtls-2.16.4-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index ffae578..b72366f 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.16.3 -Release: 2%{?dist} +Version: 2.16.4 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -122,6 +122,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Mon Feb 10 2020 Morten Stevens - 2.16.4-1 +- Update to 2.16.4 + * Wed Jan 29 2020 Fedora Release Engineering - 2.16.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f0754c5..94ce643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.3-apache.tgz) = 62b984d04570334e740ff8b857b4dad73804a4d0aec22b224cb813eb8a6a4b2ec9bff3126c198552e030da94201fd98ed764e8b9f53056e2f94a51dfdbb47cdd +SHA512 (mbedtls-2.16.4-apache.tgz) = 7b72a83c941bcb2b6b7710e00e68e390ee3c856eff957ff1608fe9d59c4d40b36f536283a83d3a1c4fe53dc268e877a56360f3654d226f967a881287df3dcbe7 From ae60eec7b7a32a3c2fefb2ac855dc3e9c199a97b Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 3 Mar 2020 11:25:00 +0100 Subject: [PATCH 53/80] Update to 2.16.5 --- .gitignore | 1 + mbedtls.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 93c6939..59756d9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /mbedtls-2.16.2-apache.tgz /mbedtls-2.16.3-apache.tgz /mbedtls-2.16.4-apache.tgz +/mbedtls-2.16.5-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index b72366f..1501790 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.16.4 +Version: 2.16.5 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 @@ -122,6 +122,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Mar 03 2020 Morten Stevens - 2.16.5-1 +- Update to 2.16.5 + * Mon Feb 10 2020 Morten Stevens - 2.16.4-1 - Update to 2.16.4 diff --git a/sources b/sources index 94ce643..4a86610 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.4-apache.tgz) = 7b72a83c941bcb2b6b7710e00e68e390ee3c856eff957ff1608fe9d59c4d40b36f536283a83d3a1c4fe53dc268e877a56360f3654d226f967a881287df3dcbe7 +SHA512 (mbedtls-2.16.5-apache.tgz) = 89a6a2cc6fe8b568396caed5fe8428ff5debf833c643b0e4c3144fdc474b127d156d8f5e5ea47a8b5d6522a2689e91a57abc533390b3f54aaa2c756ef6d3baf7 From 8753ffa1e35ffb57b73b1cb4bb46bf98744629a4 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 27 May 2020 11:02:43 +0200 Subject: [PATCH 54/80] Update to 2.16.6 --- .gitignore | 1 + mbedtls.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 59756d9..d5d6726 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /mbedtls-2.16.3-apache.tgz /mbedtls-2.16.4-apache.tgz /mbedtls-2.16.5-apache.tgz +/mbedtls-2.16.6-apache.tgz diff --git a/mbedtls.spec b/mbedtls.spec index 1501790..05dbb74 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.16.5 +Version: 2.16.6 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 @@ -122,6 +122,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Wed May 27 2020 Morten Stevens - 2.16.6-1 +- Update to 2.16.6 +- Security Advisory 2020-04 (CVE-2020-10932) + * Tue Mar 03 2020 Morten Stevens - 2.16.5-1 - Update to 2.16.5 diff --git a/sources b/sources index 4a86610..1faf1f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.5-apache.tgz) = 89a6a2cc6fe8b568396caed5fe8428ff5debf833c643b0e4c3144fdc474b127d156d8f5e5ea47a8b5d6522a2689e91a57abc533390b3f54aaa2c756ef6d3baf7 +SHA512 (mbedtls-2.16.6-apache.tgz) = a0c48b694d7bc70256d26c44bfb2ac802428560b02e50fe2e47762bc595e2c7b8fac934badb3452acb01d8a54386eafae0ff2894320d24ab7554f1c8e6cb4bcf From 567cfa21337cf4c2a64202b5d9ff9e8c4e6373a3 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 14 Jul 2020 11:18:53 +0200 Subject: [PATCH 55/80] Update to 2.16.7 --- .gitignore | 1 + mbedtls.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d5d6726..6f842db 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /mbedtls-2.16.4-apache.tgz /mbedtls-2.16.5-apache.tgz /mbedtls-2.16.6-apache.tgz +/mbedtls-2.16.7.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index 05dbb74..8fcba7d 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,12 +3,12 @@ %endif Name: mbedtls -Version: 2.16.6 +Version: 2.16.7 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ -Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz +Source0: https://tls.mbed.org/download/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake @@ -70,13 +70,14 @@ BuildArch: noarch The %{name}-doc package contains documentation. %prep -%autosetup +%autosetup -n mbedtls-mbedtls-2.16.7 sed -i 's|//\(#define MBEDTLS_PKCS11_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h +sed -i 's|//\(#define MBEDTLS_CMAC_C\)|\1|' include/mbedtls/config.h %build @@ -122,6 +123,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Jul 14 2020 Morten Stevens - 2.16.7-1 +- Update to 2.16.7 +- Security Advisory 2020-07 + * Wed May 27 2020 Morten Stevens - 2.16.6-1 - Update to 2.16.6 - Security Advisory 2020-04 (CVE-2020-10932) diff --git a/sources b/sources index 1faf1f1..b7992e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.6-apache.tgz) = a0c48b694d7bc70256d26c44bfb2ac802428560b02e50fe2e47762bc595e2c7b8fac934badb3452acb01d8a54386eafae0ff2894320d24ab7554f1c8e6cb4bcf +SHA512 (mbedtls-2.16.7.tar.gz) = 57374061ec8ec7cbb745aa08235d17d4566435c7ad861c0a9fdc8957e09c1ea6619f0deb8a22040fa3674d0fab58ca353879eac1388e710c81840a7ae1225b9f From 2539304e0838d528aa0faeb0a36fe0dbbcbedb2c Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 14 Jul 2020 13:20:33 +0200 Subject: [PATCH 56/80] Specfile improvements --- mbedtls.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 8fcba7d..596745e 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -70,14 +70,13 @@ BuildArch: noarch The %{name}-doc package contains documentation. %prep -%autosetup -n mbedtls-mbedtls-2.16.7 +%autosetup -n %{name}-%{name}-%{version} sed -i 's|//\(#define MBEDTLS_PKCS11_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h -sed -i 's|//\(#define MBEDTLS_CMAC_C\)|\1|' include/mbedtls/config.h %build From e40e09056df6d94e6d4aa0d4e8dfa50b150852b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 07:07:52 +0000 Subject: [PATCH 57/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 596745e..826adc1 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -122,6 +122,9 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.16.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Morten Stevens - 2.16.7-1 - Update to 2.16.7 - Security Advisory 2020-07 From 61472bf1a999d094974c9ce68b04cda75201ad5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:25:23 +0000 Subject: [PATCH 58/80] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 826adc1..31b3519 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -122,6 +122,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.16.7-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.16.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 93af9b94cfbf26471a9c0bbd3d1dcc14618433da Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 20 Aug 2020 22:15:03 +0200 Subject: [PATCH 59/80] FTBFS in Fedora rawhide/f33 (#1864124) --- mbedtls.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 31b3519..ef0d471 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -89,16 +89,17 @@ sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ -DUSE_STATIC_MBEDTLS_LIBRARY=ON -make %{?_smp_mflags} all apidoc +%cmake_build +make apidoc %install -%make_install +%cmake_install mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %check -LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V +%ctest %ldconfig_scriptlets @@ -122,6 +123,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V %doc apidoc/* %changelog +* Thu Aug 20 2020 Morten Stevens - 2.16.7-4 +- Switch to cmake_build, cmake_install and ctest +- FTBFS in Fedora rawhide/f33 (#1864124) + * Sat Aug 01 2020 Fedora Release Engineering - 2.16.7-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 213a44a630e2d298dabfb163cc8a883f13bb9dd0 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 8 Sep 2020 14:29:44 +0200 Subject: [PATCH 60/80] Update to 2.16.8 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6f842db..18d5449 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /mbedtls-2.16.5-apache.tgz /mbedtls-2.16.6-apache.tgz /mbedtls-2.16.7.tar.gz +/mbedtls-2.16.8.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index ef0d471..5d619c5 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.16.7 -Release: 4%{?dist} +Version: 2.16.8 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -123,6 +123,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Tue Sep 08 2020 Morten Stevens - 2.16.8-1 +- Update to 2.16.8 + * Thu Aug 20 2020 Morten Stevens - 2.16.7-4 - Switch to cmake_build, cmake_install and ctest - FTBFS in Fedora rawhide/f33 (#1864124) diff --git a/sources b/sources index b7992e9..5689e2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.7.tar.gz) = 57374061ec8ec7cbb745aa08235d17d4566435c7ad861c0a9fdc8957e09c1ea6619f0deb8a22040fa3674d0fab58ca353879eac1388e710c81840a7ae1225b9f +SHA512 (mbedtls-2.16.8.tar.gz) = 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168 From 91692783d31d5f93bc3da39d07156938fab3269a Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 15 Oct 2020 12:20:51 +0200 Subject: [PATCH 61/80] Drop support for pkcs11 and zlib --- mbedtls.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 5d619c5..5801da7 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -15,11 +15,6 @@ BuildRequires: cmake BuildRequires: doxygen BuildRequires: graphviz BuildRequires: perl-interpreter -BuildRequires: pkcs11-helper-devel -BuildRequires: python3 -BuildRequires: zlib-devel - -Requires: pkcs11-helper # replace polarssl with mbedtls @@ -45,8 +40,6 @@ Cryptographic utilities based on %{name}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkcs11-helper-devel -Requires: zlib-devel Obsoletes: polarssl-devel < 1.3.10 Provides: polarssl-devel = %{version}-%{release} @@ -72,19 +65,15 @@ The %{name}-doc package contains documentation. %prep %autosetup -n %{name}-%{name}-%{version} -sed -i 's|//\(#define MBEDTLS_PKCS11_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h -sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h %build %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DLINK_WITH_PTHREAD=ON \ - -DUSE_PKCS11_HELPER_LIBRARY=ON \ - -DENABLE_ZLIB_SUPPORT=ON \ -DINSTALL_MBEDTLS_HEADERS=ON \ -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ -DUSE_STATIC_MBEDTLS_LIBRARY=ON @@ -123,6 +112,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Thu Oct 15 2020 Morten Stevens - 2.16.8-2 +- Drop support for pkcs11 and zlib + * Tue Sep 08 2020 Morten Stevens - 2.16.8-1 - Update to 2.16.8 From 1575d16369f6f5e340e6cccd0aac7a7f1471fb47 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 14 Dec 2020 18:38:51 +0100 Subject: [PATCH 62/80] Update to 2.6.19 --- mbedtls.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 5801da7..333399a 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.16.8 -Release: 2%{?dist} +Version: 2.16.9 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -15,6 +15,7 @@ BuildRequires: cmake BuildRequires: doxygen BuildRequires: graphviz BuildRequires: perl-interpreter +BuildRequires: python3 # replace polarssl with mbedtls @@ -63,7 +64,7 @@ BuildArch: noarch The %{name}-doc package contains documentation. %prep -%autosetup -n %{name}-%{name}-%{version} +%autosetup sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h @@ -112,6 +113,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Mon Dec 14 2020 Morten Stevens - 2.16.9-1 +- Update to 2.6.19 + * Thu Oct 15 2020 Morten Stevens - 2.16.8-2 - Drop support for pkcs11 and zlib From d6bd16c13fbec8a5b6bfa6abfdb0c8708f6f7479 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 14 Dec 2020 18:43:19 +0100 Subject: [PATCH 63/80] Update to 1.2.16 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 18d5449..6148af3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /mbedtls-2.16.6-apache.tgz /mbedtls-2.16.7.tar.gz /mbedtls-2.16.8.tar.gz +/mbedtls-2.16.9.tar.gz diff --git a/sources b/sources index 5689e2a..6d20163 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.8.tar.gz) = 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168 +SHA512 (mbedtls-2.16.9.tar.gz) = 36f39ce2a057cd626c5e3eee7eb313691f35cf973022a349e61c4f7710f8bf92f2f5f787ce173e124a64bced615388d6bcc9cc1083b7124f83c7a740fb663451 From 5998a1858459264a06c6407e484dc1a98e61312b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 21:34:27 +0000 Subject: [PATCH 64/80] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mbedtls.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mbedtls.spec b/mbedtls.spec index 333399a..2b0e104 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -10,6 +10,7 @@ License: ASL 2.0 URL: https://tls.mbed.org/ Source0: https://tls.mbed.org/download/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: doxygen From 00bcbd76c741e5e5f691a4fd622ddf375d18c3aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:30:43 +0000 Subject: [PATCH 65/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 2b0e104..e1ba057 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -114,6 +114,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.16.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Morten Stevens - 2.16.9-1 - Update to 2.6.19 From 8fc27205df14e2a9add5d4647ced459bfe82b02a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:00:14 +0000 Subject: [PATCH 66/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index e1ba057..aba6f77 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -114,6 +114,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.16.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.16.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 47a43733954c095b0ba77600b5773849caa96f1f Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 24 Jul 2021 20:40:20 +0200 Subject: [PATCH 67/80] Update to 2.16.11 --- .gitignore | 1 + mbedtls.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6148af3..ac54e8c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /mbedtls-2.16.7.tar.gz /mbedtls-2.16.8.tar.gz /mbedtls-2.16.9.tar.gz +/mbedtls-2.16.11.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index aba6f77..3b4b4eb 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.16.9 -Release: 3%{?dist} +Version: 2.16.11 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -65,7 +65,7 @@ BuildArch: noarch The %{name}-doc package contains documentation. %prep -%autosetup +%autosetup -n mbedtls-mbedtls-2.16.11 sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h @@ -114,6 +114,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Sat Jul 24 2021 Morten Stevens - 2.16.11-1 +- Update to 2.16.11 + * Thu Jul 22 2021 Fedora Release Engineering - 2.16.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -121,7 +124,7 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Mon Dec 14 2020 Morten Stevens - 2.16.9-1 -- Update to 2.6.19 +- Update to 2.16.9 * Thu Oct 15 2020 Morten Stevens - 2.16.8-2 - Drop support for pkcs11 and zlib diff --git a/sources b/sources index 6d20163..72eb67c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.9.tar.gz) = 36f39ce2a057cd626c5e3eee7eb313691f35cf973022a349e61c4f7710f8bf92f2f5f787ce173e124a64bced615388d6bcc9cc1083b7124f83c7a740fb663451 +SHA512 (mbedtls-2.16.11.tar.gz) = b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee From 91c53a541e2a9763b974b382c93544a4f61fca09 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 1 Jan 2022 19:06:36 +0100 Subject: [PATCH 68/80] Update to 2.16.12 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ac54e8c..e63cb43 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /mbedtls-2.16.8.tar.gz /mbedtls-2.16.9.tar.gz /mbedtls-2.16.11.tar.gz +/mbedtls-2.16.12.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index 3b4b4eb..b5e59b1 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,7 +3,7 @@ %endif Name: mbedtls -Version: 2.16.11 +Version: 2.16.12 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 @@ -65,7 +65,7 @@ BuildArch: noarch The %{name}-doc package contains documentation. %prep -%autosetup -n mbedtls-mbedtls-2.16.11 +%autosetup sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h @@ -114,6 +114,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Sat Jan 01 2022 Morten Stevens - 2.16.12-1 +- Update to 2.16.12 + * Sat Jul 24 2021 Morten Stevens - 2.16.11-1 - Update to 2.16.11 diff --git a/sources b/sources index 72eb67c..14688e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.11.tar.gz) = b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee +SHA512 (mbedtls-2.16.12.tar.gz) = 8d96d8cd906cc0999134320e4e1f550631426d166eab5da6e65469ee7286093810fcc6ac4bd5500ee55972d159f8bef7f9e53245f7f0eec72f72c35265b4313b From 9dc03e99329633eb03ea667ff11408d82506252c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:56:32 +0000 Subject: [PATCH 69/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index b5e59b1..dfc52e7 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.16.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -114,6 +114,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %doc apidoc/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.16.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 01 2022 Morten Stevens - 2.16.12-1 - Update to 2.16.12 From 0d876d9f877295b9fb8aeb50d3b32d1a6d1b9a83 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 22 Jan 2022 12:49:24 +0100 Subject: [PATCH 70/80] Update to 2.28.0 --- .gitignore | 1 + mbedtls.spec | 53 +++++++++++++++++++--------------------------------- sources | 2 +- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index e63cb43..764c6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /mbedtls-2.16.9.tar.gz /mbedtls-2.16.11.tar.gz /mbedtls-2.16.12.tar.gz +/mbedtls-2.28.0.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index dfc52e7..725cbd8 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -2,9 +2,13 @@ %global _docdir_fmt %{name} %endif +%if 0%{?fedora} || 0%{?rhel} +%global debug_package %{nil} +%endif + Name: mbedtls -Version: 2.16.12 -Release: 2%{?dist} +Version: 2.28.0 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -18,10 +22,8 @@ BuildRequires: graphviz BuildRequires: perl-interpreter BuildRequires: python3 -# replace polarssl with mbedtls - -Obsoletes: polarssl < 1.3.10 -Provides: polarssl = %{version}-%{release} +Obsoletes: mbedtls-utils < 2.28.0-0 +Obsoletes: mbedtls-static < 2.28.0-0 %description Mbed TLS is a light-weight open source cryptographic and SSL/TLS @@ -30,15 +32,6 @@ cryptographic and SSL/TLS capabilities in their (embedded) applications with as little hassle as possible. FOSS License Exception: https://tls.mbed.org/foss-license-exception -%package utils -Summary: Utilities for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: polarssl-utils < 1.3.10 -Provides: polarssl-utils = %{version}-%{release} - -%description utils -Cryptographic utilities based on %{name}. - %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -49,14 +42,6 @@ Provides: polarssl-devel = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package static -Summary: Static files for %{name} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description static -The %{name}-static package contains static files for -developing applications that use %{name}. - %package doc Summary: Documentation files for %{name} BuildArch: noarch @@ -72,13 +57,17 @@ sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h %build +export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" +export CXXLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DLINK_WITH_PTHREAD=ON \ -DINSTALL_MBEDTLS_HEADERS=ON \ + -DENABLE_PROGRAMS=OFF \ -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ - -DUSE_STATIC_MBEDTLS_LIBRARY=ON + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF \ + -DGEN_FILES=OFF %cmake_build make apidoc @@ -86,11 +75,8 @@ make apidoc %install %cmake_install -mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls - %check -%ctest +%ctest --output-on-failure --force-new-ctest-process --parallel 1 %ldconfig_scriptlets @@ -100,20 +86,19 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls %license LICENSE %{_libdir}/*.so.* -%files utils -%{_libexecdir}/%{name}/ - %files devel %{_includedir}/mbedtls/ +%{_includedir}/psa/ %{_libdir}/*.so -%files static -%{_libdir}/*.a - %files doc %doc apidoc/* %changelog +* Sat Jan 22 2022 Morten Stevens - 2.28.0-1 +- Update to 2.28.0 +- Dropped support for utils and static subpackage + * Thu Jan 20 2022 Fedora Release Engineering - 2.16.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 14688e8..701a8dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.16.12.tar.gz) = 8d96d8cd906cc0999134320e4e1f550631426d166eab5da6e65469ee7286093810fcc6ac4bd5500ee55972d159f8bef7f9e53245f7f0eec72f72c35265b4313b +SHA512 (mbedtls-2.28.0.tar.gz) = 907867edf532ba3b099f4fb7ce31f5773ceceb072a8d067b1d830e879d541f92f401d64f13bbe6b4eb0845e58bb765d7d28896be414bb0fc7ac5b3876066be5f From 4aeb276c65dcdb01c0da2d54b2012c63d4d0f138 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 31 Jan 2022 00:00:25 +0100 Subject: [PATCH 71/80] Ensure ELF binary dependency generation and -debug{info,source} packages --- mbedtls.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 725cbd8..01ff4c7 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -2,10 +2,6 @@ %global _docdir_fmt %{name} %endif -%if 0%{?fedora} || 0%{?rhel} -%global debug_package %{nil} -%endif - Name: mbedtls Version: 2.28.0 Release: 1%{?dist} @@ -75,6 +71,12 @@ make apidoc %install %cmake_install +# Library files aren't supposed to be executable, but RPM requires this historically +# for automatic per-file level automatic dependency generation at ELF binaries; see: +# - https://github.com/ARMmbed/mbedtls/commit/280165c9b39091c7c7ffe031430c7cf93ebc4dec +# - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PDD6RNQMII472HXM4XAUUWWZKKBGHPTO/ +chmod 755 %{buildroot}%{_libdir}/*.so.* + %check %ctest --output-on-failure --force-new-ctest-process --parallel 1 From c277ac3b9edbf8159ce3c22f638c6488e5d64d1e Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 31 Jan 2022 15:01:06 +0100 Subject: [PATCH 72/80] Update to 2.28.0-2 --- mbedtls.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index 01ff4c7..a843aff 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.28.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -18,8 +18,8 @@ BuildRequires: graphviz BuildRequires: perl-interpreter BuildRequires: python3 -Obsoletes: mbedtls-utils < 2.28.0-0 -Obsoletes: mbedtls-static < 2.28.0-0 +Obsoletes: mbedtls-utils < 2.28.0-1 +Obsoletes: mbedtls-static < 2.28.0-1 %description Mbed TLS is a light-weight open source cryptographic and SSL/TLS @@ -31,8 +31,6 @@ FOSS License Exception: https://tls.mbed.org/foss-license-exception %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: polarssl-devel < 1.3.10 -Provides: polarssl-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -97,6 +95,10 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Mon Jan 31 2022 Morten Stevens - 2.28.0-2 +- Ensure ELF binary dependency generation and -debug{info,source} packages +- Remove deprecated PolarSSL dependency + * Sat Jan 22 2022 Morten Stevens - 2.28.0-1 - Update to 2.28.0 - Dropped support for utils and static subpackage From cb2f8d565b5b7d1093471e577a1467a66c7fbc11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:46:17 +0000 Subject: [PATCH 73/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index a843aff..9ac2097 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.28.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -95,6 +95,9 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.28.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jan 31 2022 Morten Stevens - 2.28.0-2 - Ensure ELF binary dependency generation and -debug{info,source} packages - Remove deprecated PolarSSL dependency From 817d432422ebf9bab4dda39b4e70392566dced52 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sat, 22 Oct 2022 22:45:09 +0200 Subject: [PATCH 74/80] Update to 2.28.1 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 764c6fb..bb7bc0e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /mbedtls-2.16.11.tar.gz /mbedtls-2.16.12.tar.gz /mbedtls-2.28.0.tar.gz +/mbedtls-2.28.1.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index 9ac2097..b92e23c 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.28.0 -Release: 3%{?dist} +Version: 2.28.1 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: ASL 2.0 URL: https://tls.mbed.org/ @@ -95,6 +95,9 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Sat Oct 22 2022 Morten Stevens - 2.28.1-1 +- Update to 2.28.1 + * Thu Jul 21 2022 Fedora Release Engineering - 2.28.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 701a8dd..a2bb94e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.28.0.tar.gz) = 907867edf532ba3b099f4fb7ce31f5773ceceb072a8d067b1d830e879d541f92f401d64f13bbe6b4eb0845e58bb765d7d28896be414bb0fc7ac5b3876066be5f +SHA512 (mbedtls-2.28.1.tar.gz) = b71d052acfb83daff11e0182f32b0ad0af7c59d2b74bd19f270531a3da9ed3ce1d3adcaf756e161bf05a10fe1b6b7753e360e9dbb5b7b123f09201b1202ef689 From 6e16a127b8e2aef546c721f2238b6c069b561518 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Fri, 16 Dec 2022 12:12:41 +0000 Subject: [PATCH 75/80] Update version and urls --- mbedtls.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mbedtls.spec b/mbedtls.spec index b92e23c..494ab3c 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,12 +3,12 @@ %endif Name: mbedtls -Version: 2.28.1 +Version: 2.28.2 Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library -License: ASL 2.0 -URL: https://tls.mbed.org/ -Source0: https://tls.mbed.org/download/%{name}-%{version}.tar.gz +License: Apache-2.0 +URL: https://www.trustedfirmware.org/projects/mbed-tls +Source0: https://github.com/Mbed-TLS/%{name}/archive/refs/tags/v%{version}.tar.gz BuildRequires: make BuildRequires: gcc-c++ @@ -95,6 +95,10 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Fri Dec 16 2022 Benson Muite - 2.28.2-1 +- Update to 2.28.2 +- Update URLs + * Sat Oct 22 2022 Morten Stevens - 2.28.1-1 - Update to 2.28.1 From a8c20000ad6e633a0c62b2467f6832a1545836dc Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 4 Jan 2023 12:14:27 +0100 Subject: [PATCH 76/80] Update to 2.28.2 --- .gitignore | 1 + mbedtls.spec | 1 - sources | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bb7bc0e..34e6f18 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /mbedtls-2.16.12.tar.gz /mbedtls-2.28.0.tar.gz /mbedtls-2.28.1.tar.gz +/v2.28.2.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index 494ab3c..54ac011 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -26,7 +26,6 @@ Mbed TLS is a light-weight open source cryptographic and SSL/TLS library written in C. Mbed TLS makes it easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) applications with as little hassle as possible. -FOSS License Exception: https://tls.mbed.org/foss-license-exception %package devel Summary: Development files for %{name} diff --git a/sources b/sources index a2bb94e..f798719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mbedtls-2.28.1.tar.gz) = b71d052acfb83daff11e0182f32b0ad0af7c59d2b74bd19f270531a3da9ed3ce1d3adcaf756e161bf05a10fe1b6b7753e360e9dbb5b7b123f09201b1202ef689 +SHA512 (v2.28.2.tar.gz) = 93cdb44f764b200131b8dbefb9363e5fa38760eaf01473a512f93673cc55db3515830e16b813e03b39cb819323ad78cee4cb7f3fa85861ec5e72e0f89541c7fc From 3068b0817c84486694dec4e04a6933eb6f53c282 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:13:10 +0000 Subject: [PATCH 77/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 54ac011..636cffa 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.28.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: Apache-2.0 URL: https://www.trustedfirmware.org/projects/mbed-tls @@ -94,6 +94,9 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.28.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 16 2022 Benson Muite - 2.28.2-1 - Update to 2.28.2 - Update URLs From 446b3327cab677b6f57a073511e34232be8dfdac Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 30 Mar 2023 18:21:39 +0200 Subject: [PATCH 78/80] Update to 2.28.3 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 34e6f18..0778788 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /mbedtls-2.28.0.tar.gz /mbedtls-2.28.1.tar.gz /v2.28.2.tar.gz +/v2.28.3.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index 636cffa..1126b7d 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.28.2 -Release: 2%{?dist} +Version: 2.28.3 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: Apache-2.0 URL: https://www.trustedfirmware.org/projects/mbed-tls @@ -94,6 +94,9 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Thu Mar 30 2023 Morten Stevens - 2.28.3-1 +- Update to 2.28.3 + * Thu Jan 19 2023 Fedora Release Engineering - 2.28.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index f798719..e043fb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.28.2.tar.gz) = 93cdb44f764b200131b8dbefb9363e5fa38760eaf01473a512f93673cc55db3515830e16b813e03b39cb819323ad78cee4cb7f3fa85861ec5e72e0f89541c7fc +SHA512 (v2.28.3.tar.gz) = e2de0260341c7e2be7f1dcc2bde48b2287272528de3a9e7d7b4c8468b74a6530d4e84b2a4e959dff46169c34d70c908ec58b33f67db151129d5a3c0c6b34b297 From 678a66473b1234047298d09716188bcd4930ded8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 14:04:19 +0000 Subject: [PATCH 79/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mbedtls.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mbedtls.spec b/mbedtls.spec index 1126b7d..e3d6a90 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -4,7 +4,7 @@ Name: mbedtls Version: 2.28.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: Apache-2.0 URL: https://www.trustedfirmware.org/projects/mbed-tls @@ -94,6 +94,9 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.28.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 30 2023 Morten Stevens - 2.28.3-1 - Update to 2.28.3 From 8205a6c157188d3cba7c1dd5be2c046b4fb1111b Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 8 Aug 2023 14:30:30 +0200 Subject: [PATCH 80/80] Update to 2.28.4 --- .gitignore | 1 + mbedtls.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0778788..faa5049 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /mbedtls-2.28.1.tar.gz /v2.28.2.tar.gz /v2.28.3.tar.gz +/v2.28.4.tar.gz diff --git a/mbedtls.spec b/mbedtls.spec index e3d6a90..8c2a211 100644 --- a/mbedtls.spec +++ b/mbedtls.spec @@ -3,8 +3,8 @@ %endif Name: mbedtls -Version: 2.28.3 -Release: 2%{?dist} +Version: 2.28.4 +Release: 1%{?dist} Summary: Light-weight cryptographic and SSL/TLS library License: Apache-2.0 URL: https://www.trustedfirmware.org/projects/mbed-tls @@ -94,6 +94,9 @@ chmod 755 %{buildroot}%{_libdir}/*.so.* %doc apidoc/* %changelog +* Tue Aug 08 2023 Morten Stevens - 2.28.4-1 +- Update to 2.28.4 + * Thu Jul 20 2023 Fedora Release Engineering - 2.28.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index e043fb5..330bbdc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.28.3.tar.gz) = e2de0260341c7e2be7f1dcc2bde48b2287272528de3a9e7d7b4c8468b74a6530d4e84b2a4e959dff46169c34d70c908ec58b33f67db151129d5a3c0c6b34b297 +SHA512 (v2.28.4.tar.gz) = 15eaf58199af10c7ece0a6073bb01a086704e0651551a6106714a0b7e59dc60d5a9e2416fb00d12b8bca7a0c14ad28fc05148eaefd73c4d6c2a0f871c0637405