@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/libpng/fix-msa-support-for-mips.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a249d42..1176c60 100644
+index e355e4d..990e32a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -171,8 +171,8 @@ endif()
+@@ -188,8 +188,8 @@ endif()
  # Set definitions and sources for MIPS.
  if(TARGET_ARCH MATCHES "mipsel*" OR
     TARGET_ARCH MATCHES "mips64el*")
@@ -13,7 +13,7 @@ index a249d42..1176c60 100644
        CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default")
    set_property(CACHE PNG_MIPS_MSA
                 PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES})
-@@ -185,6 +185,8 @@ if(TARGET_ARCH MATCHES "mipsel*" OR
+@@ -202,6 +202,8 @@ if(TARGET_ARCH MATCHES "mipsel*" OR
          mips/filter_msa_intrinsics.c)
      if(${PNG_MIPS_MSA} STREQUAL "on")
        add_definitions(-DPNG_MIPS_MSA_OPT=2)

package/vcpkg/ports/libpng/pkgconfig.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ad4ba4..a249d42 100644
+index e355e4d..b5b9172 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -932,12 +932,15 @@ endif()
+@@ -960,12 +960,15 @@ endif()
  # We use the same files like ./configure, so we have to set its vars.
  # Only do this on Windows for Cygwin - the files don't make much sense
  # outside of a UNIX look-alike.
@@ -18,13 +18,13 @@ index 0ad4ba4..a249d42 100644
 +    string(APPEND LIBS "-lm")
 +  endif()
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
-                  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
+                  ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc
                   @ONLY)
-@@ -1010,6 +1013,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL)
+@@ -1030,6 +1033,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL)
  endif()
  
  if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc
 +            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 +elseif(0)
    # Install the man pages.

package/vcpkg/ports/libpng/portfile.cmake

@@ -13,7 +13,7 @@ if ("apng" IN_LIST FEATURES)
     vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE
         URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${VERSION}/${LIBPNG_APNG_PATCH_NAME}.gz"
         FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz"
-        SHA512 97a182da0b3b54aecf735e3655d8e8f1a569ae957b23fc3d7a9c8cc65dcdd26f34f173ce9f60af99b01d5347267b2afefaf787c500ce1005e86bf2810b3d0738
+        SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c
     )
     set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}")
     if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}")
@@ -32,7 +32,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO glennrp/libpng
     REF v${VERSION}
-    SHA512 d61408cee5850582baa57166547ccab6cc171bc809076e53494ace26157fd7787c3209e3b757fd68c541bfb95afe309745d887fb5cd2005b2024af7355c809a0
+    SHA512 5f36a145c7d41f1c417d5f4e03be0155dae3499d72e67170acaad92c1af418c0bb6bc508e9b4b27ef4206bf0074cbf74978bade3bff28bc291867b8f8c2a38cf
     HEAD_REF master
     PATCHES
         "${LIBPNG_APNG_PATCH_PATH}"
@@ -102,4 +102,4 @@ file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${
 vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/libpng/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libpng",
-  "version": "1.6.39",
-  "port-version": 1,
+  "version": "1.6.40",
   "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
   "homepage": "https://github.com/glennrp/libpng",
   "license": "libpng-2.0",

package/vcpkg/ports/libpq/portfile.cmake

@@ -24,7 +24,6 @@ vcpkg_extract_source_archive(
 file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
 string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp "${_py3_include_path}")
 set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
-vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "python_version=3.REPLACEME" "python_version=3.${PYTHON_VERSION_MINOR}")
 
 if("client" IN_LIST FEATURES)
     set(HAS_TOOLS TRUE)
@@ -89,7 +88,7 @@ else()
     file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}")
 
     vcpkg_list(SET BUILD_OPTS)
-    foreach(option IN ITEMS icu lz4 nls openssl python readline xml xslt zlib zstd)
+    foreach(option IN ITEMS icu lz4 nls openssl readline xml xslt zlib zstd)
         if(option IN_LIST FEATURES)
             list(APPEND BUILD_OPTS --with-${option})
         else()
@@ -103,6 +102,7 @@ else()
         endif()
     endif()
     if("python" IN_LIST FEATURES)
