Merge pull request microsoft#194 from JoergAtGithub/update_2.7_from_upstream

Merge upstream changes to 2.7 branch

Author: daschuer

ports/7zip/CMakeLists.txt

@@ -412,7 +412,7 @@ endif()
 # CPP/7zip/Bundles/Format7zF/makefile[_gcc].mak
 # CPP/7zip/7zip[_gcc].mak
 
-target_compile_definitions(7zip PRIVATE Z7_EXTERNAL_CODECS)
+target_compile_definitions(7zip PRIVATE Z7_EXTERNAL_CODECS Z7_PPMD_SUPPORT)
 target_sources(7zip PRIVATE
     CPP/7zip/Archive/ArchiveExports.cpp
     CPP/7zip/Archive/DllExports2.cpp

ports/7zip/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version": "25.1",
+  "port-version": 1,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

ports/abseil/string-view.patch ports/abseil/002-string-view.patchports/abseil/string-view.patch renamed to ports/abseil/002-string-view.patch

@@ -0,0 +1,13 @@
+diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
+index 38d09364..7d158be6 100644
+--- a/CMake/AbseilDll.cmake
++++ b/CMake/AbseilDll.cmake
+@@ -721,7 +721,7 @@ int main() { return 0; }
+ 
+ if(ABSL_INTERNAL_AT_LEAST_CXX20)
+   set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_20)
+-elseif(ABSL_INTERNAL_AT_LEAST_CXX17)
++elseif(1)
+   set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_17)
+ else()
+   message(FATAL_ERROR "The compiler defaults to or is configured for C++ < 17. C++ >= 17 is required and Abseil and all libraries that use Abseil must use the same C++ language standard")

ports/abseil/003-force-cxx-17.patch

@@ -6,11 +6,12 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
     REF "${VERSION}"
-    SHA512 d3ba654ed7dd7b432494918b2de5d8e2b0ad1c42752c5d726f20d6fe2841828fb4e8beb853e3570a11efecef725029ce5ffa3ebc434efff007e7f60735eb9856
+    SHA512 7083b73c3cf763f6f7a7edb70a5171f44d27045a0f5e52ca043e0a86379af2c50cf85dbfea30ebaa22a7bb2929452581d26b1ba18945023b057267d4c3bad2f7
     HEAD_REF master
     PATCHES 
-        "001-mingw-dll.patch" # Upstreamed (not yet in a release): https://github.com/abseil/abseil-cpp/commit/f2dee57baf19ceeb6d12cf9af7cbb3c049396ba5
-        "string-view.patch"
+        001-mingw-dll.patch # Upstreamed (not yet in a release): https://github.com/abseil/abseil-cpp/commit/f2dee57baf19ceeb6d12cf9af7cbb3c049396ba5
+        002-string-view.patch
+        003-force-cxx-17.patch
 )
 
 set(ABSL_TEST_HELPERS_OPTIONS "")

ports/abseil/portfile.cmake

@@ -1,6 +1,6 @@
 {
   "name": "abseil",
-  "version": "20250512.1",
+  "version": "20250814.1",
   "description": [
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
     "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",
@@ -23,12 +23,7 @@
       "description": "Build Abseil's test helpers",
       "dependencies": [
         "abseil",
-        {
-          "name": "gtest",
-          "features": [
-            "cxx17"
-          ]
-        }
+        "gtest"
       ]
     }
   }

ports/abseil/vcpkg.json

@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 803fb6a..ad7ae72 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,9 +97,35 @@ target_compile_definitions(ripe PRIVATE
+     ELPP_NO_DEFAULT_LOG_FILE
+     ELPP_DEFAULT_LOGGING_FLAGS=4096
+ )
+-install (TARGETS ripe DESTINATION lib)
++
++include(GNUInstallDirs)
++include(CMakePackageConfigHelpers)
++
++write_basic_package_version_file(
++  ${CMAKE_CURRENT_BINARY_DIR}/unofficial-ripe-config-version.cmake
++  VERSION "${RIPE_VERSION}"
++  COMPATIBILITY AnyNewerVersion
++)
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/unofficial-ripe-config-version.cmake
++  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/unofficial-ripe-config.cmake
++  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unofficial-ripe
++)
++    
++install (TARGETS ripe
++  EXPORT unofficial-ripe-targets
++  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++)
+ install (FILES include/Ripe.h DESTINATION "include")
+ 
++install(
++    EXPORT unofficial-ripe-targets
++    NAMESPACE unofficial::ripe::
++    DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-ripe"
++)
++
+ ################################################ RIPE ##############################################
+ 
+ add_executable (ripe-bin src/ripe.cc lib/Ripe.cc)

