Ports: Update mbedtls' patches to use git patches

5 files changed, 74 insertions, 34 deletions

diff --git a/Ports/mbedtls/patches/0001-Add-missing-includes.patch b/Ports/mbedtls/patches/0001-Add-missing-includes.patch
new file mode 100644
index 0000000000..0170807c4b
--- /dev/null
+++ b/Ports/mbedtls/patches/0001-Add-missing-includes.patch
@@ -0,0 +1,37 @@
+From 4f2b20f26ae7ba1f77fa69808f6d4dc926249c0b Mon Sep 17 00:00:00 2001
+From: Larkin <45925460+larb0b@users.noreply.github.com>
+Date: Tue, 24 Sep 2019 02:56:39 -0400
+Subject: [PATCH 1/2] Add missing includes
+
+---
+ library/ssl_tls.c  | 1 +
+ library/x509_crt.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/library/ssl_tls.c b/library/ssl_tls.c
+index 38690fa..5791783 100644
+--- a/library/ssl_tls.c
++++ b/library/ssl_tls.c
+@@ -49,6 +49,7 @@
+ #include "mbedtls/platform_util.h"
+ 
+ #include <string.h>
++#include <stdint.h>
+ 
+ #if defined(MBEDTLS_X509_CRT_PARSE_C)
+ #include "mbedtls/oid.h"
+diff --git a/library/x509_crt.c b/library/x509_crt.c
+index 97e1d72..9f81247 100644
+--- a/library/x509_crt.c
++++ b/library/x509_crt.c
+@@ -75,6 +75,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <unistd.h>
+ #endif /* !_WIN32 || EFIX64 || EFI32 */
+ #endif
+ 
+-- 
+2.36.1
+
diff --git a/Ports/mbedtls/patches/0002-Remove-NET_C-from-config.patch b/Ports/mbedtls/patches/0002-Remove-NET_C-from-config.patch
new file mode 100644
index 0000000000..dee1032e8d
--- /dev/null
+++ b/Ports/mbedtls/patches/0002-Remove-NET_C-from-config.patch
@@ -0,0 +1,25 @@
+From e889bf88c3eb76ab6646f2e99fb029b63dac7379 Mon Sep 17 00:00:00 2001
+From: Larkin <45925460+larb0b@users.noreply.github.com>
+Date: Tue, 24 Sep 2019 02:56:39 -0400
+Subject: [PATCH 2/2] Remove NET_C from config
+
+---
+ include/mbedtls/config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
+index 654f972..5b37f1f 100644
+--- a/include/mbedtls/config.h
++++ b/include/mbedtls/config.h
+@@ -2460,7 +2460,7 @@
+  *
+  * This module provides networking routines.
+  */
+-#define MBEDTLS_NET_C
++//#define MBEDTLS_NET_C
+ 
+ /**
+  * \def MBEDTLS_OID_C
+-- 
+2.36.1
+
diff --git a/Ports/mbedtls/patches/ReadMe.md b/Ports/mbedtls/patches/ReadMe.md
new file mode 100644
index 0000000000..f91fa3aae2
--- /dev/null
+++ b/Ports/mbedtls/patches/ReadMe.md
@@ -0,0 +1,12 @@
+# Patches for mbedtls on SerenityOS
+
+## `0001-Add-missing-includes.patch`
+
+Add missing includes
+
+
+## `0002-Remove-NET_C-from-config.patch`
+
+Remove NET_C from config
+
+
diff --git a/Ports/mbedtls/patches/add-missing-includes.patch b/Ports/mbedtls/patches/add-missing-includes.patch
deleted file mode 100644
index 70918bc2a8..0000000000
--- a/Ports/mbedtls/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r mbedtls/library/ssl_tls.c mbedtls-patched/library/ssl_tls.c
---- mbedtls/library/ssl_tls.c	2019-06-18 23:23:28.000000000 +1000
-+++ mbedtls-patched/library/ssl_tls.c	2019-08-05 00:36:37.049255960 +1000
-@@ -49,6 +49,7 @@
- #include "mbedtls/platform_util.h"
- 
- #include <string.h>
-+#include <stdint.h>
- 
- #if defined(MBEDTLS_X509_CRT_PARSE_C)
- #include "mbedtls/oid.h"
-diff -u -r mbedtls/library/x509_crt.c mbedtls-patched/library/x509_crt.c
---- mbedtls/library/x509_crt.c	2019-06-18 23:23:28.000000000 +1000
-+++ mbedtls-patched/library/x509_crt.c	2019-08-05 00:24:22.606023827 +1000
-@@ -75,6 +75,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <unistd.h>
- #endif /* !_WIN32 || EFIX64 || EFI32 */
- #endif
- 
diff --git a/Ports/mbedtls/patches/remove-net-from-config.patch b/Ports/mbedtls/patches/remove-net-from-config.patch
deleted file mode 100644
index 15a225e09b..0000000000
--- a/Ports/mbedtls/patches/remove-net-from-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r mbedtls/include/mbedtls/config.h mbedtls-patched/include/mbedtls/config.h
---- mbedtls/include/mbedtls/config.h	2019-06-18 23:23:28.000000000 +1000
-+++ mbedtls-patched/include/mbedtls/config.h	2019-08-05 00:27:17.322830039 +1000
-@@ -2460,7 +2460,7 @@
-  *
-  * This module provides networking routines.
-  */
--#define MBEDTLS_NET_C
-+//#define MBEDTLS_NET_C
- 
- /**
-  * \def MBEDTLS_OID_C