+        list(APPEND BUILD_OPTS --with-python=3.${PYTHON_VERSION_MINOR})
         vcpkg_find_acquire_program(PYTHON3)
         list(APPEND BUILD_OPTS "PYTHON=${PYTHON3}")
     endif()

package/vcpkg/ports/libpq/unix/python.patch

@@ -1,14 +1,24 @@
 diff --git a/configure.ac b/configure.ac
-index a35395e..3c1b3e2 100644
+index 7f97248992..33b6c84fc4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1176,7 +1176,19 @@ fi
+@@ -891,7 +891,9 @@ AC_SUBST(with_perl)
+ # Optionally build Python modules (PL/Python)
+ #
+ AC_MSG_CHECKING([whether to build Python modules])
+-PGAC_ARG_BOOL(with, python, no, [build Python modules (PL/Python)])
++PGAC_ARG_OPTARG(with, python, [PYTHON_VERSION], [build Python modules (PL/Python)],
++                [],
++                [python_version=$withval])
+ AC_MSG_RESULT([$with_python])
+ AC_SUBST(with_python)
+ 
+@@ -1214,7 +1216,18 @@ fi
  
  if test "$with_python" = yes; then
    PGAC_PATH_PYTHON
 -  PGAC_CHECK_PYTHON_EMBED_SETUP
 +  python_majorversion=3
-+  python_version=3.REPLACEME
 +  PKG_CHECK_MODULES(PYTHON_EMBED, python-${python_version}-embed)
 +  python_includespec="${PYTHON_EMBED_CFLAGS}"
 +  python_libdir=[$(echo " ${PYTHON_EMBED_LIBS}" | sed -e 's/\( -L[^ ]*\).*/\1/' -e 's/^.* -L//')]

package/vcpkg/ports/libpq/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "libpq",
   "version": "16.0",
+  "port-version": 1,
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "license": "PostgreSQL",

package/vcpkg/ports/libraqm/portfile.cmake

@@ -1,14 +1,14 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(RAQM_VERSION_MAJOR 0)
-set(RAQM_VERSION_MINOR 9)
-set(RAQM_VERSION_MICRO 0)
+set(RAQM_VERSION_MINOR 10)
+set(RAQM_VERSION_MICRO 1)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO HOST-Oman/libraqm
     REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO}
-    SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060
+    SHA512 d35fd37764c153235ad89721be7a2a11212c1d3241383d81499ca5fe83e90d625e29e42a00edd626bff78bd0f72209f36826c84f59cd1504258079ed532329b6
     HEAD_REF master
 )
 

package/vcpkg/ports/libraqm/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libraqm",
-  "version": "0.9.0",
-  "port-version": 1,
+  "version": "0.10.1",
   "description": "A library for complex text layout",
   "homepage": "https://github.com/HOST-Oman/libraqm",
   "dependencies": [

package/vcpkg/ports/librdkafka/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO edenhill/librdkafka
     REF "v${VERSION}"
-    SHA512 1a85b5864efdeece1327e461b62a378f24b73eb7174168f630aeff01d4a5074d6b2f15744bc267665fcfc6384e804df00c20b7271ecd85a98dca84746b86b4d9
+    SHA512 a68b7382ec5a9afc0eb8513e97d8563c599021d774f7790a61af80565600678a497e4957dcdd823f8b9a426a19b9c5392cacd42d02d70493d993319f3343fe96
     HEAD_REF master
     PATCHES
         lz4.patch

package/vcpkg/ports/librdkafka/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "librdkafka",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "The Apache Kafka C/C++ library",
   "homepage": "https://github.com/edenhill/librdkafka",
   "license": null,

package/vcpkg/ports/libremidi/portfile.cmake

@@ -2,8 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jcelerier/libremidi
     REF "v${VERSION}"
-
-    SHA512 de7092c70af6fc0a23c8e6018fbd9f380632ac9dec8794171726fda9a6e7ba45479a8e8317919ba7a8a0267524bab8d5430782a54bc50a914658cf277e18145b
+    SHA512 ed07f8553155fe7c643033e67e12f1eaf64c11240bb387d9dc2c7e5c54af95cf5b9a78472b2281c7f2f4ef27a8f06ae981705f1fa2321f1322842becc1406247
     HEAD_REF master
 )
 
