From 9d926f0c14e0351c69aea9671ae685d41a81e6ec Mon Sep 17 00:00:00 2001 From: grahamreeds Date: Thu, 11 May 2023 10:34:07 +0100 Subject: [PATCH 1/3] #634: Update the default version of libsodium to 1.0.18 #634: Added version 1.0.18 of libsodium to hunter.cmake --- cmake/configs/default.cmake | 2 +- cmake/projects/libsodium/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 2d60953cbe..25aa6daace 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -392,7 +392,7 @@ hunter_default_version(libogg VERSION 1.3.3-p0) hunter_default_version(libpcre VERSION 8.41) hunter_default_version(librtmp VERSION 2.4.0-p0) hunter_default_version(libscrypt VERSION 1.21-p1) -hunter_default_version(libsodium VERSION 1.0.16-p0) +hunter_default_version(libsodium VERSION 1.0.18) hunter_default_version(libunibreak VERSION 4.0) hunter_default_version(libusb VERSION 1.0.23) hunter_default_version(libuv VERSION 1.42.0-p0) diff --git a/cmake/projects/libsodium/hunter.cmake b/cmake/projects/libsodium/hunter.cmake index e338f9c04a..d3524f0f94 100644 --- a/cmake/projects/libsodium/hunter.cmake +++ b/cmake/projects/libsodium/hunter.cmake @@ -41,6 +41,17 @@ hunter_add_version( d986ca5b9759d6518df26248f03db44d4dc9f590 ) +hunter_add_version( + PACKAGE_NAME + libsodium + VERSION + "1.0.18" + URL + "https://github.com/hunter-packages/libsodium/archive/v1.0.18.tar.gz" + SHA1 + 795b73e3f92a362fabee238a71735579bf46bb97 +) + string(COMPARE EQUAL "${HUNTER_libsodium_VERSION}" "1.0.10" __is_1_0_10) string(COMPARE EQUAL "${HUNTER_libsodium_VERSION}" "1.0.16" __is_1_0_16) From 8136748aa3d2d0b55619c4c36049a30339f59589 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Mon, 2 Jun 2025 08:19:21 +0200 Subject: [PATCH 2/3] Update cmake/projects/libsodium/hunter.cmake --- cmake/projects/libsodium/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/libsodium/hunter.cmake b/cmake/projects/libsodium/hunter.cmake index d3524f0f94..300708b9db 100644 --- a/cmake/projects/libsodium/hunter.cmake +++ b/cmake/projects/libsodium/hunter.cmake @@ -47,9 +47,9 @@ hunter_add_version( VERSION "1.0.18" URL - "https://github.com/hunter-packages/libsodium/archive/v1.0.18.tar.gz" + "https://github.com/cpp-pm/libsodium/archive/refs/tags/v1.0.18-p0.tar.gz" SHA1 - 795b73e3f92a362fabee238a71735579bf46bb97 + 0fafd2219825c6a9d62205b1e921c816b3e94113 ) string(COMPARE EQUAL "${HUNTER_libsodium_VERSION}" "1.0.10" __is_1_0_10) From c154443f13a64abf89e19d762bc842de87f82871 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Mon, 2 Jun 2025 08:30:35 +0200 Subject: [PATCH 3/3] update version number to 1.0.18-p0 not just URL/SHA1 --- cmake/configs/default.cmake | 2 +- cmake/projects/libsodium/hunter.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 25aa6daace..774a729d24 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -392,7 +392,7 @@ hunter_default_version(libogg VERSION 1.3.3-p0) hunter_default_version(libpcre VERSION 8.41) hunter_default_version(librtmp VERSION 2.4.0-p0) hunter_default_version(libscrypt VERSION 1.21-p1) -hunter_default_version(libsodium VERSION 1.0.18) +hunter_default_version(libsodium VERSION 1.0.18-p0) hunter_default_version(libunibreak VERSION 4.0) hunter_default_version(libusb VERSION 1.0.23) hunter_default_version(libuv VERSION 1.42.0-p0) diff --git a/cmake/projects/libsodium/hunter.cmake b/cmake/projects/libsodium/hunter.cmake index 300708b9db..e8cf527911 100644 --- a/cmake/projects/libsodium/hunter.cmake +++ b/cmake/projects/libsodium/hunter.cmake @@ -45,7 +45,7 @@ hunter_add_version( PACKAGE_NAME libsodium VERSION - "1.0.18" + "1.0.18-p0" URL "https://github.com/cpp-pm/libsodium/archive/refs/tags/v1.0.18-p0.tar.gz" SHA1