From 8ca0c98cedea45785a4ad7ec61aafefb79dd1d06 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 19 Jun 2024 13:30:55 +0200 Subject: [PATCH] depends: libsodium: update to 1.0.20 --- contrib/depends/packages/{sodium.mk => libsodium.mk} | 7 ++++--- contrib/depends/packages/packages.mk | 2 +- .../{sodium => libsodium}/fix-blake2b-symbol-naming.patch | 0 3 files changed, 5 insertions(+), 4 deletions(-) rename contrib/depends/packages/{sodium.mk => libsodium.mk} (83%) rename contrib/depends/patches/{sodium => libsodium}/fix-blake2b-symbol-naming.patch (100%) 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 dc57517..90856a0 100644 --- 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 d25c00d..b8e4330 100644 --- 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