@@ -22,7 +21,7 @@ vcpkg_cmake_configure(
         -DLIBREMIDI_NO_JACK=ON
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libremidi PACKAGE_NAME libremidi)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")

package/vcpkg/ports/libremidi/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libremidi",
-  "version": "4.2.3",
-  "port-version": 1,
+  "version": "4.2.4",
   "description": "A modern C++ MIDI real-time & file I/O library",
   "homepage": "https://github.com/jcelerier/libremidi",
   "license": "BSD-2-Clause",

package/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch

@@ -1,16 +1,10 @@
 diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
-index 2dddb6e..fd35685 100644
+index 9cf7a8b..67ace03 100644
 --- a/apps/ocspcheck/CMakeLists.txt
 +++ b/apps/ocspcheck/CMakeLists.txt
-@@ -1,5 +1,3 @@
--if(NOT MSVC)
--
- set(
- 	OCSPCHECK_SRC
- 	http.c
-@@ -13,13 +11,27 @@ else()
-         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
- endif()
+@@ -4,6 +4,20 @@ set(
+ 	ocspcheck.c
+ )
  
 +check_function_exists(getopt HAVE_GETOPT)
 +if(HAVE_GETOPT)
@@ -26,23 +20,33 @@ index 2dddb6e..fd35685 100644
 +	set(FTRUNCATE_SRC compat/ftruncate.c)
 +endif()
 +
- if(NOT "${OPENSSLDIR}" STREQUAL "")
- 	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
- else()
+ check_function_exists(memmem HAVE_MEMMEM)
+ if(HAVE_MEMMEM)
+ 	add_definitions(-DHAVE_MEMMEM)
+@@ -17,7 +31,7 @@ else()
  	add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
  endif()
  
 -add_executable(ocspcheck ${OCSPCHECK_SRC})
 +add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC})
- target_include_directories(ocspcheck PUBLIC ../../include)
- target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat)
- target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
-@@ -29,5 +41,3 @@ if(ENABLE_LIBRESSL_INSTALL)
- 	install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ target_include_directories(ocspcheck
+ 	PRIVATE
+ 		../../include/compat
+diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c
+index 516642b..3afb68b 100644
+--- a/apps/ocspcheck/ocspcheck.c
++++ b/apps/ocspcheck/ocspcheck.c
+@@ -561,6 +561,10 @@ main(int argc, char **argv)
+ 	ssize_t written, w;
+ 	short port;
  
- endif(ENABLE_LIBRESSL_INSTALL)
--
--endif()
++#ifndef HAVE_GETOPT
++#include "getopt.h"
++#endif
++
+ 	while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) {
+ 		switch (ch) {
+ 		case 'C':
 diff --git a/apps/ocspcheck/compat/ftruncate.c b/apps/ocspcheck/compat/ftruncate.c
 new file mode 100644
 index 0000000..e825e50
@@ -225,30 +229,3 @@ index 0000000..ada142e
 +
 +#endif
 
-diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c
-index 551a8fa..c608578 100644
---- a/apps/ocspcheck/ocspcheck.c
-+++ b/apps/ocspcheck/ocspcheck.c
-@@ -519,6 +519,10 @@ main(int argc, char **argv)
- 	ssize_t written, w;
- 	short port;
- 
-+#ifndef HAVE_GETOPT
-+#include "getopt.h"
-+#endif
-+
- 	while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) {
- 		switch (ch) {
- 		case 'C':
-diff --git a/include/compat/unistd.h b/include/compat/unistd.h
-index f521b94..f11db44 100644
---- a/include/compat/unistd.h
-+++ b/include/compat/unistd.h
-@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset);
- #include <io.h>
- #include <process.h>
- 
-+#define STDIN_FILENO    0
- #define STDOUT_FILENO   1
- #define STDERR_FILENO   2
- 

package/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch

@@ -1,47 +1,45 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6a7554..b20fd4b 100644
+index 2f0dfa0..594c56f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -111,6 +111,11 @@ if(WIN32)
- 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
+@@ -136,6 +136,10 @@ if(WIN32)
+ 	endif()
+ 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 ntdll bcrypt)
  endif()
- 
 +if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)
 +	message(STATUS "Setting /Qspectre switch")
 +	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
 +endif()
