[libxcrypt] Fix Werror=strict-overflow

microsoft · Dec 31, 2024 · e7d0aa7 · e7d0aa7
1 parent 7bac262
commit e7d0aa7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/ports/libxcrypt/portfile.cmake b/ports/libxcrypt/portfile.cmake
@@ -15,11 +15,19 @@ if(NOT LIBTOOL_BIN)
     message(FATAL_ERROR "${PORT} requires libtool from the system package manager (example: \"sudo apt install libtool\")")
 endif()
 
+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_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO besser82/libxcrypt
     REF "v${VERSION}"
     SHA512 61e5e393654f37775457474d4170098314879ee79963d423c1c461e80dc5dc74f0c161dd8754f016ce96109167be6c580ad23994fa1d2c38c54b96e602f3aece
+    PATCHES
+        "${PATCH_FIX_ERROR_STRICT_OVERFLOW}"
 )
 
 vcpkg_configure_make(

diff --git a/ports/libxcrypt/vcpkg.json b/ports/libxcrypt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libxcrypt",
   "version": "4.4.36",
-  "port-version": 1,
+  "port-version": 2,
   "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",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5382,7 +5382,7 @@
     },
     "libxcrypt": {
       "baseline": "4.4.36",
-      "port-version": 1
+      "port-version": 2
     },
     "libxcvt": {
       "baseline": "0.1.2",

diff --git a/versions/l-/libxcrypt.json b/versions/l-/libxcrypt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "825ff0426ce377f1e386f7effd1f3dfb5e218a64",
+      "version": "4.4.36",
+      "port-version": 2
+    },
     {
       "git-tree": "89d7de97e87cb0eb10479d47ec43e1cc732b2734",
       "version": "4.4.36",