@openziti/ziti-sdk-nodejs 0.16.0 → 0.17.0

package/vcpkg/ports/libmysql/install-exports.patch

@@ -0,0 +1,121 @@
+diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
+index baf49cd5..c45fda71 100644
+--- a/cmake/install_macros.cmake
++++ b/cmake/install_macros.cmake
+@@ -113,8 +113,30 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg)
+   IF(ARG_NAMELINK_SKIP)
+     SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP)
+   ENDIF()
++  if(target STREQUAL "libmysql" OR target STREQUAL "mysqlclient")
++    target_include_directories(${target} INTERFACE $<INSTALL_INTERFACE:include>)
++    if(target STREQUAL "mysqlclient")
++      set_target_properties(${target} PROPERTIES EXPORT_NAME libmysql) # uniform
++    endif()
++    FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake"
++"include(CMakeFindDependencyMacro)
++find_dependency(OpenSSL)
++find_dependency(Threads)
++find_dependency(ZLIB)
++find_dependency(zstd CONFIG)
++include(\"\${CMAKE_CURRENT_LIST_DIR}/unofficial-libmysql-targets.cmake\")
++if(NOT TARGET ${target}) # legacy vcpkg
++  add_library(${target} INTERFACE IMPORTED)
++  set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libmysql::libmysql)
++endif()
++")
++    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" DESTINATION "share/unofficial-libmysql")
++    install(EXPORT "unofficial-libmysql-targets" NAMESPACE unofficial::libmysql:: DESTINATION "share/unofficial-libmysql")
++    set(LIBRARY_EXPORT_ARGS EXPORT unofficial-libmysql-targets)
++  endif()
+   INSTALL(TARGETS ${target}
+-    RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP}
++    ${LIBRARY_EXPORT_ARGS}
++    RUNTIME DESTINATION bin ${COMP}
+     ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP}
+     LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS})
+   SET(INSTALL_LOCATION ${ARG_DESTINATION} )
+diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
+index a5333987..c954bfb1 100644
+--- a/cmake/libutils.cmake
++++ b/cmake/libutils.cmake
+@@ -385,8 +385,12 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
+     IF(ARG_NAMELINK_SKIP)
+       SET(INSTALL_ARGS NAMELINK_SKIP)
+     ENDIF()
++    if(INSTALL_STATIC_LIBRARIES)
++      set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1)
++    else()
+     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
+       ${INSTALL_ARGS})
++    endif()
+   ENDIF()
+ 
+   IF(WIN32)
+@@ -563,6 +567,8 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
+     ENDIF()
+     IF(INSTALL_STATIC_LIBRARIES)
+       MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
++    else()
++      set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1)
+     ENDIF()
+   ENDIF()
+ ENDMACRO(MERGE_CONVENIENCE_LIBRARIES)
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index c4ef5694..8e933877 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -315,10 +315,14 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+     FOREACH(lib ${TARGET_LIB_DEPENDS})
+       IF (lib MATCHES "^\\-l")
+         SET(${var} "${${var}} ${lib} ")
++      elseif(lib MATCHES "^ext::(openssl|zlib|zstd)" AND NOT WIN32)
++        list(APPEND ext_targets "${CMAKE_MATCH_1}")
+       ELSEIF (lib MATCHES "^ext::")
+         STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}")
+         SET(SYSTEM_LIB ${CMAKE_MATCH_1})
+         SET(${var} "${${var}} -l${SYSTEM_LIB} ")
++      elseif(TARGET "${lib}" AND NOT WIN32)
++        # merged or shared, not external
+       ELSEIF (lib MATCHES "^\\-L")
+         # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind
+         SET(${var} "${${var}} ${lib} ")
+@@ -354,6 +358,7 @@ IF(MSVC)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
+ ELSE()
++  EXTRACT_LINK_LIBRARIES(libmysql CLIENT_LIBS)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
+ ENDIF()
+@@ -373,6 +378,10 @@ IF (WITH_SSL STREQUAL "system")
+       "${CONFIG_LIBS_PRIVATE}")
+   ENDIF()
+ ENDIF()
++list(APPEND CONFIG_REQUIRES_PRIVATE ${ext_targets})
++list(REMOVE_DUPLICATES CONFIG_REQUIRES_PRIVATE)
++list(JOIN CONFIG_REQUIRES_PRIVATE " " CONFIG_REQUIRES_PRIVATE)
++string(REPLACE "zstd" "libzstd" CONFIG_REQUIRES_PRIVATE "${CONFIG_REQUIRES_PRIVATE}" )
+ 
+ MESSAGE(STATUS "CONFIG_CLIENT_LIBS ${CONFIG_CLIENT_LIBS}")
+ MESSAGE(STATUS "CONFIG_LIBS_PRIVATE ${CONFIG_LIBS_PRIVATE}")
+diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
+index 6e8520be..bf1a45af 100644
+--- a/scripts/mysql_config.sh
++++ b/scripts/mysql_config.sh
+@@ -119,6 +119,16 @@ fi
+ # Create options 
+ libs="-L$pkglibdir@RPATH_OPTION@"
+ libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@"
++if test -z "${PKG_CONFIG}" ; then
++  if pkg-config --version >/dev/null 2>&1 ; then
++    PKG_CONFIG=pkg-config
++  elif pkgconf --version >/dev/null 2>&1 ; then
++    PKG_CONFIG=pkgconf
++  else
++    PKG_CONFIG=false
++  fi
++fi
++libs="$libs $(${PKG_CONFIG} --libs @CONFIG_REQUIRES_PRIVATE@)"
+ 
+ cflags="-I$pkgincludedir @CFLAGS@"
+ cxxflags="-I$pkgincludedir @CXXFLAGS@"

