Merge branch 'IOS-2945'

_config/pEp_versions.plist

@@ -17,7 +17,7 @@
 	<key>WEBSERVER_VERSION</key>
 	<string>Release_2.1.0-RC7</string>
 	<key>JSON_SERVER_ADAPTER_VERSION</key>
-	<string>Release_2.1.5</string>
+	<string>Release_2.1.6</string>
 	<key>DOWNLOADCLIENT_VERSION</key>
 	<string>Release_2.1.3</string>
 	<key>MAC_OS_ADAPTER_VERSION</key>

build-asn1executable.sh

@@ -32,7 +32,7 @@ fi
 ASN1_DIR="${TMP_DIR}/asn1c"
 if [ ! -d "${ASN1_DIR}" ]; then
     pushd "${TMP_DIR}"
-        git clone -b "v0.9.28" git://github.com/vlm/asn1c.git
+        git clone -b "v0.9.28" https://github.com/vlm/asn1c.git
     popd
 fi
 

build-pEpEngine-macOS.sh

@@ -39,7 +39,7 @@ fi
 pushd "${PARENT_DIR}"
     PEP_ENGINE_DIR="${PARENT_DIR}/pEpEngine"
     if [ ! -d "${PEP_ENGINE_DIR}" ]; then
-        git clone -b "${VERSION}" https://gitea.pep.foundation/buff/pEpEngine
+        git clone -b "${VERSION}" https://gitea.pep.foundation/pEp.foundation/pEpEngine
     fi
     PEP_TRANSPORT_DIR="${PARENT_DIR}/libpEpTransport"
     if [ ! -d "${PEP_TRANSPORT_DIR}" ]; then

buildcode/boost.code

@@ -18,11 +18,9 @@ pushd "${BOOST_DIR}"
     if [ ${ARCH} = "x86_64" ]; then
         ./b2 clean
         ./b2 ${BOOST_TOOLSET} ${BOOST_TARGET} architecture=x86 -std=c++11 cxxflags="-arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" cflags="-arch ${ARCH}" linkflags="-arch ${ARCH} " ${USED_BOOST_LIBS_ARGS} stage
-        ./b2 install
     elif [ ${ARCH} = "arm64" ]; then
         ./b2 clean
         ./b2 ${BOOST_TOOLSET} ${BOOST_TARGET} architecture=arm -std=c++11 abi=aapcs cxxflags="-arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" cflags="-arch ${ARCH}" linkflags="-arch ${ARCH}" ${USED_BOOST_LIBS_ARGS} stage
-        ./b2 install
     else
         echo "unhandled ARCH"
         exit 1

buildcode/cryptopp.code

@@ -5,7 +5,7 @@ fi
 
 CRYPTOPP_DIR="${TMP_DIR}/cryptopp"
 if [ ! -d "${CRYPTOPP_DIR}" ]; then
-    git clone -b CRYPTOPP_8_2_0 https://github.com/weidai11/cryptopp
+    git clone -b CRYPTOPP_8_5_0 https://github.com/weidai11/cryptopp
 fi
 pushd ${CRYPTOPP_DIR}
     export CXX="$(xcrun --sdk ${SDK} -f clang++) -arch ${ARCH} -isysroot ${SDK_PATH} -stdlib=libc++"

buildcode/nettle.code

@@ -21,7 +21,7 @@ export LDFLAGS="-arch ${ARCH}"
 export CC="$(xcrun --sdk ${SDK} -f clang) -arch ${ARCH} -isysroot ${SDK_PATH}"
 
 pushd ${NETTLE_NAME}
-	PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig CC_FOR_BUILD="$(whereis gcc)" ./configure --host=${HOST} --prefix=${CURRENT_LIB_DIR} --with-lib-path=${PREFIX}/lib --with-include-path=${PREFIX}/include --disable-assembler --disable-arm-neon --disable-documentation  --verbose
+	PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig CC_FOR_BUILD="$(whereis -q gcc)" ./configure --host=${HOST} --prefix=${CURRENT_LIB_DIR} --with-lib-path=${PREFIX}/lib --with-include-path=${PREFIX}/include --disable-assembler --disable-arm-neon --disable-documentation  --verbose
 	make clean
 	make -j4
 	make install