From 64c4a8c00a938b98a5ff3f591a8b4dd7dddfe0c0 Mon Sep 17 00:00:00 2001
From: "Troy A. Griffitts" <scribe@crosswire.org>
Date: Fri, 4 Sep 2026 13:25:56 +0200
Subject: [PATCH] OpenSSL 3.5.8 LTS and curl 8.22.0, 16 KB page-aligned, for
 the SWORD Android bindings

Sources replaced with the current release tarballs (OpenSSL sha256 and
curl PGP signature verified).  Both link with -z max-page-size=16384 so
the 64-bit builds satisfy Android's 16 KB page requirement.  OpenSSL 3
reads ANDROID_NDK_ROOT; curl 8 wants --with-openssl and --without-libpsl.
Artifacts publish under org.crosswire.ndkports with no version suffix.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AkWywQm9cenFLoD6a9T5RZ
---
 build.gradle.kts         |  2 +-
 curl/build.gradle.kts    | 15 ++++++++++-----
 openssl/build.gradle.kts | 12 +++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c1a7350..ed50f08 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ buildscript {
     val snapshotSuffix = if (hasProperty("release")) {
         // We're still tagging releases as betas until we have more thorough
         // test automation.
-        "-beta-1"
+        ""
     } else {
         "-SNAPSHOT"
     }
diff --git a/curl/build.gradle.kts b/curl/build.gradle.kts
index 9fb1f99..c1884e6 100644
--- a/curl/build.gradle.kts
+++ b/curl/build.gradle.kts
@@ -2,9 +2,9 @@ import com.android.ndkports.AutoconfPortTask
 import com.android.ndkports.CMakeCompatibleVersion
 import com.android.ndkports.PrefabSysrootPlugin
 
-val portVersion = "7.85.0"
+val portVersion = "8.22.0"
 
-group = "com.android.ndk.thirdparty"
+group = "org.crosswire.ndkports"
 version = "$portVersion${rootProject.extra.get("snapshotSuffix")}"
 
 plugins {
@@ -30,12 +30,17 @@ tasks.prefab {
 tasks.register<AutoconfPortTask>("buildPort") {
     autoconf {
         args(
-            "--disable-ntlm-wb",
             "--enable-ipv6",
             "--with-zlib",
             "--with-ca-path=/system/etc/security/cacerts",
-            "--with-ssl=$sysroot"
+            "--with-openssl=$sysroot",
+            "--without-libpsl",
+            "--disable-ldap",
+            "--disable-ldaps",
+            "--disable-manual",
+            "--disable-docs"
         )
+        env("LDFLAGS", "-Wl,-z,max-page-size=16384")
     }
 }
 
@@ -46,7 +51,7 @@ tasks.prefabPackage {
 
     @Suppress("UnstableApiUsage") dependencies.set(
         mapOf(
-            "openssl" to "1.1.1k"
+            "openssl" to "3.5.8"
         )
     )
 
diff --git a/openssl/build.gradle.kts b/openssl/build.gradle.kts
index d4b0c46..6681426 100644
--- a/openssl/build.gradle.kts
+++ b/openssl/build.gradle.kts
@@ -2,9 +2,9 @@ import com.android.ndkports.AdHocPortTask
 import com.android.ndkports.AndroidExecutableTestTask
 import com.android.ndkports.CMakeCompatibleVersion
 
-val portVersion = "3.2.1"
+val portVersion = "3.5.8"
 
-group = "com.android.ndk.thirdparty"
+group = "org.crosswire.ndkports"
 version = "$portVersion${rootProject.extra.get("snapshotSuffix")}"
 
 plugins {
@@ -29,24 +29,26 @@ val buildTask = tasks.register<AdHocPortTask>("buildPort") {
                 "--prefix=${installDirectory.absolutePath}",
                 "--openssldir=${installDirectory.absolutePath}",
                 "no-sctp",
+                "no-tests",
+                "-Wl,-z,max-page-size=16384",
                 "shared"
             )
 
-            env("ANDROID_NDK", toolchain.ndk.path.absolutePath)
+            env("ANDROID_NDK_ROOT", toolchain.ndk.path.absolutePath)
             env("PATH", "${toolchain.binDir}:${System.getenv("PATH")}")
         }
 
         run {
             args("make", "-j$ncpus", "SHLIB_EXT=.so")
 
-            env("ANDROID_NDK", toolchain.ndk.path.absolutePath)
+            env("ANDROID_NDK_ROOT", toolchain.ndk.path.absolutePath)
             env("PATH", "${toolchain.binDir}:${System.getenv("PATH")}")
         }
 
         run {
             args("make", "install_sw", "SHLIB_EXT=.so")
 
-            env("ANDROID_NDK", toolchain.ndk.path.absolutePath)
+            env("ANDROID_NDK_ROOT", toolchain.ndk.path.absolutePath)
             env("PATH", "${toolchain.binDir}:${System.getenv("PATH")}")
         }
     }
-- 
2.55.0