Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libsmb2] update to v6.2 and add features to activate krb5 #42779

Merged
merged 3 commits into from
Jan 7, 2025
Merged

[libsmb2] update to v6.2 and add features to activate krb5 #42779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d60fce4
[libsmb2] update to version v6.2 and add krb5 features
michael-doubez Dec 18, 2024
2586295
[libsmb2] simplify portfile.cmake
michael-doubez Jan 1, 2025
9a4e85d
[libsmb2] add version v6.2
michael-doubez Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions ports/libsmb2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
17 changes: 15 additions & 2 deletions ports/libsmb2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
}
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5129,7 +5129,7 @@
"port-version": 0
},
"libsmb2": {
"baseline": "2023-08-11",
"baseline": "6.2",
"port-version": 0
},
"libsndfile": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libsmb2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "45d4abc9d7d8d41910eebd2c3315535f34bc106c",
"version": "6.2",
"port-version": 0
},
{
"git-tree": "e925ba41cc6441c6f2491462a26bea64d0cdeb16",
"version-date": "2023-08-11",
Expand Down