From 04d59a4fd56903fb1b5e25b28a16efe13437b0e1 Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 16:11:09 +0300
Subject: [PATCH 01/16] Add modules basename, sort, expr

---
 src/busybox/.config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/busybox/.config b/src/busybox/.config
index 2758635..a6dae7c 100644
--- a/src/busybox/.config
+++ b/src/busybox/.config
@@ -192,7 +192,7 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 #
 # Coreutils
 #
-# CONFIG_BASENAME is not set
+CONFIG_BASENAME=y
 CONFIG_CAT=y
 CONFIG_FEATURE_CATN=y
 CONFIG_FEATURE_CATV=y
@@ -227,7 +227,7 @@ CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
 # CONFIG_EXPAND is not set
 # CONFIG_UNEXPAND is not set
-# CONFIG_EXPR is not set
+CONFIG_EXPR=y
 # CONFIG_EXPR_MATH_SUPPORT_64 is not set
 # CONFIG_FACTOR is not set
 # CONFIG_FALSE is not set
@@ -288,9 +288,9 @@ CONFIG_RMDIR=y
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
-# CONFIG_SORT is not set
+CONFIG_SORT=y
 # CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
+CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY=y
 # CONFIG_SPLIT is not set
 # CONFIG_FEATURE_SPLIT_FANCY is not set
 # CONFIG_STAT is not set

From 0006b36870d476e770b406549a732d9387defd30 Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 16:28:34 +0300
Subject: [PATCH 02/16] Create compile.curl

---
 src/curl/compile.curl | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/curl/compile.curl

diff --git a/src/curl/compile.curl b/src/curl/compile.curl
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/curl/compile.curl
@@ -0,0 +1 @@
+

From dd68998d4476b295db48d9e9958febb584859609 Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 16:46:18 +0300
Subject: [PATCH 03/16] Add curl

---
 src/curl/compile.curl |  9 +++++++++
 src/curl/init.curl    | 27 +++++++++++++++++++++++++++
 src/curl/install.curl |  8 ++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 src/curl/init.curl
 create mode 100644 src/curl/install.curl

diff --git a/src/curl/compile.curl b/src/curl/compile.curl
index 8b13789..9e53846 100644
--- a/src/curl/compile.curl
+++ b/src/curl/compile.curl
@@ -1 +1,10 @@
+#!/bin/bash
 
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+cd curl || exit 1
+
+make clean
+make -j$(nproc) || exit 1
+make install
diff --git a/src/curl/init.curl b/src/curl/init.curl
new file mode 100644
index 0000000..169618e
--- /dev/null
+++ b/src/curl/init.curl
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+rm -rf ./_install
+
+cd curl || exit 1
+git reset --hard || exit 1
+
+./buildconf || exit 1
+./configure CC=arm-hisiv300-linux-gcc \
+    --prefix=$SCRIPT_DIR/_install \
+    USER_CFLAGS="-march=armv5te -mcpu=arm926ej-s -I/opt/hisi-linux/x86-arm/arm-hisiv300-linux/target/usr/include -L/opt/hisi-linux/x86-arm/arm-hisiv300-linux/target/usr/lib" \
+    AR=arm-hisiv300-linux-ar \
+    RANLIB=arm-hisiv300-linux-ranlib \
+    --host=arm \
+    --disable-shared \
+    --disable-libcurl-option \
+    --disable-dict \
+    --disable-tftp \
+    --disable-pop3 \
+    --disable-imap \
+    --disable-gopher \
+    --disable-ipv6 \
+    --disable-manual \
+    || exit 1
diff --git a/src/curl/install.curl b/src/curl/install.curl
new file mode 100644
index 0000000..457380f
--- /dev/null
+++ b/src/curl/install.curl
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+mkdir -p ../../build/home/yi-hack-v4/sbin/
+
+rsync -a ./_install/sbin/curl ../../build/home/yi-hack-v4/sbin/

From 66c9251be6cb8c6a85523d0ca9fa2ee4cb7ae041 Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 16:54:15 +0300
Subject: [PATCH 04/16] Add files via upload

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index d1c0b60..d1ec2a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "src/mqtt/mqttv4"]
 	path = src/mqtt/mqttv4
 	url = https://github.com/TheCrypt0/mqttv4.git