package/vcpkg/ports/libmysql/libmysql-config.cmake

@@ -0,0 +1,6 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
+message(WARNING "find_package(libmysql) is deprecated.\n${usage}")
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libmysql CONFIG REQUIRED)
+set(libmysql_FOUND 1)
+set(MYSQL_LIBRARIES unofficial::libmysql::libmysql)

package/vcpkg/ports/libmysql/portfile.cmake

@@ -2,31 +2,21 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
     message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.")
 endif()
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    message(WARNING "'autoconf-archive' must be installed via your system package manager (brew, apt, etc.).")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server
     REF mysql-${VERSION}
-    SHA512 8b9f15b301b158e6ffc99dd916b9062968d36f6bdd7b898636fa61badfbe68f7328d4a39fa3b8b3ebef180d3aec1aee353bd2dac9ef1594e5772291390e17ac0
+    SHA512 5df45c1ce1e2c620856b9274666cf56738d6a0308c33c9c96583b494c987fb0e862e676301109b9e4732070d54e6086596a62ad342f35adc59ca9f749e37b561
     HEAD_REF master
     PATCHES
-        ignore-boost-version.patch
-        system-libs.patch
-        export-cmake-targets.patch
-        Add-target-include-directories.patch
-        homebrew.patch
+        dependencies.patch
+        install-exports.patch
         fix_dup_symbols.patch
+        cross-build.patch
 )
-
-file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0")
-
-set(STACK_DIRECTION "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
-endif()
+file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0")
+list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit")
+file(REMOVE_RECURSE ${third_party})
 
 #Skip the version check for Visual Studio
 set(FORCE_UNSUPPORTED_COMPILER "")
@@ -37,27 +27,56 @@ endif()
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  BUILD_STATIC_LIBS)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static"  STATIC_CRT_LINKAGE)
 
