[getdns] update to 1.7.3 (microsoft#34188)

* [getdns] update to 1.7.3 * [getdns] update to 1.7.3 * fix deps * delete nouse patch chunk * fix deps * fix deps --------- Co-authored-by: MonicaLiu <liuyumei01@beyondsoft.com>
Osyotr · Jan 23, 2024 · f9619f5 · f9619f5
1 parent fa5ccae
commit f9619f5
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 24 deletions.
diff --git a/ports/getdns/disable-docs.patch b/ports/getdns/disable-docs.patch
@@ -1,8 +1,8 @@
 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)
+@@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c)
 
  set(version ${PACKAGE_VERSION})
  set(date ${API_VERSION})
@@ -15,28 +15,26 @@ 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()
 -endforeach()
 +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/fix-include.patch 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 <limits.h>
+-#include <strings.h>
++#include <stdlib.h>
+
+ 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 <sys/time.h>
++#endif
++#ifdef HAVE_TIME_H
+ #include <time.h>
++#endif
+ #include <ctype.h>
+
+ gldns_lookup_table *
diff --git a/ports/getdns/fix-libuv-deps.patch 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_OBJECTS:uv_objects>)
+-      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 $<IF:$<TARGET_EXISTS:libuv::uv_a>,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_OBJECTS:uv_objects>)
+-      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 $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
+       if (Libunbound_FOUND)
+         target_link_libraries(getdns_ext_uv_shared PUBLIC Libunbound::Libunbound)
+       endif ()
diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake
@@ -1,19 +1,19 @@
-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(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    PATCHES disable-docs.patch
+    PATCHES 
+        disable-docs.patch
+        fix-include.patch
+	fix-libuv-deps.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

diff --git 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",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2921,8 +2921,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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc99e968335624d1ff606befa894103b540fbde2",
+      "version": "1.7.3",
+      "port-version": 0
+    },
     {
       "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935",
       "version": "1.7.0",