.gitignore

@@ -38,6 +38,3 @@
 /mbedtls-2.28.5.tar.gz
 /mbedtls-2.28.7.tar.gz
 /mbedtls-2.28.8.tar.bz2
-/mbedtls-3.6.0.tar.bz2
-/mbedtls-3.6.1.tar.bz2
-/mbedtls-3.6.2.tar.bz2

mbedtls-gcc14.patch

@@ -1,27 +0,0 @@
-diff --git a/library/common.h b/library/common.h
-index 3936ffdfe..d8c407319 100644
---- a/library/common.h
-+++ b/library/common.h
-@@ -192,21 +192,21 @@ static inline void mbedtls_xor(unsigned char *r,
- #if defined(MBEDTLS_EFFICIENT_UNALIGNED_ACCESS)
- #if defined(MBEDTLS_HAVE_NEON_INTRINSICS) && \
-     (!(defined(MBEDTLS_COMPILER_IS_GCC) && MBEDTLS_GCC_VERSION < 70300))
-     /* Old GCC versions generate a warning here, so disable the NEON path for these compilers */
-     for (; (i + 16) <= n; i += 16) {
-         uint8x16_t v1 = vld1q_u8(a + i);
-         uint8x16_t v2 = vld1q_u8(b + i);
-         uint8x16_t x = veorq_u8(v1, v2);
-         vst1q_u8(r + i, x);
-     }
--#if defined(__IAR_SYSTEMS_ICC__)
-+#if defined(__IAR_SYSTEMS_ICC__) || defined(MBEDTLS_COMPILER_IS_GCC)
-     /* This if statement helps some compilers (e.g., IAR) optimise out the byte-by-byte tail case
-      * where n is a constant multiple of 16.
-      * For other compilers (e.g. recent gcc and clang) it makes no difference if n is a compile-time
-      * constant, and is a very small perf regression if n is not a compile-time constant. */
-     if (n % 16 == 0) {
-         return;
-     }
- #endif
- #elif defined(MBEDTLS_ARCH_IS_X64) || defined(MBEDTLS_ARCH_IS_ARM64)
-     /* This codepath probably only makes sense on architectures with 64-bit registers */

mbedtls.spec

@@ -3,13 +3,12 @@
 %endif
 
 Name: mbedtls
-Version: 3.6.2
+Version: 2.28.8
 Release: 1%{?dist}
 Summary: Light-weight cryptographic and SSL/TLS library
 License: Apache-2.0
 URL: https://www.trustedfirmware.org/projects/mbed-tls
 Source0: https://github.com/Mbed-TLS/%{name}/archive/refs/tags/%{name}-%{version}.tar.bz2
-Patch0: mbedtls-gcc14.patch
 
 BuildRequires: make
 BuildRequires: gcc-c++
@@ -44,10 +43,10 @@ BuildArch:      noarch
 The %{name}-doc package contains documentation.
 
 %prep
-%autosetup -p1
+%autosetup
 
-sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/mbedtls_config.h
-sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/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
 
 %build
 export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized"
@@ -60,7 +59,8 @@ export CXXLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized"
 	-DENABLE_PROGRAMS=OFF \
 	-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
 	-DUSE_STATIC_MBEDTLS_LIBRARY=OFF \
-	-DGEN_FILES=OFF
+	-DGEN_FILES=OFF \
+	-DENABLE_TESTING=Off
 
 %cmake_build
 make apidoc
@@ -74,8 +74,8 @@ make apidoc
 # - 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
+# %check
+# %ctest --output-on-failure --force-new-ctest-process --parallel 1
 
 %ldconfig_scriptlets
 
@@ -89,7 +89,6 @@ chmod 755 %{buildroot}%{_libdir}/*.so.*
 %{_includedir}/mbedtls/
 %{_includedir}/psa/
 %{_includedir}/everest/
-%{_libdir}/cmake/MbedTLS/
 %{_libdir}/pkgconfig/
 %{_libdir}/*.so
 
@@ -97,18 +96,6 @@ chmod 755 %{buildroot}%{_libdir}/*.so.*
 %doc apidoc/*
 
 %changelog
-* Tue Oct 15 2024 Morten Stevens <mstevens@fedoraproject.org> - 3.6.2-1
-- Update to 3.6.2
-
-* Tue Sep 03 2024 Morten Stevens <mstevens@fedoraproject.org> - 3.6.1-1
-- Update to 3.6.1
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue May 14 2024 Morten Stevens <mstevens@fedoraproject.org> - 3.6.0-1
-- Update to 3.6.0
-
 * Mon Apr 01 2024 Morten Stevens <mstevens@fedoraproject.org> - 2.28.8-1
 - Update to 2.28.8
 

sources

@@ -1 +1 @@
-SHA512 (mbedtls-3.6.2.tar.bz2) = 7ab3b1ec179681949e1b0d171e04f75a605ae9ed8177cf3f6f27c401efca4aff930437ecc425c9a994d36f50ddd6f0f0dd7feeb42251128ac875b4c57fe3811b
+SHA512 (mbedtls-2.28.8.tar.bz2) = c8e91ec50ab2caf1f33e907279dc30fca2a8cd97e6e531be857149589e52aeffb95b445b2a9fa674886f0071f446381da3bb8107f7e850f3390128b069ac9ea7