+[submodule "src/curl/curl"]
+	path = src/curl/curl
+	url = https://github.com/curl/curl.git

From a66f6c7a835de91422b0642a04a2843f926cf3e0 Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 16:58:18 +0300
Subject: [PATCH 05/16] Create readme

---
 src/curl/curl/readme | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/curl/curl/readme

diff --git a/src/curl/curl/readme b/src/curl/curl/readme
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/curl/curl/readme
@@ -0,0 +1 @@
+

From d0dea4982bd21ee75ae3383b9b2f3f3e1647a568 Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 17:06:06 +0300
Subject: [PATCH 06/16] Delete readme

---
 src/curl/curl/readme | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/curl/curl/readme

diff --git a/src/curl/curl/readme b/src/curl/curl/readme
deleted file mode 100644
index 8b13789..0000000
--- a/src/curl/curl/readme
+++ /dev/null
@@ -1 +0,0 @@
-

From 39faaaa36e2ac80bd43ea318986ea5fcc5b5193e Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Mon, 13 May 2019 17:34:01 +0300
Subject: [PATCH 07/16] [Add] Added curl to gitmodules

---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index d1ec2a4..44ad5c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,4 @@
 [submodule "src/curl/curl"]
 	path = src/curl/curl
 	url = https://github.com/curl/curl.git
+	

From d8f8189b36a5e6fea72e572e0db1bab4489dfcdb Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Thu, 16 May 2019 09:16:40 +0300
Subject: [PATCH 08/16] Update init.curl

---
 src/curl/init.curl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/curl/init.curl b/src/curl/init.curl
index 169618e..3793b92 100644
--- a/src/curl/init.curl
+++ b/src/curl/init.curl
@@ -24,4 +24,7 @@ git reset --hard || exit 1
     --disable-gopher \
     --disable-ipv6 \
     --disable-manual \
+    --disable-smtp \
+    --disable-telnet \
+    --disable-rtsp \
     || exit 1

From ea9e141ee3e089730107acad4ad9270538624abd Mon Sep 17 00:00:00 2001
From: avengermsoft <avenger_msoft@mail.ru>
Date: Fri, 17 May 2019 11:00:49 +0300
Subject: [PATCH 09/16] Update install.curl

---
 src/curl/install.curl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/curl/install.curl b/src/curl/install.curl
index 457380f..058d533 100644
--- a/src/curl/install.curl
+++ b/src/curl/install.curl
@@ -3,6 +3,6 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
-mkdir -p ../../build/home/yi-hack-v4/sbin/
+mkdir -p ../../build/home/yi-hack-v4/bin/
 
-rsync -a ./_install/sbin/curl ../../build/home/yi-hack-v4/sbin/
+rsync -a ./_install/bin/curl ../../build/home/yi-hack-v4/bin/

From c612d2c44b7787037d806902dbd430e8704641a1 Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Sun, 13 Oct 2019 00:44:39 +0300
Subject: [PATCH 10/16] Add BusyBox modules (wc, stat, egrep), add cURL with
 SSL

---
 .gitmodules      | 3 +++
 src/curl/curl    | 1 +
 src/curl/mbedtls | 1 +
 3 files changed, 5 insertions(+)
 create mode 160000 src/curl/curl
 create mode 160000 src/curl/mbedtls

diff --git a/.gitmodules b/.gitmodules
index 44ad5c8..adffcde 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,3 +29,6 @@
 	path = src/curl/curl
 	url = https://github.com/curl/curl.git
 	
+[submodule "src/curl/mbedtls"]
+	path = src/curl/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/src/curl/curl b/src/curl/curl
new file mode 160000
index 0000000..e80b5c8
--- /dev/null
+++ b/src/curl/curl
@@ -0,0 +1 @@
+Subproject commit e80b5c801652bdd8aa302345954c3ef8050d039a
diff --git a/src/curl/mbedtls b/src/curl/mbedtls
new file mode 160000
index 0000000..0d50d41
--- /dev/null
+++ b/src/curl/mbedtls
@@ -0,0 +1 @@
+Subproject commit 0d50d41c92d853a9aa61a66ff457ba684f80b641

