diff --git a/ports/libxcrypt/portfile.cmake b/ports/libxcrypt/portfile.cmake index d5211df754c26b..56a3db7c33aa2d 100644 --- a/ports/libxcrypt/portfile.cmake +++ b/ports/libxcrypt/portfile.cmake @@ -1,43 +1,27 @@ set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) -# Requirements from https://github.com/besser82/libxcrypt?tab=readme-ov-file#build-requirements-and-instructions -message( -"${PORT} currently requires the following libraries from the system package manager: - autoconf automake libtool pkg-config -These can be installed on Debian systems via sudo apt install autoconf automake libtool pkg-config" -) -find_program(AUTORECONF_BIN autoreconf) -if(NOT AUTORECONF_BIN) - message(FATAL_ERROR "${PORT} requires autoconf from the system package manager (example: \"sudo apt install autoconf\")") -endif() -find_program(LIBTOOL_BIN libtoolize) -if(NOT LIBTOOL_BIN) - message(FATAL_ERROR "${PORT} requires libtool from the system package manager (example: \"sudo apt install libtool\")") -endif() +message(STATUS "${PORT} requires libltdl-dev from the system package manager (example: \"sudo apt install libltdl-dev\")") -vcpkg_download_distfile(PATCH_FIX_ERROR_STRICT_OVERFLOW - URLS https://github.com/besser82/libxcrypt/commit/7fc153170ea6c2938c0392794778de7ec995f8f9.patch?full_index=1 - SHA512 55f4709c52f6d0a29f159348821c06e3f5df0fae83f487b7a52ce61cd3f6a3a0f48023159fb7029d0a5a3decee36ac6a429cc91e23a83996a3265d681fa11929 - FILENAME besser82-libxcrypt-7fc153170ea6c2938c0392794778de7ec995f8f9.patch -) +vcpkg_find_acquire_program(PERL) +set(ENV{PERL} "${PERL}") + +vcpkg_find_acquire_program(PKGCONFIG) +set(ENV{PKG_CONFIG} "${PKGCONFIG}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO besser82/libxcrypt REF "v${VERSION}" - SHA512 61e5e393654f37775457474d4170098314879ee79963d423c1c461e80dc5dc74f0c161dd8754f016ce96109167be6c580ad23994fa1d2c38c54b96e602f3aece - PATCHES - "${PATCH_FIX_ERROR_STRICT_OVERFLOW}" + SHA512 05b0288ca1f1371674516df2e6cc9034f34057bb86a4b1702577dcf1eb7ce4730fad3e660d69123f108aec1f1ab8a0f84aec50ada012fe523e94d10e2303835e ) -vcpkg_configure_make( +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG + AUTORECONF ) - -vcpkg_install_make() +vcpkg_make_install() vcpkg_fixup_pkgconfig() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSING" "${SOURCE_PATH}/COPYING.LIB") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSING" "${SOURCE_PATH}/COPYING.LIB") diff --git a/ports/libxcrypt/vcpkg.json b/ports/libxcrypt/vcpkg.json index 04267a232b596f..098a81b7883a13 100644 --- a/ports/libxcrypt/vcpkg.json +++ b/ports/libxcrypt/vcpkg.json @@ -1,9 +1,14 @@ { "name": "libxcrypt", - "version": "4.4.36", - "port-version": 2, + "version": "4.4.38", "description": "libxcrypt is a modern library for one-way hashing of passwords. On Linux-based systems, by default libxcrypt will be binary backward compatible with the libcrypt.so.1 shipped as part of the GNU C Library.", "homepage": "https://github.com/besser82/libxcrypt", - "license": "LGPL-2.1-only", - "supports": "linux" + "license": null, + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-make", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index f165815895c977..1a8bcad686160e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5437,8 +5437,8 @@ "port-version": 0 }, "libxcrypt": { - "baseline": "4.4.36", - "port-version": 2 + "baseline": "4.4.38", + "port-version": 0 }, "libxcvt": { "baseline": "0.1.2", diff --git a/versions/l-/libxcrypt.json b/versions/l-/libxcrypt.json index 5a2a3ea96a87fa..0c2274e26d060e 100644 --- a/versions/l-/libxcrypt.json +++ b/versions/l-/libxcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "823052bfe81904cdf887fc83bbbf57eec872d057", + "version": "4.4.38", + "port-version": 0 + }, { "git-tree": "825ff0426ce377f1e386f7effd1f3dfb5e218a64", "version": "4.4.36",