+set(cross_options "")
+if(VCPKG_CROSSCOMPILING)
+    list(APPEND cross_options
+        -DCMAKE_CROSSCOMPILING=1
+        -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}
+        # required, skip try_run
+        -DHAVE_RAPIDJSON_WITH_STD_REGEX=1
+    )
+    if(NOT VCPKG_TARGET_IS_WINDOWS)
+        list(APPEND cross_options
+            # optimistic, skip try_run
+            -DHAVE_CLOCK_GETTIME=1
+            -DHAVE_CLOCK_REALTIME=1
+            # pessimistic, skip try_run
+            -DHAVE_C_FLOATING_POINT_FUSED_MADD=1
+            -DHAVE_CXX_FLOATING_POINT_FUSED_MADD=1
+            -DHAVE_SETNS=0
+        )
+    endif()
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${cross_options}
+        -DINSTALL_INCLUDEDIR=include/mysql
+        -DINSTALL_DOCDIR=share/${PORT}/doc
+        -DINSTALL_MANDIR=share/${PORT}/doc
+        -DINSTALL_INFODIR=share/${PORT}/doc
+        -DINSTALL_DOCREADMEDIR=share/${PORT}
+        -DINSTALL_SHAREDIR=share
+        -DINSTALL_MYSQLSHAREDIR=share/${PORT}
         -DWITHOUT_SERVER=ON
         -DWITH_BUILD_ID=OFF
         -DWITH_UNIT_TESTS=OFF
         -DENABLED_PROFILING=OFF
-        -DENABLE_TESTING=OFF
         -DWIX_DIR=OFF
-        ${STACK_DIRECTION}
         -DIGNORE_BOOST_VERSION=ON
-        -DWITH_SYSTEMD=OFF
         -DWITH_TEST_TRACE_PLUGIN=OFF
         -DMYSQL_MAINTAINER_MODE=OFF
         -DBUNDLE_RUNTIME_LIBRARIES=OFF
         -DDOWNLOAD_BOOST=OFF
-        -DWITH_SSL=system
-        -DWITH_ICU=system
-        -DWITH_LIBEVENT=system
+        -DWITH_CURL=none
+        -DWITH_EDITLINE=bundled # not in vcpkg
         -DWITH_LZ4=system
+        -DWITH_RAPIDJSON=system
+        -DWITH_SSL=system
+        -DWITH_SYSTEMD=OFF
         -DWITH_ZLIB=system
+        -DWITH_ZSTD=system
         -DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER}
         -DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS}
         -DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE}
@@ -69,9 +88,10 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql)
+vcpkg_fixup_pkgconfig()
 
-list(APPEND MYSQL_TOOLS
-    comp_err
+set(MYSQL_TOOLS
     my_print_defaults
     mysql
     mysql_config_editor
@@ -90,7 +110,11 @@ list(APPEND MYSQL_TOOLS
     perror
     zlib_decompress
 )
-
+if (NOT VCPKG_CROSSCOMPILING)
+    list(APPEND MYSQL_TOOLS
+        comp_err
+    )
+endif()
 if (VCPKG_TARGET_IS_WINDOWS)
     list(APPEND MYSQL_TOOLS
         echo
@@ -103,72 +127,21 @@ endif()
 
 vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN)
 
-file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
-file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
-if(NOT VCPKG_BUILD_TYPE)
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}")
-endif()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql)
-
-# switch mysql into /mysql
-file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
-file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/mysql")
-
-## delete useless vcruntime/scripts/bin/msg file
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/debug/man"
-    "${CURRENT_PACKAGES_DIR}/docs"
-    "${CURRENT_PACKAGES_DIR}/debug/docs"
     "${CURRENT_PACKAGES_DIR}/lib/debug"
-    "${CURRENT_PACKAGES_DIR}/lib/plugin"
-    "${CURRENT_PACKAGES_DIR}/debug/lib/plugin"
-)
-
-# delete dynamic dll on static build
-if (BUILD_STATIC_LIBS)
-    # libmysql.dll
-    file(REMOVE_RECURSE 
-        "${CURRENT_PACKAGES_DIR}/bin" 
-        "${CURRENT_PACKAGES_DIR}/debug/bin"
-    )
-    file(REMOVE
-        "${CURRENT_PACKAGES_DIR}/lib/libmysql.lib"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.lib"
-        "${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb"
-    )
-endif()
-
-## remove misc files
-file(REMOVE
-    "${CURRENT_PACKAGES_DIR}/LICENSE"
-    "${CURRENT_PACKAGES_DIR}/README"
-    "${CURRENT_PACKAGES_DIR}/debug/LICENSE"
-    "${CURRENT_PACKAGES_DIR}/debug/README"
 )
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" "#include <mysql/udf_registration_types.h>" "#include \"mysql/udf_registration_types.h\"")
 if (NOT VCPKG_TARGET_IS_WINDOWS)
     set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config")
