From 04b4a303a8f71d28d87bd8785c088ee21328616f Mon Sep 17 00:00:00 2001
From: Hussein Kasem <devnull@localhost>
Date: Thu, 15 Oct 2020 14:25:00 +0200
Subject: [PATCH] JNI-120 Android build: Upgrade Sequpoia depedencies (Gmp,
 Nettle and OpenSSL).

---
 android/external/Makefile.conf                       | 6 +++---
 android/external/armeabi-v7a/Makefile                | 3 ---
 android/external/downloads/gmp-6.1.2.tar.bz2.md5     | 1 -
 android/external/downloads/gmp-6.2.0.tar.bz2.md5     | 1 +
 android/external/downloads/nettle-3.4.1.tar.gz.md5   | 1 -
 android/external/downloads/nettle-3.6.tar.gz.md5     | 1 +
 android/external/downloads/openssl-1.1.1b.tar.gz.md5 | 1 -
 android/external/downloads/openssl-1.1.1h.tar.gz.md5 | 1 +
 8 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 android/external/downloads/gmp-6.1.2.tar.bz2.md5
 create mode 100644 android/external/downloads/gmp-6.2.0.tar.bz2.md5
 delete mode 100644 android/external/downloads/nettle-3.4.1.tar.gz.md5
 create mode 100644 android/external/downloads/nettle-3.6.tar.gz.md5
 delete mode 100644 android/external/downloads/openssl-1.1.1b.tar.gz.md5
 create mode 100644 android/external/downloads/openssl-1.1.1h.tar.gz.md5

diff --git a/android/external/Makefile.conf b/android/external/Makefile.conf
index 56e063a..318b4af 100644
--- a/android/external/Makefile.conf
+++ b/android/external/Makefile.conf
@@ -14,9 +14,9 @@ else
 endif
 
 ### Sequoia deps versions
-OPENSSL_VERSION=1.1.1b
-GMP_VERSION=6.1.2
-NETTLE_VERSION=3.4.1
+OPENSSL_VERSION=1.1.1h
+GMP_VERSION=6.2.0
+NETTLE_VERSION=3.6
 
 ### Git deps repos
 EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD
diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile
index ed8f0f3..82de4dc 100644
--- a/android/external/armeabi-v7a/Makefile
+++ b/android/external/armeabi-v7a/Makefile
@@ -194,9 +194,6 @@ uuid/jni/Android.mk: uuid.src.stamp
 
 #------------------------------------------------------------------------------#
 # Sequoia
-OPENSSL_VERSION=1.1.1b
-GMP_VERSION=6.1.2
-NETTLE_VERSION=3.4.1
 
 sequoia-deps-build: openssl-install nettle-install
 
diff --git a/android/external/downloads/gmp-6.1.2.tar.bz2.md5 b/android/external/downloads/gmp-6.1.2.tar.bz2.md5
deleted file mode 100644
index 7143577..0000000
--- a/android/external/downloads/gmp-6.1.2.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-8ddbb26dc3bd4e2302984debba1406a5  gmp-6.1.2.tar.bz2
diff --git a/android/external/downloads/gmp-6.2.0.tar.bz2.md5 b/android/external/downloads/gmp-6.2.0.tar.bz2.md5
new file mode 100644
index 0000000..6e7e817
--- /dev/null
+++ b/android/external/downloads/gmp-6.2.0.tar.bz2.md5
@@ -0,0 +1 @@
+c24161e0dd44cae78cd5f67193492a21  gmp-6.2.0.tar.bz2
diff --git a/android/external/downloads/nettle-3.4.1.tar.gz.md5 b/android/external/downloads/nettle-3.4.1.tar.gz.md5
deleted file mode 100644
index 38cfc6a..0000000
--- a/android/external/downloads/nettle-3.4.1.tar.gz.md5
+++ /dev/null
@@ -1 +0,0 @@
-9bdebb0e2f638d3b9d91f7fc264b70c1  nettle-3.4.1.tar.gz
diff --git a/android/external/downloads/nettle-3.6.tar.gz.md5 b/android/external/downloads/nettle-3.6.tar.gz.md5
new file mode 100644
index 0000000..45c0fd9
--- /dev/null
+++ b/android/external/downloads/nettle-3.6.tar.gz.md5
@@ -0,0 +1 @@
+c45ee24ed7361dcda152a035d396fe8a  nettle-3.6.tar.gz
diff --git a/android/external/downloads/openssl-1.1.1b.tar.gz.md5 b/android/external/downloads/openssl-1.1.1b.tar.gz.md5
deleted file mode 100644
index 86c1370..0000000
--- a/android/external/downloads/openssl-1.1.1b.tar.gz.md5
+++ /dev/null
@@ -1 +0,0 @@
-4532712e7bcc9414f5bce995e4e13930  openssl-1.1.1b.tar.gz
diff --git a/android/external/downloads/openssl-1.1.1h.tar.gz.md5 b/android/external/downloads/openssl-1.1.1h.tar.gz.md5
new file mode 100644
index 0000000..99e70a8
--- /dev/null
+++ b/android/external/downloads/openssl-1.1.1h.tar.gz.md5
@@ -0,0 +1 @@
+53840c70434793127a3574433494e8d3  openssl-1.1.1h.tar.gz