diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh index 3d01d9af44960798acc5d3185c1ebe87e0adefc8..6320b0aa4f1b9ad5d490dc659eb8f3d826938ef9 100755 --- a/ci/travis/before_install.sh +++ b/ci/travis/before_install.sh @@ -32,8 +32,8 @@ then chmod +x qt-opensource-linux-x64-5.8.0.run ./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs - wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium18_1.0.11-2_amd64.deb - sudo dpkg -i libsodium18_1.0.11-2_amd64.deb + wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium18_1.0.13-1_amd64.deb + sudo dpkg -i libsodium18_1.0.13-1_amd64.deb rm -r ~/.pyenv git clone https://github.com/yyuu/pyenv.git ~/.pyenv echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile diff --git a/sakia.spec b/sakia.spec index e4e78a7975e15f5054129c377cdcccb164469efb..743634e9bcd6d0b78619e7b1aca1bfbaf2eb0cd4 100644 --- a/sakia.spec +++ b/sakia.spec @@ -34,10 +34,10 @@ if is_darwin: if is_linux: libsodium_path = ctypes.util.find_library('libsodium.so') if not libsodium_path: - if os.path.isfile('/usr/lib/x86_64-linux-gnu/libsodium.so.18.1.1'): - libsodium_path = "/usr/lib/x86_64-linux-gnu/libsodium.so.18.1.1" - if os.path.isfile('/usr/lib/i386-linux-gnu/libsodium.so.18.1.1'): - libsodium_path = "/usr/lib/i386-linux-gnu/libsodium.so.18.1.1" + if os.path.isfile('/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0'): + libsodium_path = "/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0" + if os.path.isfile('/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0'): + libsodium_path = "/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0" a.binaries = a.binaries + TOC([('libsodium.so', libsodium_path, 'BINARY')]) a.datas = a.datas + [('sakia/root_servers.yml', 'src/sakia/root_servers.yml', 'DATA')]