-    vcpkg_replace_string(${MYSQL_CONFIG_FILE} "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config")  # try to get correct $basedir
-    vcpkg_replace_string(${MYSQL_CONFIG_FILE} "${CURRENT_PACKAGES_DIR}" "$basedir")  # use $basedir to format paths
-    vcpkg_replace_string(${MYSQL_CONFIG_FILE} "-l\$\<\$\<CONFIG:DEBUG\>:${CURRENT_INSTALLED_DIR}/debug/lib/libz.a> " "")  # remove debug version of libz
-    vcpkg_replace_string(${MYSQL_CONFIG_FILE} 
-        "\$\<\$\<NOT:\$\<CONFIG:DEBUG\>\>:${CURRENT_INSTALLED_DIR}" 
-        "`dirname $0`/../../../../installed/${TARGET_TRIPLET}")  # correct path for release version of libz
-    vcpkg_replace_string(${MYSQL_CONFIG_FILE} "\> -l" " -l") # trailing > tag for previous item
+    vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config")
+    vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "'${CURRENT_PACKAGES_DIR}" "\"\$basedir\"\'")
 endif()
 
-file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CURRENT_PORT_DIR}/libmysql-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-# copy license
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+set(libedit_copying "${SOURCE_PATH}/COPYING for libedit")
+file(COPY_FILE "${SOURCE_PATH}/extra/libedit/libedit-20210910-3.1/COPYING" "${libedit_copying}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${libedit_copying}")

package/vcpkg/ports/libmysql/usage

@@ -1,4 +1,4 @@
-The package libmysql provides CMake targets:
+libmysql provides CMake targets:
 
-    find_package(libmysql REQUIRED)
-    target_link_libraries(main PRIVATE ${MYSQL_LIBRARIES})
+    find_package(unofficial-libmysql REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libmysql::libmysql)

package/vcpkg/ports/libmysql/vcpkg.json

@@ -1,25 +1,27 @@
 {
   "name": "libmysql",
-  "version": "8.0.32",
-  "port-version": 6,
+  "version": "8.0.34",
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
   "license": "GPL-2.0-or-later",
-  "supports": "!(windows & x86) & !uwp & !xbox",
+  "supports": "!android & !mingw & !uwp & !xbox",
   "dependencies": [
     "boost-algorithm",
     "boost-functional",
     "boost-geometry",
     "boost-graph",
     "boost-optional",
-    "icu",
-    "libevent",
+    {
+      "name": "libmysql",
+      "host": true
+    },
     "lz4",
     {
       "name": "ncurses",
       "platform": "!windows | mingw"
     },
     "openssl",
+    "rapidjson",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -28,6 +30,7 @@
       "name": "vcpkg-cmake-config",
       "host": true
     },
-    "zlib"
+    "zlib",
+    "zstd"
   ]
 }

package/vcpkg/ports/libnop/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/libnop
-    REF 910b55815be16109f04f4180e9adee14fb4ce281
-    SHA512 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36
+    REF 35e800d81f28c632956c5a592e3cbe8085ecd430
+    SHA512 27f62710afb41165db5ef54bb2d09f89ed9c0c0cb401bffe2c52590bb28c67ed6ba68922510cdedd6dc7cc75fc267a02a2f9cbcca4bfa85042792a121e27097e
 )
 file(INSTALL ${SOURCE_PATH}/include/nop DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

package/vcpkg/ports/libnop/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "libnop",
-  "version-date": "2021-03-01",
+  "version-date": "2021-11-03",
   "description": "libnop is a header-only library for serializing and deserializing C++ data types without external code generators or runtime support libraries",
   "homepage": "https://github.com/google/libnop"
 }