From 03b7db12a75f21a31c369d719adcada87bf54c21 Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Sun, 13 Oct 2019 01:30:31 +0300
Subject: [PATCH 11/16] Add BusyBox modules (wc, stat, egrep), add cURL with
 SSL

---
 .gitmodules               |  1 -
 src/busybox/.config       |  6 ++---
 src/curl/compile.curl     |  5 ++++
 src/curl/init.curl        | 31 +++++++++++++++++-----
 src/curl/install.curl     |  1 +
 src/curl/mbedtls-config.h | 56 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 90 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 src/curl/compile.curl
 mode change 100644 => 100755 src/curl/init.curl
 mode change 100644 => 100755 src/curl/install.curl
 create mode 100644 src/curl/mbedtls-config.h

diff --git a/.gitmodules b/.gitmodules
index adffcde..a275c55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,7 +28,6 @@
 [submodule "src/curl/curl"]
 	path = src/curl/curl
 	url = https://github.com/curl/curl.git
-	
 [submodule "src/curl/mbedtls"]
 	path = src/curl/mbedtls
 	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/src/busybox/.config b/src/busybox/.config
index a6dae7c..3b0325e 100644
--- a/src/busybox/.config
+++ b/src/busybox/.config
@@ -293,7 +293,7 @@ CONFIG_SORT=y
 CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY=y
 # CONFIG_SPLIT is not set
 # CONFIG_FEATURE_SPLIT_FANCY is not set
-# CONFIG_STAT is not set
+CONFIG_STAT=y
 # CONFIG_FEATURE_STAT_FORMAT is not set
 # CONFIG_FEATURE_STAT_FILESYSTEM is not set
 # CONFIG_STTY is not set
@@ -328,7 +328,7 @@ CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
 CONFIG_BASE64=y
 # CONFIG_UUENCODE is not set
-# CONFIG_WC is not set
+CONFIG_WC=y
 # CONFIG_FEATURE_WC_LARGE is not set
 # CONFIG_WHO is not set
 # CONFIG_W is not set
@@ -457,7 +457,7 @@ CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_FEATURE_FIND_LINKS=y
 CONFIG_GREP=y
-# CONFIG_EGREP is not set
+CONFIG_EGREP=y
 # CONFIG_FGREP is not set
 CONFIG_FEATURE_GREP_CONTEXT=y
 CONFIG_XARGS=y
diff --git a/src/curl/compile.curl b/src/curl/compile.curl
old mode 100644
new mode 100755
index 9e53846..96b7911
--- a/src/curl/compile.curl
+++ b/src/curl/compile.curl
@@ -3,6 +3,11 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
+cd mbedtls || exit 1
+CFLAGS="-I$SCRIPT_DIR -DMBEDTLS_CONFIG_FILE='<mbedtls-config.h>'" make CC=arm-hisiv300-linux-gcc SHARE=1
+make install
+cd ..
+
 cd curl || exit 1
 
 make clean
diff --git a/src/curl/init.curl b/src/curl/init.curl
old mode 100644
new mode 100755
index 3793b92..5574ef8
--- a/src/curl/init.curl
+++ b/src/curl/init.curl
@@ -5,6 +5,10 @@ cd $SCRIPT_DIR
 
 rm -rf ./_install
 
+cd mbedtls || exit 1
+git reset --hard || exit 1
+cd ..
+
 cd curl || exit 1
 git reset --hard || exit 1
 
@@ -15,16 +19,31 @@ git reset --hard || exit 1
     AR=arm-hisiv300-linux-ar \
     RANLIB=arm-hisiv300-linux-ranlib \
     --host=arm \
-    --disable-shared \
-    --disable-libcurl-option \
+    --disable-curldebug \
+    --disable-debug \
     --disable-dict \
-    --disable-tftp \
-    --disable-pop3 \
-    --disable-imap \
+    --disable-file \
+    --disable-ssl \
     --disable-gopher \
+    --disable-imap \
     --disable-ipv6 \
+    --disable-ldap \
+    --disable-libcurl-option \
     --disable-manual \
