From 92f7c522e4734ffc3949144b4f5d6ba7dd7c1a54 Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens@fedoraproject.org>
Date: Tue, 6 Feb 2018 15:39:13 +0100
Subject: [PATCH] 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 <mstevens@fedoraproject.org> - 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 <mstevens@fedoraproject.org> - 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