From cd0af7088066f870f12eceed9836bde897f1d164 Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Mon, 22 Jul 2024 21:16:39 +0200
Subject: [PATCH] libcryfs: Update Boost to 1.79.0 & allow curl and wget for
 download

---
 vendor/boost/Boost-for-Android |  2 +-
 vendor/boost/CMakeLists.txt    | 22 +++++++++++-----------
 vendor/boost/android-build.sh  | 22 +++++++++++++++-------
 vendor/boost/checksum.txt      |  2 +-
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/vendor/boost/Boost-for-Android b/vendor/boost/Boost-for-Android
index 83ba7174..7daeea97 160000
--- a/vendor/boost/Boost-for-Android
+++ b/vendor/boost/Boost-for-Android
@@ -1 +1 @@
-Subproject commit 83ba7174dea6e0595085dc30051eb17747e7260a
+Subproject commit 7daeea97271a4067386254dc491d49db2b13ae65
diff --git a/vendor/boost/CMakeLists.txt b/vendor/boost/CMakeLists.txt
index 45d6696f..04c46bf5 100644
--- a/vendor/boost/CMakeLists.txt
+++ b/vendor/boost/CMakeLists.txt
@@ -15,16 +15,16 @@ else()
 	message(FATAL_ERROR "Android ABI not supported: ${CMAKE_ANDROID_ARCH_ABI}")
 endif()
 set(BOOST_STATIC_LIBS
-	${BOOST_OUTPUT}/lib/libboost_atomic-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_chrono-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_container-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_date_time-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_exception-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_filesystem-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_serialization-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_system-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_thread-clang-mt-${BOOST_ARCH}-1_77.a
-	${BOOST_OUTPUT}/lib/libboost_wserialization-clang-mt-${BOOST_ARCH}-1_77.a
+	${BOOST_OUTPUT}/lib/libboost_atomic-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_chrono-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_container-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_date_time-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_exception-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_filesystem-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_serialization-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_system-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_thread-clang-mt-${BOOST_ARCH}-1_79.a
+	${BOOST_OUTPUT}/lib/libboost_wserialization-clang-mt-${BOOST_ARCH}-1_79.a
 )
 add_custom_target(
 	vendor_boost
@@ -33,5 +33,5 @@ add_custom_target(
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 add_dependencies(boost vendor_boost)
-target_include_directories(boost SYSTEM INTERFACE ${BOOST_OUTPUT}/include/boost-1_77)
+target_include_directories(boost SYSTEM INTERFACE ${BOOST_OUTPUT}/include/boost-1_79)
 target_link_libraries(boost INTERFACE ${BOOST_STATIC_LIBS})
diff --git a/vendor/boost/android-build.sh b/vendor/boost/android-build.sh
index 45348e66..3e935e1e 100755
--- a/vendor/boost/android-build.sh
+++ b/vendor/boost/android-build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ $(find build/$2/lib -name libboost_*.a 2>/dev/null |wc -l) -eq 10 ]; then
+if [ "$(find build/"$2"/lib -name libboost_*.a 2>/dev/null |wc -l)" -eq 10 ]; then
 	echo "boost already built for $2";
 	exit 0
 fi
@@ -10,16 +10,24 @@ fi
 exec 9>/var/tmp/libcryfs-boost.lock
 flock 9
 
-mkdir -p build && rm -rf build/$2 && cd Boost-for-Android
+mkdir -p build && rm -rf build/"$2" && cd Boost-for-Android
 
-BOOST_TAR=boost_1_77_0.tar.bz2
+BOOST_TAR=boost_1_79_0.tar.bz2
 if [ ! -f $BOOST_TAR ]; then
-	wget -O $BOOST_TAR https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2
+	DL_URL="https://archives.boost.io/release/1.79.0/source/boost_1_79_0.tar.bz2"
+	if command -v wget; then
+		wget -O $BOOST_TAR "$DL_URL"
+	elif command -v curl; then
+		curl -fLo $BOOST_TAR "$DL_URL"
+	else
+		echo "Neither curl or wget have been found">&2
+		exit 1
+	fi
 fi
 sha256sum -c ../checksum.txt
 
-./build-android.sh --boost=1.77.0 --arch=$2 --target-version=21 \
+./build-android.sh --boost=1.79.0 --arch="$2" --target-version=21 \
 	--with-libraries=atomic,chrono,container,date_time,exception,filesystem,serialization,system,thread \
-	$1
+	"$1"
 
-mv build/out/$2 ../build
+mv build/out/"$2" ../build
diff --git a/vendor/boost/checksum.txt b/vendor/boost/checksum.txt
index 96fff938..9703d5e7 100644
--- a/vendor/boost/checksum.txt
+++ b/vendor/boost/checksum.txt
@@ -1 +1 @@
-fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost_1_77_0.tar.bz2
+475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 boost_1_79_0.tar.bz2