+    --disable-ntlm \
+    --disable-ntlm-wb \
+    --disable-pop3 \
+    --disable-rtsp \
+    --disable-shared \
+    --disable-smb \
     --disable-smtp \
+    --disable-soname-bump \
+    --disable-sspi \
+    --disable-symbol-hiding \
     --disable-telnet \
-    --disable-rtsp \
+    --disable-tftp \
+    --disable-tls-srp \
+    --enable-http \
+    --enable-optimize \
+    --with-mbedtls=/usr/local/ \
     || exit 1
diff --git a/src/curl/install.curl b/src/curl/install.curl
old mode 100644
new mode 100755
index 058d533..d353d3f
--- a/src/curl/install.curl
+++ b/src/curl/install.curl
@@ -6,3 +6,4 @@ cd $SCRIPT_DIR
 mkdir -p ../../build/home/yi-hack-v4/bin/
 
 rsync -a ./_install/bin/curl ../../build/home/yi-hack-v4/bin/
+arm-hisiv300-linux-strip ../../build/home/yi-hack-v4/bin/curl
diff --git a/src/curl/mbedtls-config.h b/src/curl/mbedtls-config.h
new file mode 100644
index 0000000..aa791ae
--- /dev/null
+++ b/src/curl/mbedtls-config.h
@@ -0,0 +1,56 @@
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+/* System support */
+#define MBEDTLS_HAVE_ASM
+#define MBEDTLS_HAVE_TIME
+
+/* mbed TLS feature support */
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_SSL_PROTO_TLS1_1
+
+/* mbed TLS modules */
+#define MBEDTLS_AES_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_ASN1_WRITE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_DES_C
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_NET_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PK_C
+#define MBEDTLS_PK_PARSE_C
+#define MBEDTLS_PK_WRITE_C
+#define MBEDTLS_RSA_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_VERSION_C
+#define MBEDTLS_X509_CRT_PARSE_C
+#define MBEDTLS_X509_USE_C
+#define MBEDTLS_X509_CRL_PARSE_C
+#define MBEDTLS_SSL_RENEGOTIATION
+#define MBEDTLS_SSL_TICKET_C
+#define MBEDTLS_CIPHER_MODE_AEAD
+#define MBEDTLS_SSL_SESSION_TICKETS
+
+/* For test certificates */
+#define MBEDTLS_BASE64_C
+#define MBEDTLS_CERTS_C
+#define MBEDTLS_PEM_PARSE_C
+
+/* For testing with compat.sh */
+#define MBEDTLS_FS_IO
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */

From b46a03ad588a03e9ff8f02fec34b165622317292 Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Sun, 13 Oct 2019 03:01:42 +0300
Subject: [PATCH 12/16] Add BusyBox modules (wc, stat, egrep), add cURL with
 SSL

---
 src/curl/compile.curl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/curl/compile.curl b/src/curl/compile.curl
index 96b7911..f257e07 100755
--- a/src/curl/compile.curl
+++ b/src/curl/compile.curl
@@ -4,7 +4,8 @@ SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
 cd mbedtls || exit 1
-CFLAGS="-I$SCRIPT_DIR -DMBEDTLS_CONFIG_FILE='<mbedtls-config.h>'" make CC=arm-hisiv300-linux-gcc SHARE=1
+make clean
+CFLAGS="-I$SCRIPT_DIR -DMBEDTLS_CONFIG_FILE='<mbedtls-config.h>'" make -j$(nproc) CC=arm-hisiv300-linux-gcc SHARE=1 || exit 1
 make install
 cd ..
 

From 5105476cf02c876640aba9b6c1cde5553901cfde Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Sun, 13 Oct 2019 15:14:53 +0300
Subject: [PATCH 13/16] Add features to BusyBox modules

---
 src/busybox/.config | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/busybox/.config b/src/busybox/.config
index 3b0325e..8206762 100644
--- a/src/busybox/.config
+++ b/src/busybox/.config
@@ -228,7 +228,7 @@ CONFIG_ENV=y
 # CONFIG_EXPAND is not set
 # CONFIG_UNEXPAND is not set
 CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_EXPR_MATH_SUPPORT_64=y
 # CONFIG_FACTOR is not set
 # CONFIG_FALSE is not set
 # CONFIG_FOLD is not set
