diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 3bc9cbf120..a3f4130d78 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -1,3 +1,8 @@ +# libsodium has a special branching/tagging scheme, where regular version tags can actually be moved +# as new patches are applied to that version. This means that we may get unexpected hash mismatches +# when the upstream tag points to a new commit. To avoid this, we must make sure that we always +# use a '-RELEASE' tag, since those seem to be fixed to a single commit. +# See https://github.com/jedisct1/libsodium/issues/1373#issuecomment-2135172301 for more info. vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libsodium @@ -50,11 +55,11 @@ else() if(NOT VCPKG_TARGET_IS_MINGW) list(APPEND OPTIONS --disable-pie) endif() - + vcpkg_configure_make( AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${OPTIONS} + OPTIONS ${OPTIONS} ) vcpkg_install_make() diff --git a/ports/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json index 71da316cee..d438b0b035 100644 --- a/ports/libsodium/vcpkg.json +++ b/ports/libsodium/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsodium", "version": "1.0.20", - "port-version": 2, + "port-version": 3, "description": "A modern and easy-to-use crypto library", "homepage": "https://libsodium.org/", "license": "ISC", diff --git a/versions/baseline.json b/versions/baseline.json index 0af6b81506..d948cfb5fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4978,7 +4978,7 @@ }, "libsodium": { "baseline": "1.0.20", - "port-version": 2 + "port-version": 3 }, "libsonic": { "baseline": "0.2.0", diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json index 08d8ca0827..5bffc1459a 100644 --- a/versions/l-/libsodium.json +++ b/versions/l-/libsodium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dcb750702485c4dafac0b605b910b81e2c48831", + "version": "1.0.20", + "port-version": 3 + }, { "git-tree": "1b7b00b7cccd397e07fa2b1b3ce3725d3ebead29", "version": "1.0.20",