package/vcpkg/ports/libobfuscate/portfile.cmake

@@ -0,0 +1,11 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO adamyaxley/Obfuscate
+  REF 674a53f34c05a1dd092561face7a6807f921d223
+  SHA512 9a3ef203386f149d916d9511492da94b6ab02fb001475ecb423eaf3f5510f6332ac57ce889a6b26a8a7c54066ec3d5ffabc5886338ecdaf0590423c385c449d9
+  HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/obfuscate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/libobfuscate/vcpkg.json

@@ -0,0 +1,7 @@
+{
+  "name": "libobfuscate",
+  "version-date": "2023-03-23",
+  "description": "Guaranteed compile-time string literal obfuscation header-only library for C++14.",
+  "homepage": "https://github.com/adamyaxley/Obfuscate",
+  "license": "Unlicense"
+}

package/vcpkg/ports/libosip2/portfile.cmake

@@ -1,9 +1,7 @@
-set(LIBOSIP2_VER "5.2.0")
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz"
-    FILENAME "libosip2-${LIBOSIP2_VER}.tar.gz"
-    SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83
+    URLS "https://ftp.gnu.org/gnu/osip/libosip2-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${VERSION}.tar.gz"
+    FILENAME "libosip2-${VERSION}.tar.gz"
+    SHA512 cd9db7a736cca90c6862b84c4941ef025f5affab8af9bbc02ce0dd3310a2c555e0922c1bfa72d8ac08791fa1441bbcc30b627d52ca8b51f3471573a10ac82a00
 )
 
 set(PATCHES)

package/vcpkg/ports/libosip2/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libosip2",
-  "version": "5.2.0",
-  "port-version": 5,
+  "version": "5.3.1",
   "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.",
   "homepage": "https://www.gnu.org/software/osip/",
   "supports": "!(windows & arm) & !uwp",

package/vcpkg/ports/libpcap/add-disable-packet-option.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f675d1..e9d6d96 100644
+index 650be01..7565e58 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire
+@@ -521,6 +521,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire
  option(DISABLE_SNF "Disable Myricom SNF support" OFF)
  
  option(DISABLE_TC "Disable Riverbed TurboCap support" OFF)
@@ -10,22 +10,20 @@ index 2f675d1..e9d6d96 100644
  
  #
  # Debugging options.
-@@ -302,7 +303,7 @@ if(WIN32)
+@@ -579,7 +580,7 @@ if(WIN32)
      if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
          include_directories(${CMAKE_HOME_DIRECTORY}/../../Common)
      endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
 -
 +    if(NOT DISABLE_PACKET)
      find_package(Packet)
-     if(PACKET_FOUND)
+     if(Packet_FOUND)
          set(HAVE_PACKET32 TRUE)
-@@ -317,7 +318,8 @@ if(WIN32)
+@@ -594,6 +595,7 @@ if(WIN32)
          check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES)
          cmake_pop_check_state()
-     endif(PACKET_FOUND)
--
+     endif(Packet_FOUND)
 +    endif()
-+    
+ 
      message(STATUS "checking for Npcap's version.h")
      check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H)
-     if(HAVE_VERSION_H)

package/vcpkg/ports/libpcap/install-pc-on-msvc.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b83fbbd..2f675d1 100644
+index 58c5159..650be01 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)
+@@ -3238,9 +3238,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include)
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include)
  
@@ -18,20 +18,20 @@ index b83fbbd..2f675d1 100644
      set(prefix ${CMAKE_INSTALL_PREFIX})
      set(exec_prefix "\${prefix}")
      set(includedir "\${prefix}/include")
-@@ -2715,10 +2718,14 @@ if(NOT MSVC)
-     foreach(LIB ${PCAP_LINK_LIBRARIES})
-         set(LIBS "${LIBS} -l${LIB}")
-     endforeach(LIB)
+@@ -3308,10 +3311,14 @@ if(NOT MSVC)
+             set(RPATH "")
+         endif()
+     endif()
 -    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY)
 -    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)