@@ -289,13 +289,13 @@ CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
 CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
+CONFIG_FEATURE_SORT_BIG=y
 CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY=y
 # CONFIG_SPLIT is not set
 # CONFIG_FEATURE_SPLIT_FANCY is not set
 CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_FEATURE_STAT_FILESYSTEM is not set
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_FEATURE_STAT_FILESYSTEM=y
 # CONFIG_STTY is not set
 # CONFIG_SUM is not set
 CONFIG_SYNC=y
@@ -329,7 +329,7 @@ CONFIG_USLEEP=y
 CONFIG_BASE64=y
 # CONFIG_UUENCODE is not set
 CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_FEATURE_WC_LARGE=y
 # CONFIG_WHO is not set
 # CONFIG_W is not set
 # CONFIG_USERS is not set

From 5b55801857336a0ef4d8ae5b5a48745cb232bdc1 Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Sun, 13 Oct 2019 21:13:19 +0300
Subject: [PATCH 14/16] =?UTF-8?q?=D0=A1hanging=20compilation=20order=20for?=
 =?UTF-8?q?=20a=20module=20mbedTLS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules                             |  4 ++--
 src/cmbedtls/compile.cmbedtls           |  8 ++++++++
 src/cmbedtls/init.cmbedtls              | 11 +++++++++++
 src/cmbedtls/install.cmbedtls           | 17 +++++++++++++++++
 src/{curl => cmbedtls}/mbedtls          |  0
 src/{curl => cmbedtls}/mbedtls-config.h |  0
 src/curl/compile.curl                   |  7 -------
 src/curl/init.curl                      | 11 ++++++-----
 8 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100755 src/cmbedtls/compile.cmbedtls
 create mode 100755 src/cmbedtls/init.cmbedtls
 create mode 100755 src/cmbedtls/install.cmbedtls
 rename src/{curl => cmbedtls}/mbedtls (100%)
 rename src/{curl => cmbedtls}/mbedtls-config.h (100%)

diff --git a/.gitmodules b/.gitmodules
index a275c55..8f180f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,6 @@
 [submodule "src/curl/curl"]
 	path = src/curl/curl
 	url = https://github.com/curl/curl.git
-[submodule "src/curl/mbedtls"]
-	path = src/curl/mbedtls
+[submodule "src/cmbedtls/mbedtls"]
+	path = src/cmbedtls/mbedtls
 	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/src/cmbedtls/compile.cmbedtls b/src/cmbedtls/compile.cmbedtls
new file mode 100755
index 0000000..e048aea
--- /dev/null
+++ b/src/cmbedtls/compile.cmbedtls
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+cd mbedtls || exit 1
+make clean
+CFLAGS="-I$SCRIPT_DIR -DMBEDTLS_CONFIG_FILE='<mbedtls-config.h>'" make -j$(nproc) CC=arm-hisiv300-linux-gcc SHARE=1 || exit 1
diff --git a/src/cmbedtls/init.cmbedtls b/src/cmbedtls/init.cmbedtls
new file mode 100755
index 0000000..e786246
--- /dev/null
+++ b/src/cmbedtls/init.cmbedtls
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+rm -rf ./_install
+
+cd mbedtls || exit 1
+git reset --hard || exit 1
+git submodule init
+git submodule update
diff --git a/src/cmbedtls/install.cmbedtls b/src/cmbedtls/install.cmbedtls
new file mode 100755
index 0000000..216d64e
--- /dev/null
+++ b/src/cmbedtls/install.cmbedtls
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+mkdir -p ./_install/lib || exit 1
+mkdir -p ./_install/include/mbedtls || exit 1
+mkdir -p ./_install/include/mbedtls/mbedtls || exit 1
+mkdir -p ./_install/include/psa || exit 1
+
+cp -rp ./mbedtls/include/mbedtls ./_install/include || exit 1
+cp -rp ./mbedtls/include/mbedtls ./_install/include/mbedtls || exit 1
+cp -rp ./mbedtls/crypto/include/mbedtls ./_install/include || exit 1
+cp -rp ./mbedtls/crypto/include/psa ./_install/include || exit 1
+cp ./mbedtls/library/libmbedtls.* ./_install/lib || exit 1
+cp ./mbedtls/library/libmbedx509.* ./_install/lib || exit 1
+cp ./mbedtls/crypto/library/libmbedcrypto.* ./_install/lib || exit 1
diff --git a/src/curl/mbedtls b/src/cmbedtls/mbedtls
similarity index 100%
rename from src/curl/mbedtls
rename to src/cmbedtls/mbedtls
diff --git a/src/curl/mbedtls-config.h b/src/cmbedtls/mbedtls-config.h
similarity index 100%
rename from src/curl/mbedtls-config.h
rename to src/cmbedtls/mbedtls-config.h
diff --git a/src/curl/compile.curl b/src/curl/compile.curl
index f257e07..1075d1e 100755
--- a/src/curl/compile.curl
+++ b/src/curl/compile.curl
@@ -3,14 +3,7 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
-cd mbedtls || exit 1
-make clean
-CFLAGS="-I$SCRIPT_DIR -DMBEDTLS_CONFIG_FILE='<mbedtls-config.h>'" make -j$(nproc) CC=arm-hisiv300-linux-gcc SHARE=1 || exit 1
-make install
-cd ..
-
 cd curl || exit 1