ports/abumq-ripe/cmake-config-exports.patch

@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4500382..e1a2c95 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,8 +36,6 @@ if (APPLE)
+     endif()
+ endif()
+ 
+-list (APPEND CMAKE_CXX_FLAGS "  ")
+-
+ if (dll)
+     add_definitions (-DRIPE_DLL)
+ endif()
+@@ -48,9 +46,8 @@ endif()
+ 
+ # Check for cryptopp (static)
+ set(CryptoPP_USE_STATIC_LIBS ON)
+-find_package(CryptoPP REQUIRED)
+-message ("-- Crypto++ binary: " ${CRYPTOPP_LIBRARY})
+-include_directories (${CRYPTOPP_INCLUDE_DIRS})
++find_package(CRYPTOPP NAMES cryptopp CONFIG REQUIRED)
++set(CRYPTOPP_LIBRARIES cryptopp::cryptopp)
+
+ find_package(ZLIB REQUIRED)
+ if (ZLIB_FOUND)
+@@ -92,7 +89,7 @@ set_target_properties(ripe PROPERTIES
+ )
+ 
+ target_link_libraries(ripe
+-    ${CRYPTOPP_LIBRARIES}
++    cryptopp::cryptopp
+     ${ZLIB_LIBRARIES}
+ )
+ 
+@@ -107,7 +104,7 @@ install (FILES include/Ripe.h DESTINATION "include")
+ 
+ add_executable (ripe-bin src/ripe.cc lib/Ripe.cc)
+ #target_link_libraries (ripe-bin ripe)
+-target_link_libraries (ripe-bin ${CRYPTOPP_LIBRARIES} ${ZLIB_LIBRARIES})
++target_link_libraries (ripe-bin cryptopp::cryptopp ${ZLIB_LIBRARIES})
+ 
+ set_target_properties (ripe-bin PROPERTIES
+     OUTPUT_NAME "ripe"

ports/abumq-ripe/devendoring.patch

@@ -0,0 +1,13 @@
+diff --git a/lib/Ripe.cc b/lib/Ripe.cc
+index 1111111..2222222 100644
+--- a/lib/Ripe.cc
++++ b/lib/Ripe.cc
+@@ -242,7 +242,7 @@ Ripe::KeyPair Ripe::generateRSAKeyPair(unsigned int length, const std::string&
+         if (secret.empty()) {
+             PEM_Save(snk, privateKey);
+         } else {
+-            PEM_Save(snk, rng, privateKey, PRIVATE_RSA_ALGORITHM, secret.data(), secret.size());
++            PEM_Save(snk, privateKey, rng, PRIVATE_RSA_ALGORITHM, secret.data(), secret.size());
+         }
+         snk.MessageEnd();
+     }

ports/abumq-ripe/fix-cryptopp-pem-api.patch

@@ -0,0 +1,37 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Ripe has several issues with dynamic linkage on Windows
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO abumq/ripe
+    REF v${VERSION}
+    SHA512 d89c80349eb7a245f825755b703401a412f934390c869607cfcaa02907f375e410d6ad2220255de475e215e7fea9a17c3fba61423e2632c1be7a40cadb69ad86
+    HEAD_REF master
+    PATCHES
+        devendoring.patch
+        cmake-config-exports.patch
+        fix-cryptopp-pem-api.patch
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-ripe-config.cmake"
+     DESTINATION "${SOURCE_PATH}/cmake")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -Dtest=OFF
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-ripe")
+
+vcpkg_copy_tools(TOOL_NAMES ripe AUTO_CLEAN)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")