-+    
 +# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and
 +# pcap-config and process man pages and arrange that they be installed.
 +if(NOT MSVC)
 +    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
 +    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
++  
  
      #
      # Man pages.

package/vcpkg/ports/libpcap/portfile.cmake

@@ -14,8 +14,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO the-tcpdump-group/libpcap
-    REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1
-    SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f
+    REF "libpcap-${VERSION}"
+    SHA512 7352ff4d5bded916c0802e4a846fcb6b26e3ea8025dbbf58543abd9d9f6e8f7f5d60e03bcadb222d20434b7e052f663a560d7487af4b81fba74cf5aea040d733
     HEAD_REF master
     PATCHES 
         install-pc-on-msvc.patch
@@ -33,6 +33,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DDISABLE_NETMAP=ON
         -DDISABLE_BLUETOOTH=ON
@@ -48,7 +49,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 # On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories
 if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

package/vcpkg/ports/libpcap/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libpcap",
-  "version-semver": "1.10.1",
-  "port-version": 3,
+  "version-semver": "1.10.4",
+  "port-version": 1,
   "description": "A portable C/C++ library for network traffic capture",
   "homepage": "https://www.tcpdump.org/",
   "license": "BSD-3-Clause",

package/vcpkg/ports/libphonenumber/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/libphonenumber
     REF "v${VERSION}"
-    SHA512 b1ec99aa952558d2ba26d95d7c1bdfd8169f992b3190cc4236e1ce17e69db50ef2839b2840a9553541e09c7509b77c463a1036f84251844ec71bd5888ef78555
+    SHA512 d7a576e64fd3f3ce9d4f79750d8c785c56efd97d90f37d0062fb2634124ed6b181c74e772b4d9e72daf8897cc9cae4d4e525dd8b5113739c8c7ac7279315cd66
     HEAD_REF master
     PATCHES 
         fix-re2-identifiers.patch

package/vcpkg/ports/libphonenumber/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "libphonenumber",
-  "version": "8.13.17",
+  "version": "8.13.23",
   "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
   "license": "Apache-2.0",
   "dependencies": [

package/vcpkg/ports/libpng/cmake.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8652564..d0681d2 100644
+index e355e4d..6dfe543 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -614,7 +614,7 @@ if(PNG_STATIC)
-   # MSVC doesn't use a different file extension for shared vs. static
-   # libs. We are able to change OUTPUT_NAME to remove the _static
-   # for all other platforms.
--  if(NOT MSVC)
-+  if(1)
-     set_target_properties(png_static PROPERTIES
-                           OUTPUT_NAME "${PNG_LIB_NAME}"
-                           CLEAN_DIRECT_OUTPUT 1)
+@@ -632,7 +632,7 @@ else()
+   # We also need to use a custom suffix, in order to distinguish between the
+   # shared import library name and the static library name.
+   set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}")
+-  set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}_static")
++  set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}")
+ endif()
+ 
+ if(PNG_SHARED)

package/vcpkg/ports/libpng/fix-export-targets.patch

@@ -1,17 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c01cdcb..0ad4ba4 100644
+index e355e4d..3e2f346 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1033,6 +1033,12 @@ if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
+@@ -1053,6 +1053,12 @@ if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
    install(EXPORT libpng
            DESTINATION lib/libpng
-           FILE lib${PNG_LIB_NAME}.cmake)
+           FILE libpng${PNGLIB_ABI_VERSION}.cmake)
 +  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" "
 +  include(CMakeFindDependencyMacro)
 +  find_dependency(ZLIB)
-+  include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\")
++  include(\"\${CMAKE_CURRENT_LIST_DIR}/libpng${PNGLIB_ABI_VERSION}.cmake\")
 +  ")
-+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng")        
++  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng")
  endif()
  
  # TODO: Create MSVC import lib for MinGW-compiled shared lib.