From ee2b6101bf7bfe2ca6b84ec7582e218fa3fa7734 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Fri, 13 Dec 2019 18:23:10 +0100 Subject: [PATCH 1/3] fix broken libsodium package --- res/libsodium/buildlibsodium.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/libsodium/buildlibsodium.sh b/res/libsodium/buildlibsodium.sh index 0edd25e..e185369 100755 --- a/res/libsodium/buildlibsodium.sh +++ b/res/libsodium/buildlibsodium.sh @@ -10,7 +10,7 @@ echo "Building libsodium" # Go into the lib sodium directory cd res/libsodium if [ ! -f libsodium-1.0.16.tar.gz ]; then - curl -LO https://download.libsodium.org/libsodium/releases/libsodium-1.0.16.tar.gz + curl -LO https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.16.tar.gz fi if [ ! -d libsodium-1.0.16 ]; then From 1a0d876d3ed33c8a2e0d2d149eebf4e5de5a48ad Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Fri, 13 Dec 2019 20:07:53 +0100 Subject: [PATCH 2/3] switch libsodium link to myHush github repo --- res/libsodium/buildlibsodium.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/libsodium/buildlibsodium.sh b/res/libsodium/buildlibsodium.sh index e185369..1205871 100755 --- a/res/libsodium/buildlibsodium.sh +++ b/res/libsodium/buildlibsodium.sh @@ -10,10 +10,10 @@ echo "Building libsodium" # Go into the lib sodium directory cd res/libsodium if [ ! -f libsodium-1.0.16.tar.gz ]; then - curl -LO https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.16.tar.gz + curl -LO https://github.com/MyHush/libsodium/releases/download/1.0.16/libsodium-1.0.16.tar.gz fi -if [ ! -d libsodium-1.0.16 ]; then +if [ ! -d 1.0.16 ]; then tar xf libsodium-1.0.16.tar.gz fi From 5474088541497e18a074076424bb213b89904bd0 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Fri, 13 Dec 2019 20:31:46 +0100 Subject: [PATCH 3/3] Update to libsodium 1.0.18 --- res/libsodium/buildlibsodium.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/res/libsodium/buildlibsodium.sh b/res/libsodium/buildlibsodium.sh index 1205871..a1de376 100755 --- a/res/libsodium/buildlibsodium.sh +++ b/res/libsodium/buildlibsodium.sh @@ -9,16 +9,16 @@ echo "Building libsodium" # Go into the lib sodium directory cd res/libsodium -if [ ! -f libsodium-1.0.16.tar.gz ]; then - curl -LO https://github.com/MyHush/libsodium/releases/download/1.0.16/libsodium-1.0.16.tar.gz +if [ ! -f libsodium-1.0.18.tar.gz ]; then + curl -LO https://github.com/MyHush/libsodium/releases/download/1.0.18/libsodium-1.0.18.tar.gz fi -if [ ! -d 1.0.16 ]; then - tar xf libsodium-1.0.16.tar.gz +if [ ! -d libsodium-1.0.18 ]; then + tar xf libsodium-1.0.18.tar.gz fi # Now build it -cd libsodium-1.0.16 +cd libsodium-1.0.18 LIBS="" ./configure make clean if [[ "$OSTYPE" == "darwin"* ]]; then @@ -29,4 +29,4 @@ fi cd .. # copy the library to the parents's res/ folder -cp libsodium-1.0.16/src/libsodium/.libs/libsodium.a ../ +cp libsodium-1.0.18/src/libsodium/.libs/libsodium.a ../