-
 make clean
 make -j$(nproc) || exit 1
 make install
diff --git a/src/curl/init.curl b/src/curl/init.curl
index 5574ef8..05b572b 100755
--- a/src/curl/init.curl
+++ b/src/curl/init.curl
@@ -5,13 +5,14 @@ cd $SCRIPT_DIR
 
 rm -rf ./_install
 
-cd mbedtls || exit 1
-git reset --hard || exit 1
-cd ..
-
 cd curl || exit 1
 git reset --hard || exit 1
 
+if [ ! -f $SCRIPT_DIR/../cmbedtls/_install/lib/libmbedcrypto.a ] ; then
+    echo "ERROR: curl requires mbedtls to be compiled first."
+    exit 1
+fi
+
 ./buildconf || exit 1
 ./configure CC=arm-hisiv300-linux-gcc \
     --prefix=$SCRIPT_DIR/_install \
@@ -45,5 +46,5 @@ git reset --hard || exit 1
     --disable-tls-srp \
     --enable-http \
     --enable-optimize \
-    --with-mbedtls=/usr/local/ \
+    --with-mbedtls=$SCRIPT_DIR/../cmbedtls/_install \
     || exit 1

From 29401263e75190d4324eaf8286aad48a9adf5871 Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Sun, 13 Oct 2019 21:39:06 +0300
Subject: [PATCH 15/16] Fix mbedTLS config

---
 src/cmbedtls/init.cmbedtls    | 2 ++
 src/cmbedtls/install.cmbedtls | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cmbedtls/init.cmbedtls b/src/cmbedtls/init.cmbedtls
index e786246..15f361f 100755
--- a/src/cmbedtls/init.cmbedtls
+++ b/src/cmbedtls/init.cmbedtls
@@ -9,3 +9,5 @@ cd mbedtls || exit 1
 git reset --hard || exit 1
 git submodule init
 git submodule update
+
+cp ../mbedtls-config.h ./include/mbedtls/config.h || exit 1
diff --git a/src/cmbedtls/install.cmbedtls b/src/cmbedtls/install.cmbedtls
index 216d64e..9b3d6ec 100755
--- a/src/cmbedtls/install.cmbedtls
+++ b/src/cmbedtls/install.cmbedtls
@@ -8,10 +8,10 @@ mkdir -p ./_install/include/mbedtls || exit 1
 mkdir -p ./_install/include/mbedtls/mbedtls || exit 1
 mkdir -p ./_install/include/psa || exit 1
 
-cp -rp ./mbedtls/include/mbedtls ./_install/include || exit 1
-cp -rp ./mbedtls/include/mbedtls ./_install/include/mbedtls || exit 1
 cp -rp ./mbedtls/crypto/include/mbedtls ./_install/include || exit 1
 cp -rp ./mbedtls/crypto/include/psa ./_install/include || exit 1