-+
+ 
  if(MSVC)
  	add_definitions(-Dinline=__inline)
- 	message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler")
-@@ -123,16 +128,29 @@ if(MSVC)
+@@ -149,16 +153,29 @@ if(MSVC)
  			"C4127" # conditional expression is constant
  			"C4146" # unary minus operator applied to unsigned type,
- 				# result still unsigned
+ 			        # result still unsigned
 +			"C4242" # 'identifier' : conversion from 'type1' to 'type2',
-+				# possible loss of data
++				    # possible loss of data
  			"C4244" # 'argument' : conversion from 'type1' to 'type2',
- 				# possible loss of data
+ 			        # possible loss of data
  			"C4245" # 'conversion' : conversion from 'type1' to 'type2',
- 				# signed/unsigned mismatch
+ 			        # signed/unsigned mismatch
 +			"C4255" # 'function' : no function prototype given:
-+				# converting '()' to '(void)'
++                    # converting '()' to '(void)'
  			"C4267" # 'var' : conversion from 'size_t' to 'type',
- 				# possible loss of data
+ 			        # possible loss of data
 +			"C4388" # 'expression': signed/unsigned mismatch
  			"C4389" # 'operator' : signed/unsigned mismatch
 +			"C4464" # relative include path contains '..'
 +			"C4668" # 'symbol' is not defined as a preprocessor macro,
-+				# replacing with '0' for 'directives'
++                    # replacing with '0' for 'directives'
  			"C4706" # assignment within conditional expression
 +			"C4710" # 'function' : function not inlined
 +			"C4711" # function 'function' selected for inline expansion
 +			"C4820" # 'bytes' bytes padding added after construct 'member_name'
  			"C4996" # The POSIX name for this item is deprecated.
- 				# Instead, use the ISO C and C++ conformant name
+ 			        # Instead, use the ISO C and C++ conformant name
 +			"C5045" # Compiler will insert Spectre mitigation for memory load
-+				# if /Qspectre switch specified
++                    # if /Qspectre switch specified
  		)
  	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
  		add_definitions(-D_CRT_SUPPRESS_RESTRICT)
-

package/vcpkg/ports/libressl/portfile.cmake

@@ -9,7 +9,7 @@ vcpkg_download_distfile(
     URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${VERSION}.tar.gz"
          "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${VERSION}.tar.gz"
     FILENAME "${PORT}-${VERSION}.tar.gz"
-    SHA512 8fc81e05d1c9f9259d06508ca97d5a1ba5d46b857088c273c20e6b242921f7eac58a1136564ad9831c923758ee63f7b0897c8c6c7b1e53ab8132a995cc559aeb
+    SHA512 81765174fdd60223529182fab96249a28978c1d02b5894313d9b0b3aa365a1da2f7e5906403ab368114bdcba2fa861d1ad69b752f8344e6ea61d44666b483122
 )
 
 vcpkg_extract_source_archive(
@@ -59,11 +59,5 @@ vcpkg_copy_pdbs()
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 vcpkg_fixup_pkgconfig()
-
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-    file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib")
-    foreach(LIB ${LIBS})
-        string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}")
-        file(CREATE_LINK "${LIB}" "${LINK}")
-    endforeach()
-endif()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/LibreSSL")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

package/vcpkg/ports/libressl/vcpkg.json

@@ -1,14 +1,16 @@
 {
   "name": "libressl",
-  "version": "3.6.2",
-  "port-version": 1,
+  "version": "3.8.2",
   "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.",
   "license": "ISC",
-  "supports": "!(uwp | arm)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "features": {

package/vcpkg/ports/librsync/portfile.cmake

@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO librsync/librsync
-    REF 42b636d2a65ab6914ea7cac50886da28192aaf9b # V2.3.2
-    SHA512 4903a64e327a7d49ae5f741b7b9fe3a76018010147249e2bc53917b06d31ee0f9b917f6c3e36a2d241ae66c19fa881113b59911d777742a859922486d9fe9c4c
+    REF "v${VERSION}"
+    SHA512 ac01413b875e774db9fec3888210a4b9a5f3d32c081f1ed5f2cf9dc29cfae6ecedf6eac42062631e6dcf188853313fce4520430549768a0f68993419b07e58d9
     HEAD_REF master
 )
 

