commit 6d1adf3857714d0d20554b0fa549345872319c57
author Dan Albert <danalbert@google.com> Thu Sep 10 20:58:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 10 20:58:14 2020 +0000
tree 44159303501d2b7ee35946a4fdfea50a08e70e18
parent d76586fd7f6cb063972b382a6a9d3b4ab7d5dedb
parent 66273f5a2c23ba8207b3638f389340b3b12741f1

Update OpenSSL and curl. am: 734637fe66 am: 9e484637b9 am: cbbfee3aa0 am: 66273f5a2c

Original change: https://android-review.googlesource.com/c/platform/tools/ndkports/+/1282033

Change-Id: Ibf1a9560950f9d425a0b51e9d5608bdec29e56c4

ports/curl/port.kts

diff --git a/ports/curl/port.kts b/ports/curl/port.kts
index f9be7a8..a870a86 100644
--- a/ports/curl/port.kts
+++ b/ports/curl/port.kts
@@ -20,7 +20,7 @@
 
 object : AutoconfPort() {
     override val name = "curl"
-    override val version = "7.68.0"
+    override val version = "7.69.1"
     override val mavenVersion = "$version-alpha-1"
     override val licensePath = "COPYING"
 

ports/curl/src.tar.gz

diff --git a/ports/curl/src.tar.gz b/ports/curl/src.tar.gz
index 8daa802..b0da690 100644
--- a/ports/curl/src.tar.gz
+++ b/ports/curl/src.tar.gz
Binary files differ

ports/openssl/port.kts

diff --git a/ports/openssl/port.kts b/ports/openssl/port.kts
index 2da69a1..701fa9a 100644
--- a/ports/openssl/port.kts
+++ b/ports/openssl/port.kts
@@ -20,9 +20,9 @@
 
 object : Port() {
     override val name = "openssl"
-    override val version = "1.1.1d"
+    override val version = "1.1.1f"
     override val mavenVersion = "$version-alpha-1"
-    override val prefabVersion = CMakeCompatibleVersion(1, 1, 1, 4)
+    override val prefabVersion = CMakeCompatibleVersion(1, 1, 1, 6)
 
     override val license = License(
         "Dual OpenSSL and SSLeay License",
@@ -87,4 +87,4 @@
                 "PATH" to "${toolchain.binDir}:${System.getenv("PATH")}"
             )
         )
-}
\ No newline at end of file
+}

ports/openssl/src.tar.gz

diff --git a/ports/openssl/src.tar.gz b/ports/openssl/src.tar.gz
index 216017a..4bcec00 100644
--- a/ports/openssl/src.tar.gz
+++ b/ports/openssl/src.tar.gz
Binary files differ