Merge branch 'master' into monero-v0.18.3.4

5 files changed, 20 insertions, 7 deletions

diff --git a/external/libexpat b/external/libexpat
new file mode 160000
+Subproject 3bab6c09bbe8bf42d84b81563ddbcf4cca4be83
diff --git a/external/libzmq b/external/libzmq
-Subproject 59c91227b46b60b7f965816544b25fe0a3cc8bb
+Subproject b95d94935ed107679fd0ad9efd2f3d47309b6fd
diff --git a/external/macos/build_unbound.sh b/external/macos/build_unbound.sh
index e9e1ff8..d1c3825 100755
--- a/external/macos/build_unbound.sh
+++ b/external/macos/build_unbound.sh
@@ -9,9 +9,15 @@ EXPAT_VERSION=R_2_4_8
 EXPAT_HASH="3bab6c09bbe8bf42d84b81563ddbcf4cca4be838"
 EXPAT_SRC_DIR=${EXTERNAL_MACOS_SOURCE_DIR}/libexpat
 rm -rf $EXPAT_SRC_DIR
-git clone https://github.com/libexpat/libexpat.git -b ${EXPAT_VERSION} ${EXPAT_SRC_DIR}
+if [ -d "$EXPAT_SRC_DIR" ]; then
+    echo "Unbound directory already exists."
+else
+    echo "Cloning Unbound from $Unbound_URL"
+    mkdir -p ${EXPAT_SRC_DIR} || true
+    rm -rf ${EXPAT_SRC_DIR}
+	cp -r "${MONEROC_DIR}/external/libexpat" ${EXPAT_SRC_DIR}
+fi
 cd $EXPAT_SRC_DIR
-test `git rev-parse HEAD` = ${EXPAT_HASH} || exit 1
 cd $EXPAT_SRC_DIR/expat
 
 ./buildconf.sh
@@ -28,10 +34,16 @@ UNBOUND_DIR_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/unbound-1.16.2"
 
 echo "============================ Unbound ============================"
 rm -rf ${UNBOUND_DIR_PATH}
-git clone https://github.com/NLnetLabs/unbound.git -b ${UNBOUND_VERSION} ${UNBOUND_DIR_PATH}
+# Check if the directory already exists.
+if [ -d "$UNBOUND_DIR_PATH" ]; then
+    echo "Unbound directory already exists."
+else
+    echo "Cloning Unbound from $Unbound_URL"
+    mkdir -p ${UNBOUND_DIR_PATH} || true
+    rm -rf ${UNBOUND_DIR_PATH}
+	cp -r "${MONEROC_DIR}/external/unbound" ${UNBOUND_DIR_PATH}
+fi
 cd $UNBOUND_DIR_PATH
-test `git rev-parse HEAD` = ${UNBOUND_HASH} || exit 1
-
 ./configure --prefix="${EXTERNAL_MACOS_DIR}" \
 	    --with-ssl="${HOMEBREW_PREFIX}" \
 			--with-libexpat="${EXTERNAL_MACOS_DIR}" \
diff --git a/external/macos/config.sh b/external/macos/config.sh
index dcdf462..3c40625 100755
--- a/external/macos/config.sh
+++ b/external/macos/config.sh
@@ -7,6 +7,7 @@ export EXTERNAL_MACOS_DIR="${EXTERNAL_DIR}/MACOS"
 export EXTERNAL_MACOS_SOURCE_DIR="${EXTERNAL_MACOS_DIR}/sources"
 export EXTERNAL_MACOS_LIB_DIR="${EXTERNAL_MACOS_DIR}/lib"
 export EXTERNAL_MACOS_INCLUDE_DIR="${EXTERNAL_MACOS_DIR}/include"
+export MONEROC_DIR="$(pwd)/../.."
 
-mkdir -p "$EXTERNAL_MACOS_LIB_DIR"
-mkdir -p "$EXTERNAL_MACOS_INCLUDE_DIR"
\ No newline at end of file
+mkdir -p "$EXTERNAL_MACOS_LIB_DIR" || true
+mkdir -p "$EXTERNAL_MACOS_INCLUDE_DIR" || true
\ No newline at end of file
diff --git a/external/polyseed b/external/polyseed
-Subproject b7c35bb3c6b91e481ecb04fc235eaff69c507fa
+Subproject 3ef366993258a6f1c837d4908e3e4afb2cfefff