package/vcpkg/ports/librsync/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "librsync",
-  "version-semver": "2.3.2",
-  "port-version": 1,
+  "version-semver": "2.3.4",
   "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.",
   "homepage": "http://librsync.sourcefrog.net/",
   "supports": "!uwp",

package/vcpkg/ports/libsbml/dependencies.diff

@@ -0,0 +1,131 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a8af3a4..3926b68 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -421,8 +421,9 @@ set(LIBSBML_XML_LIBRARY_LIBS)
+ if(WITH_EXPAT)
+   
+     if(NOT TARGET EXPAT::EXPAT)
+-    find_package(EXPAT REQUIRED)
+     endif()
++    find_package(EXPAT NAMES expat REQUIRED)
++    set(EXPAT_LIBRARY expat::expat)
+ 
+     add_definitions( -DUSE_EXPAT )
+     list(APPEND SWIG_EXTRA_ARGS -DUSE_EXPAT)
+@@ -443,7 +444,8 @@ endif(WITH_EXPAT)
+ set(USE_LIBXML OFF)
+ if(WITH_LIBXML)
+ 
+-  find_package(LIBXML REQUIRED)
++  find_package(LIBXML NAMES LibXml2 REQUIRED)
++  set(LIBXML_LIBRARY LibXml2::LibXml2)
+   
+   add_definitions( -DUSE_LIBXML )
+   list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML)
+@@ -495,7 +497,7 @@ endif()
+ option(WITH_BZIP2    "Enable the use of bzip2 compression."  ${BZIP_INITIAL_VALUE})
+ set(USE_BZ2 OFF)
+ if(WITH_BZIP2)
+-  find_package(BZ2 REQUIRED)
++  find_package(BZip2 REQUIRED)
+   set(USE_BZ2 ON)
+   add_definitions( -DUSE_BZ2 )
+   list(APPEND SWIG_EXTRA_ARGS -DUSE_BZ2)
+@@ -521,6 +525,9 @@ Separate multiple directories using semicolons." )
+ # Locate zlib
+ #
+ 
++if(WITH_ZLIB)
++    find_package(ZLIB REQUIRED)
++endif()
+ set(ZLIB_INITIAL_VALUE)
+ if (NOT LIBZ_LIBRARY)
+ find_library(LIBZ_LIBRARY
+@@ -614,7 +621,6 @@ valid. It should contain the file zlib.h, but it does not.")
+ endif(WITH_ZLIB)
+ 
+ # install find scripts only for used dependencies
+-install(FILES ${LIBSBML_FIND_MODULES} DESTINATION share/cmake/Modules)
+ 
+ ###############################################################################
+ #
+@@ -671,7 +677,12 @@ if(WITH_CHECK)
+ 
+   enable_testing()
+ 
+-  find_package(CHECK REQUIRED)
++  find_package(CHECK NAMES check REQUIRED)
++  if(BUILD_SHARED_LIBS)
++    add_library(CHECK::CHECK ALIAS Check::checkShared)
++  else()
++    add_library(CHECK::CHECK ALIAS Check::check)
++  endif()
+ 
+   if (UNIX)
+       # setup valgrind
+@@ -1005,17 +1016,18 @@ install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX})
+ #
+ 
+ set (PRIVATE_LIBS "-lstdc++ -lm")
++set (PRIVATE_REQUIRES "")
+ if (WITH_ZLIB)
+-set (PRIVATE_LIBS "${LIBZ_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " zlib")
+ endif()
+ if (WITH_BZIP2)
+-set (PRIVATE_LIBS "${LIBBZ_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " bzip2")
+ endif()
+ if (WITH_LIBXML)
+-set (PRIVATE_LIBS "${LIBXML_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " libxml-2.0")
+ endif()
+ if (WITH_EXPAT)
+-set (PRIVATE_LIBS "${LIBEXPAT_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " expat")
+ endif()
+ if (WITH_XERCES)
+ set (PRIVATE_LIBS "${XERCES_LIBRARY} ${PRIVATE_LIBS}")
+@@ -1037,9 +1049,7 @@ if (WITH_XERCES)
+ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Conflicts: xerces-c = 2.6.0\n")
+ endif()
+ 
+-if (WITH_LIBXML)
+-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: libxml-2.0 >= 2.6.22\n")
+-endif()
++file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: ${PRIVATE_REQUIRES}\n")
+ 
+ if (UNIX OR MINGW)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc"
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 79301a6..0957d29 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -311,7 +311,7 @@ if(WITH_BZIP2)
+         sbml/compress/bzfstream.h
+         sbml/compress/bzfstream.cpp
+         )
+-  set(LIBSBML_LIBS ${LIBSBML_LIBS} BZ2::BZ2)
++  set(LIBSBML_LIBS ${LIBSBML_LIBS} BZip2::BZip2)
+ 
+ endif()
+ 
+@@ -405,7 +405,7 @@ if(WITH_EXPAT)
+         sbml/xml/ExpatHandler.h
+         sbml/xml/ExpatParser.h
+     )
+-    set(LIBSBML_LIBS ${LIBSBML_LIBS} EXPAT::EXPAT)
++    set(LIBSBML_LIBS ${LIBSBML_LIBS} expat::expat)
+ 
+ endif(WITH_EXPAT)
+ 
+@@ -423,7 +423,7 @@ if(WITH_LIBXML)
+         sbml/xml/LibXMLParser.h
+         sbml/xml/LibXMLTranscode.h
+     )
+-    set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML)
++    set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2)
+ 
+ endif(WITH_LIBXML)
+ 

