depends: libsodium: update to 1.0.20

diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/libsodium.mk
similarity index 83%
rename from contrib/depends/packages/sodium.mk
rename to contrib/depends/packages/libsodium.mk
index dc575174f5116a6fc65e7bf2a61aa921afbbcd17..90856a07994a55d32933f2fca7506ee07736886d 100644 (file)
--- a/contrib/depends/packages/sodium.mk
+++ b/contrib/depends/packages/libsodium.mk
@@ -1,8 +1,8 @@
-package=sodium
-$(package)_version=1.0.19
+package=libsodium
+$(package)_version=1.0.20
 $(package)_download_path=https://download.libsodium.org/libsodium/releases/
 $(package)_file_name=libsodium-$($(package)_version).tar.gz
-$(package)_sha256_hash=018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea
+$(package)_sha256_hash=ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19
 $(package)_patches += fix-blake2b-symbol-naming.patch
 
 define $(package)_set_vars
@@ -11,6 +11,7 @@ define $(package)_set_vars
 endef
 
 define $(package)_preprocess_cmds
+  rm -rf builds/msvc &&\
   cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux/ && \
   patch -p1 -i $($(package)_patch_dir)/fix-blake2b-symbol-naming.patch && \
   autoconf

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index d25c00d9a1b922194c58b40c30cf3ab4eeb0f371..b8e4330c7805403b5f2d1df643c27ab91d4798d9 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -1,4 +1,4 @@
-packages := boost openssl libiconv unbound qrencode sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp
+packages := boost openssl libiconv unbound qrencode libsodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp
 native_packages := native_qt native_protobuf
 
 linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime

diff --git a/contrib/depends/patches/sodium/fix-blake2b-symbol-naming.patch b/contrib/depends/patches/libsodium/fix-blake2b-symbol-naming.patch
similarity index 100%
rename from contrib/depends/patches/sodium/fix-blake2b-symbol-naming.patch
rename to contrib/depends/patches/libsodium/fix-blake2b-symbol-naming.patch