+cp -rp ./mbedtls/include/mbedtls ./_install/include || exit 1
+cp ./mbedtls/include/mbedtls/config.h ./_install/include/mbedtls/mbedtls || exit 1
 cp ./mbedtls/library/libmbedtls.* ./_install/lib || exit 1
 cp ./mbedtls/library/libmbedx509.* ./_install/lib || exit 1
 cp ./mbedtls/crypto/library/libmbedcrypto.* ./_install/lib || exit 1

From cccc2e4f3d65c9d4798af88cb0122486dcfed863 Mon Sep 17 00:00:00 2001
From: root <avenger_msoft@mail.ru>
Date: Wed, 23 Oct 2019 01:26:59 +0300
Subject: [PATCH 16/16] Added support zlib to curl

---
 .gitmodules             |  3 +++
 src/clibz/compile.clibz | 13 +++++++++++++
 src/clibz/init.clibz    | 15 +++++++++++++++
 src/clibz/install.clibz |  4 ++++
 src/clibz/zlib          |  1 +
 src/curl/init.curl      |  6 ++++++
 6 files changed, 42 insertions(+)
 create mode 100755 src/clibz/compile.clibz
 create mode 100755 src/clibz/init.clibz
 create mode 100755 src/clibz/install.clibz
 create mode 160000 src/clibz/zlib

diff --git a/.gitmodules b/.gitmodules
index 8f180f3..ece7deb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "src/cmbedtls/mbedtls"]
 	path = src/cmbedtls/mbedtls
 	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "src/clibz/zlib"]
+	path = src/clibz/zlib
+	url = https://github.com/madler/zlib.git
diff --git a/src/clibz/compile.clibz b/src/clibz/compile.clibz
new file mode 100755
index 0000000..4933fea
--- /dev/null
+++ b/src/clibz/compile.clibz
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+cd zlib || exit 1
+make clean
+make -j$(nproc) \
+    CC=arm-hisiv300-linux-gcc \
+    AR=arm-hisiv300-linux-ar \
+    RANLIB=arm-hisiv300-linux-ranlib \
+    LDSHARED="arm-hisiv300-linux-gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map" || exit 1
+make install
diff --git a/src/clibz/init.clibz b/src/clibz/init.clibz
new file mode 100755
index 0000000..2da97bd
--- /dev/null
+++ b/src/clibz/init.clibz
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+rm -rf ./_install
+
+cd zlib || exit 1
+git reset --hard || exit 1
+
+./configure \
+    --prefix=$SCRIPT_DIR/_install \
+    --libdir=$SCRIPT_DIR/_install/lib \
+    --static \
+    || exit 1
diff --git a/src/clibz/install.clibz b/src/clibz/install.clibz
new file mode 100755
index 0000000..a22d98c
--- /dev/null
+++ b/src/clibz/install.clibz
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
diff --git a/src/clibz/zlib b/src/clibz/zlib
new file mode 160000
index 0000000..cacf7f1
--- /dev/null
+++ b/src/clibz/zlib
@@ -0,0 +1 @@
+Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f
diff --git a/src/curl/init.curl b/src/curl/init.curl
index 05b572b..dce5267 100755
--- a/src/curl/init.curl
+++ b/src/curl/init.curl
@@ -8,6 +8,11 @@ rm -rf ./_install
 cd curl || exit 1
 git reset --hard || exit 1
 
+if [ ! -f $SCRIPT_DIR/../clibz/_install/lib/libz.a ] ; then
+    echo "ERROR: curl requires zlib to be compiled first."
+    exit 1
+fi
+
 if [ ! -f $SCRIPT_DIR/../cmbedtls/_install/lib/libmbedcrypto.a ] ; then
     echo "ERROR: curl requires mbedtls to be compiled first."
     exit 1
@@ -47,4 +52,5 @@ fi
     --enable-http \
     --enable-optimize \
     --with-mbedtls=$SCRIPT_DIR/../cmbedtls/_install \
+    --with-zlib=$SCRIPT_DIR/../clibz/_install \
     || exit 1