package/vcpkg/ports/libsbml/dirent.diff

@@ -0,0 +1,28 @@
+diff --git a/src/sbml/validator/test/tps/dirent.c b/src/sbml/validator/test/tps/dirent.c
+index beafc5e..48a60ca 100644
+--- a/src/sbml/validator/test/tps/dirent.c
++++ b/src/sbml/validator/test/tps/dirent.c
+@@ -1,3 +1,4 @@
++#if 0
+ /* /////////////////////////////////////////////////////////////////////////////
+  * File:    dirent.c
+  *
+@@ -239,3 +240,4 @@ struct dirent *readdir(DIR *dir)
+ }
+ 
+ /* ////////////////////////////////////////////////////////////////////////// */
++#endif
+diff --git a/src/sbml/validator/test/tps/dirent.h b/src/sbml/validator/test/tps/dirent.h
+index 4703aa2..8e4c29c 100644
+--- a/src/sbml/validator/test/tps/dirent.h
++++ b/src/sbml/validator/test/tps/dirent.h
+@@ -46,6 +46,9 @@
+ 
+ #ifndef SYNSOFT_UNIXEM_INCL_H_DIRENT
+ #define SYNSOFT_UNIXEM_INCL_H_DIRENT
++#include <dirent.h>
++#endif
++#if 0
+ 
+ #ifndef _SYNSOFT_DOCUMENTATION_SKIP_SECTION
+ # define SYNSOFT_UNIXEM_VER_H_DIRENT_MAJOR      2

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

@@ -1,6 +1,6 @@
 include(CMakeFindDependencyMacro)
-find_dependency(libsbml-static CONFIG)
+find_dependency(@name@ CONFIG)
 if(NOT TARGET libsbml)
     add_library(libsbml INTERFACE IMPORTED)
-    target_link_libraries(libsbml INTERFACE libsbml-static)
+    target_link_libraries(libsbml INTERFACE $<TARGET_NAME:@name@>)
 endif()

package/vcpkg/ports/libsbml/no-docs.diff

@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ad678a..f856774 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1012,7 +1012,6 @@ set(DOCUMENTATION_FILES
+         VERSION.txt
+ )
+ 
+-install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX})
+ 
+ ###############################################################################
+ #