From dc140953fc30961b6065db29154f88310f49d480 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 1 Oct 2023 19:17:07 +0800 Subject: [PATCH 1/6] [getdns] update to 1.7.3 --- ports/getdns/disable-docs.patch | 33 ++++++++++++++++++++------------- ports/getdns/portfile.cmake | 9 +++------ ports/getdns/vcpkg.json | 3 +-- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ports/getdns/disable-docs.patch b/ports/getdns/disable-docs.patch index ffa7afa5623f9d..e5cbe1a4a4a5d5 100644 --- a/ports/getdns/disable-docs.patch +++ b/ports/getdns/disable-docs.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 413709da..d3dd03f0 100644 +index 9170be7..def3758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c) +@@ -955,7 +955,7 @@ if (BUILD_TESTING) + message(WARNING "Test programs require libcheck and so do not build on Windows, skipping.") + else () + find_package(Check "0.9.6" REQUIRED) +- set(GETDNS_TEST_SOURCE_FILES ++ set(GETDNS_TEST_SOURCE_FILES + src/test/check_getdns_common.c + src/test/check_getdns_context_set_timeout.c + src/test/check_getdns_transport.c +@@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c) set(version ${PACKAGE_VERSION}) set(date ${API_VERSION}) @@ -15,7 +24,7 @@ index 413709da..d3dd03f0 100644 get_filename_component(out ${man} NAME_WE) configure_file(${man} man3/${out}.3 @ONLY) -@@ -1061,7 +1061,7 @@ foreach (man ${mans}) +@@ -1058,7 +1058,7 @@ foreach (man ${mans}) configure_file(${man} man3/${alt}.3 @ONLY) endif () endforeach() @@ -23,20 +32,18 @@ index 413709da..d3dd03f0 100644 +endif() set(prefix ${CMAKE_INSTALL_PREFIX}) - configure_file(getdns.pc.in getdns.pc @ONLY) -@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON) + cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") +@@ -1098,10 +1098,10 @@ if (BUILD_GETDNS_SERVER_MON) endif () install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) -+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR}) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR}) --set(docdir share/doc/getdns) --install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) --install(FILES spec/index.html DESTINATION ${docdir}/spec) -+#set(docdir share/doc/getdns) -+#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) -+#install(FILES spec/index.html DESTINATION ${docdir}/spec) +-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec) ++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++#install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(CODE "message(\"\ diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 07a11fe8040366..8197f31a493f42 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -1,13 +1,10 @@ -set(GETDNS_VERSION 1.7.0) -set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED) vcpkg_download_distfile(ARCHIVE - URLS "https://getdnsapi.net/dist/getdns-${GETDNS_VERSION}.tar.gz" - FILENAME "getdns-${GETDNS_VERSION}.tar.gz" - SHA512 ${GETDNS_HASH} + URLS "https://getdnsapi.net/dist/getdns-${VERSION}.tar.gz" + FILENAME "getdns-${VERSION}.tar.gz" + SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f ) vcpkg_extract_source_archive( diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json index 98b9d330476ce0..92ee276fbf62d8 100644 --- a/ports/getdns/vcpkg.json +++ b/ports/getdns/vcpkg.json @@ -1,7 +1,6 @@ { "name": "getdns", - "version": "1.7.0", - "port-version": 3, + "version": "1.7.3", "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", "license": "BSD-3-Clause", From 5fd54d815ace6ded69f378d689f27d2331834efa Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 1 Oct 2023 19:17:07 +0800 Subject: [PATCH 2/6] [getdns] update to 1.7.3 --- versions/baseline.json | 4 ++-- versions/g-/getdns.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 928f7d9ffd4589..b97f8d5116af03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2837,8 +2837,8 @@ "port-version": 1 }, "getdns": { - "baseline": "1.7.0", - "port-version": 3 + "baseline": "1.7.3", + "port-version": 0 }, "getopt": { "baseline": "0", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index 33ed8e70d415cc..c5259937ddc9a4 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eed8c8b24c31833bc25792ddd5865b350f194008", + "version": "1.7.3", + "port-version": 0 + }, { "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935", "version": "1.7.0", From c1f21392e036fe2465aa171259e49d0aa9bec5c4 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:47:36 +0800 Subject: [PATCH 3/6] fix deps --- ports/getdns/fix-include.patch | 30 ++++++++++++++++++++++++++++++ ports/getdns/portfile.cmake | 4 +++- versions/g-/getdns.json | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 ports/getdns/fix-include.patch diff --git a/ports/getdns/fix-include.patch b/ports/getdns/fix-include.patch new file mode 100644 index 00000000000000..27ea5fa210d313 --- /dev/null +++ b/ports/getdns/fix-include.patch @@ -0,0 +1,30 @@ +diff --git a/src/gldns/parse.c b/src/gldns/parse.c +index 367fa80..79fa527 100644 +--- a/src/gldns/parse.c ++++ b/src/gldns/parse.c +@@ -13,7 +13,7 @@ + #include "gldns/gbuffer.h" + + #include +-#include ++#include + + gldns_lookup_table gldns_directive_types[] = { + { GLDNS_DIR_TTL, "$TTL" }, +diff --git a/src/gldns/parseutil.c b/src/gldns/parseutil.c +index 293496a..bcd8e6f 100644 +--- a/src/gldns/parseutil.c ++++ b/src/gldns/parseutil.c +@@ -14,8 +14,12 @@ + + #include "config.h" + #include "gldns/parseutil.h" ++#ifdef HAVE_SYS_TIME_H + #include ++#endif ++#ifdef HAVE_TIME_H + #include ++#endif + #include + + gldns_lookup_table * diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 8197f31a493f42..05fdc623675583 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES disable-docs.patch + PATCHES + disable-docs.patch + fix-include.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index c5259937ddc9a4..a7c85f8dc65e3a 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eed8c8b24c31833bc25792ddd5865b350f194008", + "git-tree": "ae187e49e240199049dbb860bf61f1b47a282c6a", "version": "1.7.3", "port-version": 0 }, From 098761b969a40d1b688c0e0aef9ee26e872567ed Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:04:55 +0800 Subject: [PATCH 4/6] delete nouse patch chunk --- ports/getdns/disable-docs.patch | 9 --------- versions/g-/getdns.json | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ports/getdns/disable-docs.patch b/ports/getdns/disable-docs.patch index e5cbe1a4a4a5d5..3d0670e27d16ef 100644 --- a/ports/getdns/disable-docs.patch +++ b/ports/getdns/disable-docs.patch @@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9170be7..def3758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -955,7 +955,7 @@ if (BUILD_TESTING) - message(WARNING "Test programs require libcheck and so do not build on Windows, skipping.") - else () - find_package(Check "0.9.6" REQUIRED) -- set(GETDNS_TEST_SOURCE_FILES -+ set(GETDNS_TEST_SOURCE_FILES - src/test/check_getdns_common.c - src/test/check_getdns_context_set_timeout.c - src/test/check_getdns_transport.c @@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c) set(version ${PACKAGE_VERSION}) diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index a7c85f8dc65e3a..c6ee9c58157d17 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ae187e49e240199049dbb860bf61f1b47a282c6a", + "git-tree": "9310616b1c2f0eeefd7207a5f0a0023fd96b3912", "version": "1.7.3", "port-version": 0 }, From baafd3fc26e98cf9be3a9d786af9a547849fbc8a Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:43:59 +0800 Subject: [PATCH 5/6] fix deps --- ports/getdns/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 05fdc623675583..64eccdfdd353dd 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive( PATCHES disable-docs.patch fix-include.patch + fix-libuv-deps.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) From a8da7e679521efc25df8d4b1e55da8497a761eef Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:45:05 +0800 Subject: [PATCH 6/6] fix deps --- ports/getdns/fix-libuv-deps.patch | 33 +++++++++++++++++++++++++++++++ versions/g-/getdns.json | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/getdns/fix-libuv-deps.patch diff --git a/ports/getdns/fix-libuv-deps.patch b/ports/getdns/fix-libuv-deps.patch new file mode 100644 index 00000000000000..71720ce3eca4e9 --- /dev/null +++ b/ports/getdns/fix-libuv-deps.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5b711e..6bd9ee2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -872,7 +872,7 @@ endif () + + # libuv extension. + if (USE_LIBUV) +- find_package(Libuv) ++ find_package(libuv CONFIG REQUIRED) + if (Libuv_FOUND) + # Check for new-style callbacks. + try_compile(HAVE_NEW_UV_TIMER_CB +@@ -894,8 +894,7 @@ if (USE_LIBUV) + set_property(TARGET uv_objects PROPERTY C_STANDARD 11) + if (ENABLE_STATIC) + add_library(getdns_ext_uv STATIC $) +- target_include_directories(getdns_ext_uv PRIVATE Libuv::Libuv) +- target_link_libraries(getdns_ext_uv PUBLIC getdns Libuv::Libuv) ++ target_link_libraries(getdns_ext_uv PUBLIC getdns $,libuv::uv_a,libuv::uv>) + if (Libunbound_FOUND) + target_link_libraries(getdns_ext_uv PUBLIC Libunbound::Libunbound) + endif () +@@ -903,8 +902,7 @@ if (USE_LIBUV) + endif () + if (ENABLE_SHARED) + add_library(getdns_ext_uv_shared SHARED $) +- target_include_directories(getdns_ext_uv_shared PRIVATE Libuv::Libuv) +- target_link_libraries(getdns_ext_uv_shared PUBLIC getdns_shared Libuv::Libuv) ++ target_link_libraries(getdns_ext_uv_shared PUBLIC getdns $,libuv::uv_a,libuv::uv>) + if (Libunbound_FOUND) + target_link_libraries(getdns_ext_uv_shared PUBLIC Libunbound::Libunbound) + endif () diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index c6ee9c58157d17..858c315f95c517 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9310616b1c2f0eeefd7207a5f0a0023fd96b3912", + "git-tree": "bc99e968335624d1ff606befa894103b540fbde2", "version": "1.7.3", "port-version": 0 },