use latest libsodium release 1.0.19 and update to github url (since o…

…ther url timeouts often on CI runs)
zoff99 · Feb 20, 2024 · de906f0 · de906f0
1 parent d088169
commit de906f0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/amalgamation_test_win64.yml b/.github/workflows/amalgamation_test_win64.yml
@@ -50,8 +50,8 @@ jobs:
           cd "$HOME"/sodium/
           rm -f libsodium.tgz
           rm -Rf libsodium-*
-          SODIUM_VERSION=1.0.18
-          wget "https://download.libsodium.org/libsodium/releases/libsodium-${SODIUM_VERSION}.tar.gz" -O libsodium.tgz
+          SODIUM_VERSION=1.0.19
+          wget "https://github.com/jedisct1/libsodium/releases/download/${SODIUM_VERSION}-RELEASE/libsodium-${SODIUM_VERSION}.tar.gz" -O libsodium.tgz
           tar -xzvf libsodium.tgz
           cd libsodium-*
           MINGW_ARCH="x86_64"

diff --git a/.localrun/run_amalgamation_cpp_test_windows.sh b/.localrun/run_amalgamation_cpp_test_windows.sh
@@ -60,9 +60,8 @@ cd sodium/
 
 rm -f libsodium.tgz
 rm -Rf libsodium-*
-SODIUM_VERSION=1.0.18
-SODIUM_HASH=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
-wget "https://download.libsodium.org/libsodium/releases/libsodium-${SODIUM_VERSION}.tar.gz" -O libsodium.tgz
+SODIUM_VERSION=1.0.19
+wget "https://github.com/jedisct1/libsodium/releases/download/${SODIUM_VERSION}-RELEASE/libsodium-${SODIUM_VERSION}.tar.gz" -O libsodium.tgz
 tar -xzvf libsodium.tgz
 cd libsodium-*
 

diff --git a/.localrun/run_amalgamation_test_windows.sh b/.localrun/run_amalgamation_test_windows.sh
@@ -60,9 +60,8 @@ cd sodium/
 
 rm -f libsodium.tgz
 rm -Rf libsodium-*
-SODIUM_VERSION=1.0.18
-SODIUM_HASH=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
-wget "https://download.libsodium.org/libsodium/releases/libsodium-${SODIUM_VERSION}.tar.gz" -O libsodium.tgz
+SODIUM_VERSION=1.0.19
+wget "https://github.com/jedisct1/libsodium/releases/download/${SODIUM_VERSION}-RELEASE/libsodium-${SODIUM_VERSION}.tar.gz" -O libsodium.tgz
 tar -xzvf libsodium.tgz
 cd libsodium-*
 

diff --git a/configure b/configure
@@ -14107,7 +14107,7 @@ then :
 
 else $as_nop
 
-                as_fn_error $? "required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/ or library version is too old" "$LINENO" 5
+                as_fn_error $? "required library libsodium was not found on your system, please check https://github.com/jedisct1/libsodium or library version is too old" "$LINENO" 5
 
 
 fi

diff --git a/configure.ac b/configure.ac
@@ -374,7 +374,7 @@ elif test "x$LIBSODIUM_FOUND" = "xno"; then
         AC_CHECK_LIB(sodium, crypto_pwhash_scryptsalsa208sha256,
             [],
             [
-                AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/ or library version is too old])
+                AC_MSG_ERROR([required library libsodium was not found on your system, please check https://github.com/jedisct1/libsodium or library version is too old])
             ]
         )
     fi