From 9d6716e3d4acd26cc58ace894864c61e17fccc94 Mon Sep 17 00:00:00 2001 From: Michael Doubez Date: Wed, 18 Dec 2024 22:06:47 +0100 Subject: [PATCH] [libsmb2] update to version v6.2 and add krb5/gssapi features --- ports/libsmb2/portfile.cmake | 19 +++++++++++++------ ports/libsmb2/vcpkg.json | 12 ++++++++++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index dbce16c2048f88..45db9d4e335f94 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -1,18 +1,25 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sahlberg/libsmb2 - REF 99125c96750e192e2c50176548bf461e4a28f135 - SHA512 30cdc9bbcdcd384868e5865706b41f683b977ece4056040a29bb3b81ffdf83788ba8a39426132810b8cbbb778ae7db8e5e1be0b7c0a82d8beed75040de708240 + REF libsmb2-6.2 + SHA512 db3675d5b6d9242a23b2b259fd3140143edcf5aa8e203b5a4781ce8279046f7f9044a506d1323e9aa6a5ff52eaed4db93dc7a03954af735971ba933bccba6a3e HEAD_REF master ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + gssapi ENABLE_GSSAPI + krb5 ENABLE_LIBKRB5 +) + 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 + ENABLE_GSSAPI + ENABLE_LIBKRB5 ) vcpkg_cmake_install() diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 387bd6b0dae6c2..38f95056f947e2 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsmb2", - "version-date": "2023-08-11", + "version-date": "2024-12-16", "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", "license": "LGPL-2.1-or-later", @@ -13,5 +13,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "gssapi": { + "description": "Compile with GSSAPI" + }, + "krb5": { + "description": "Compile with LibKRB5" + } + } }