From 2c6dd62139d7e23439d46a993d4a04410e23cd9c Mon Sep 17 00:00:00 2001
From: Angel Leon <gubatron@gmail.com>
Date: Mon, 29 May 2023 12:57:22 -0600
Subject: [PATCH] Dockerfile updates, including new NDK

---
 changelog.txt                                             | 1 +
 .../com/frostwire/jlibtorrent/swig/libtorrent_jni.java    | 2 +-
 swig/Dockerfile                                           | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index e944559f..2f3e094c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@
  * gradle 8.1.1 upgrade
  * jar built with jdk20
  * libtorrent update to RC_1_2 adac0d0843c7fb2180f43d20bd5bee0e380e4673
+ * android NDK r25c (LTS) (from r25b)
  * lt:back-port load_torrent_*() functions
  * lt:fix issue with odd piece sizes
  * lt:fix issue where stop-when-ready would not close files
diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java b/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
index 19fca488..2c058749 100644
--- a/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
+++ b/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
@@ -13,7 +13,7 @@ public class libtorrent_jni {
 
     public static String jlibtorrentVersion() {
         // extracted from the gradle with the run-swig step
-        return "1.2.17.0";
+        return "1.2.19.0";
     }
 
     public static boolean isMacOS() {
diff --git a/swig/Dockerfile b/swig/Dockerfile
index 3ac76649..70439f86 100644
--- a/swig/Dockerfile
+++ b/swig/Dockerfile
@@ -28,17 +28,17 @@ RUN apt install -y g++-7-multilib
 # For testing and debugging
 RUN apt install -y emacs-nox
 
-ENV LIBTORRENT_REVISION="RC_1_2_b5873f2"
+ENV LIBTORRENT_REVISION="RC_1_2_adac0d"
 ENV SWIG_VERSION="4.0.2"
 ENV BOOST_MAJOR="1"
-ENV BOOST_VERSION="80"
+ENV BOOST_VERSION="82"
 ENV BOOST_MINOR="0"
 ENV BOOST_DOT_VERSION="${BOOST_MAJOR}.${BOOST_VERSION}.${BOOST_MINOR}"
 ENV BOOST_UNDERSCORE_VERSION="${BOOST_MAJOR}_${BOOST_VERSION}_${BOOST_MINOR}"
 ENV BOOST_ROOT="/src/boost_${BOOST_UNDERSCORE_VERSION}"
-ENV NDK_VERSION="r25b"
+ENV NDK_VERSION="r25c"
 ENV ANDROID_API="24"
-ENV OPENSSL_VERSION="1.1.1q"
+ENV OPENSSL_VERSION="1.1.1t"
 ENV OPENSSL_NO_OPTS="no-afalgeng no-async no-autoalginit no-autoerrinit no-capieng no-cms no-comp no-deprecated no-dgram no-dso no-dtls no-dynamic-engine no-egd no-engine no-err no-filenames no-gost no-hw no-makedepend no-multiblock no-nextprotoneg no-posix-io no-psk no-rdrand no-sctp no-shared no-sock no-srp no-srtp no-static-engine no-stdio no-threads no-ui-console no-zlib no-zlib-dynamic -fno-strict-aliasing -fvisibility=hidden -Os"
 ENV GRADLE_VERSION="7.5.1"
 ENV GRADLE_HOME="/src/gradle-${GRADLE_VERSION}"