diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index dbce16c2048f88..698192b3dfd945 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -1,18 +1,33 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sahlberg/libsmb2 - REF 99125c96750e192e2c50176548bf461e4a28f135 - SHA512 30cdc9bbcdcd384868e5865706b41f683b977ece4056040a29bb3b81ffdf83788ba8a39426132810b8cbbb778ae7db8e5e1be0b7c0a82d8beed75040de708240 + REF libsmb2-${VERSION} + SHA512 db3675d5b6d9242a23b2b259fd3140143edcf5aa8e203b5a4781ce8279046f7f9044a506d1323e9aa6a5ff52eaed4db93dc7a03954af735971ba933bccba6a3e HEAD_REF master ) +if(VCPKG_TARGET_IS_IOS) + list(TRANSFORM FEATURES REPLACE "krb5" "krb5_gssapi") +endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + krb5 ENABLE_LIBKRB5 + krb5_gssapi ENABLE_GSSAPI + INVERTED_FEATURES + krb5 CMAKE_DISABLE_FIND_PACKAGE_LibKrb5 + krb5_gssapi CMAKE_DISABLE_FIND_PACKAGE_GSSAPI +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - # TODO: Add a feature to enable gssapi/krb5 support - -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GSSAPI + CMAKE_DISABLE_FIND_PACKAGE_LibKrb5 + ENABLE_GSSAPI + ENABLE_LIBKRB5 ) vcpkg_cmake_install() diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 387bd6b0dae6c2..207f67195e2407 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,6 +1,7 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "libsmb2", - "version-date": "2023-08-11", + "version": "6.2", "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", "license": "LGPL-2.1-or-later", @@ -13,5 +14,17 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "krb5": { + "description": "SMB2/3 with krb5 support", + "supports": "linux | ios", + "dependencies": [ + { + "name": "krb5", + "platform": "linux" + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index fd13fea6c4b5a1..e27d7efce0eb89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5129,7 +5129,7 @@ "port-version": 0 }, "libsmb2": { - "baseline": "2023-08-11", + "baseline": "6.2", "port-version": 0 }, "libsndfile": { diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index b6fee31f2b3939..f7f2d95ccf13fd 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45d4abc9d7d8d41910eebd2c3315535f34bc106c", + "version": "6.2", + "port-version": 0 + }, { "git-tree": "e925ba41cc6441c6f2491462a26bea64d0cdeb16", "version-date": "2023-08-11",